feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added flag to enable blinking square

Browse Source
This commit is contained in:
CommanderRedYT
2021-11-24 17:38:18 +01:00
parent 1a4dbc5907
commit b39ad41380
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/accessors/settingsaccessors.h
View File

@ -125,6 +125,7 @@ struct CloudCollectRateAccessor : public RefAccessorSaveSettings<int16_t> { int1
struct CloudSendRateAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.cloudSendRate; } }; struct CloudSendRateAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.cloudSendRate; } };
struct UdpCloudSendIntervalAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.udpSendRateMs; } }; struct UdpCloudSendIntervalAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.udpSendRateMs; } };
struct UdpCloudEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.cloudSettings.udpCloudEnabled; } }; struct UdpCloudEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.cloudSettings.udpCloudEnabled; } };
struct CloudDebugEnableAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.cloudSettings.enableCloudDebug; } };
#endif #endif
struct DefaultModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.defaultMode.modelMode; } }; struct DefaultModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.defaultMode.modelMode; } };

2
main/displays/menus/debugmenu.cpp
View File

@ -7,6 +7,7 @@
#include "actions/toggleboolaction.h" #include "actions/toggleboolaction.h"
#include "checkboxicon.h" #include "checkboxicon.h"
#include "icons/back.h" #include "icons/back.h"
#include "accessors/settingsaccessors.h"
// local includes // local includes
#include "utils.h" #include "utils.h"
@ -54,6 +55,7 @@ DebugMenu::DebugMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DYNAMICMENU>, SwitchScreenAction<DynamicDebugMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DYNAMICMENU>, SwitchScreenAction<DynamicDebugMenu>>>();
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERYDEBUG>, SwitchScreenAction<BatteryDebugMenu>, StaticMenuItemIcon<&bobbyicons::battery>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERYDEBUG>, SwitchScreenAction<BatteryDebugMenu>, StaticMenuItemIcon<&bobbyicons::battery>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TOGGLECLOUDDEBUG>, ToggleBoolAction, CheckboxIcon, CloudDebugEnableAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
} }

10
main/displays/statusdisplay.cpp
View File

@ -93,14 +93,14 @@ void StatusDisplay::redraw()
tft.setTextFont(2); tft.setTextFont(2);
#ifdef FEATURE_CLOUD #ifdef FEATURE_CLOUD
if(settings.cloudSettings.udpCloudEnabled) if(settings.cloudSettings.udpCloudEnabled && settings.cloudSettings.enableCloudDebug)
{ {
tft.fillRect(125, 258, 8, 8, (visualSendUdpPacket) ? TFT_DARKGREY : TFT_BLACK); tft.fillRect(125, 258, 8, 8, (visualSendUdpPacket) ? TFT_DARKGREY : TFT_BLACK);
} }
else // else // is not needed because of redraw
{ // {
tft.fillRect(125, 258, 8, 8, TFT_BLACK); // tft.fillRect(125, 258, 8, 8, TFT_BLACK);
} // }
#endif #endif
const auto staStatus = wifi_stack::get_sta_status(); const auto staStatus = wifi_stack::get_sta_status();

1
main/presets.h
View File

@ -177,6 +177,7 @@ constexpr Settings::CloudSettings defaultCloudSettings {
.cloudTransmitTimeout = 10, .cloudTransmitTimeout = 10,
.udpUid = 0, .udpUid = 0,
.udpCloudEnabled = false, .udpCloudEnabled = false,
.enableCloudDebug = false
}; };
#endif #endif

2
main/settings.h
View File

@ -124,6 +124,7 @@ struct Settings
int16_t cloudTransmitTimeout; // in ms int16_t cloudTransmitTimeout; // in ms
uint32_t udpUid; uint32_t udpUid;
bool udpCloudEnabled; bool udpCloudEnabled;
bool enableCloudDebug;
} cloudSettings; } cloudSettings;
#endif #endif
@ -292,6 +293,7 @@ void Settings::executeForEveryCommonSetting(T &&callable)
callable("clodTransmTmout", cloudSettings.cloudTransmitTimeout); callable("clodTransmTmout", cloudSettings.cloudTransmitTimeout);
callable("cloudUDPUid", cloudSettings.udpUid); callable("cloudUDPUid", cloudSettings.udpUid);
callable("enUdpCloud", cloudSettings.udpCloudEnabled); callable("enUdpCloud", cloudSettings.udpCloudEnabled);
callable("debugCloud", cloudSettings.enableCloudDebug);
#endif #endif
#ifdef FEATURE_LEDSTRIP #ifdef FEATURE_LEDSTRIP

1
main/texts.h
View File

@ -95,6 +95,7 @@ constexpr char TEXT_REBOOT[] = "Reboot";
constexpr char TEXT_DEBUG[] = "Debug"; constexpr char TEXT_DEBUG[] = "Debug";
constexpr char TEXT_BATTERY[] = "Battery"; constexpr char TEXT_BATTERY[] = "Battery";
constexpr char TEXT_BATTERYDEBUG[] = "Bat Debug Menu"; constexpr char TEXT_BATTERYDEBUG[] = "Bat Debug Menu";
constexpr char TEXT_TOGGLECLOUDDEBUG[] = "Cloud Debug";
//BatteryMenu //BatteryMenu
constexpr char TEXT_CELL_SERIES[] = "Cells (Series)"; constexpr char TEXT_CELL_SERIES[] = "Cells (Series)";