Merge branch 'master' into peter_screen_improvements

.gitmodules

@@ -19,9 +19,6 @@
 [submodule "components/ArduinoJson"]
 	path = components/ArduinoJson
 	url = ../../0xFEEDC0DE64/ArduinoJson.git
-[submodule "components/TFT_eSPI"]
-	path = components/TFT_eSPI
-	url = ../../0xFEEDC0DE64/TFT_eSPI.git
 [submodule "components/arduino-esp32"]
 	path = components/arduino-esp32
 	url = ../../0xFEEDC0DE64/arduino-esp32.git
@@ -67,3 +64,6 @@
 [submodule "esp-protocols"]
 	path = esp-protocols
 	url = ../../0xFEEDC0DE64/esp-protocols.git
+[submodule "components/TFT_eSPI"]
+	path = components/TFT_eSPI
+	url = ../../0xFEEDC0DE64/TFT_eSPI.git

config_seatbot.cmake

@@ -46,7 +46,7 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_LEDBACKLIGHT
 
     -DLEDBACKLIGHT_INVERTED
-#    -DLEDSTRIP_WRONG_DIRECTION
+    -DLEDSTRIP_WRONG_DIRECTION
     -DHEAP_LRGST_CRASH_TEXT_FIX
 
 # Default values

config_testdevice.cmake

@@ -0,0 +1,89 @@
+set(BOBBY_APP_NAME testdevice)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+

main/CMakeLists.txt

@@ -240,6 +240,7 @@ set(headers
     texthelpers/wifistatexthelpers.h
     time_bobbycar.h
     types.h
+    typeutils.h
     udpcloud.h
     unifiedmodelmode.h
     utils.h

main/accessors/settingsaccessors.h

@@ -44,6 +44,7 @@ struct BleFenceEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrappe
 // Cloud
 struct CloudEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.cloudEnabled; } };
 struct CloudTransmitTimeoutAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.cloudSettings.cloudTransmitTimeout; } };
+struct CloudSendStatisticsAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.sendStatistic; } };
 
 // Time
 //struct TimezoneOffsetAccessor : public NewSettingsAccessor<int32_t> { ConfigWrapper<int32_t> &getConfig() const override { return configs.timezoneOffset; } };

main/bobbybuttons.cpp

@@ -6,9 +6,7 @@
 // local includes
 #include "newsettings.h"
 #include "settingsutils.h"
-#include "modes/defaultmode.h"
 #include "ledstripdefines.h"
-#include "ledstrip.h"
 
 #include "bobbyquickactions.h"
 

main/bobbybuttons.h

@@ -21,7 +21,8 @@ enum BobbyButton
     Extra3,
     Extra4,
     Confirm = espgui::Button::Right,
-    Back = espgui::Button::Left
+    Back = espgui::Button::Left,
+    ButtonMax = Back
 };
 
 [[nodiscard]] std::optional<espgui::Button> translateRawButton(uint8_t button);

main/bobbyquickactions.h

@@ -2,9 +2,9 @@
 
 // 3rdparty lib includes
 #include <buttonsinterface.h>
-#include <cpptypesafeenum.h>
 
 // local includes
+#include "bobbytypesafeenum.h"
 #include "bobbybuttons.h"
 
 #define BobbyQuickActionsValues(x) \
@@ -18,7 +18,7 @@
     x(HUPE) \
     x(COMPRESSOR_TOGGLE)
 
-DECLARE_TYPESAFE_ENUM(BobbyQuickActions, : uint8_t, BobbyQuickActionsValues)
+DECLARE_BOBBYTYPESAFE_ENUM(BobbyQuickActions, : uint8_t, BobbyQuickActionsValues)
 
 namespace quickactions {
 

main/can.cpp

@@ -265,6 +265,9 @@ void sendCanCommands()
     static uint32_t can_sequential_error_cnt = 0;
     static uint32_t can_sequential_bus_errors = 0;
 
+    if (!configs.controllerHardware.sendFrontCanCmd.value() && !configs.controllerHardware.sendBackCanCmd.value())
+        return;
+
     constexpr auto send = [](uint32_t addr, auto value){
         twai_message_t message;
         twai_status_info_t status_info;

main/cloud.h

@@ -7,6 +7,9 @@
 #include <wrappers/websocket_client.h>
 #include <espchrono.h>
 
+// local includes
+#include "bobbytypesafeenum.h"
+
 extern espcpputils::websocket_client cloudClient;
 extern bool cloudStarted;
 extern espchrono::millis_clock::time_point lastCreateTry;
@@ -21,3 +24,5 @@ void initCloud();
 void updateCloud();
 void cloudCollect();
 void cloudSend();
+
+std::string getLoginMessage();

main/configutils_bobby.h

@@ -6,12 +6,13 @@
 
 // local includes
 #include "battery.h"
-#include "ledstrip.h"
-#include "handbremse.h"
 #include "bobbyquickactions.h"
+#include "cloud.h"
+#include "handbremse.h"
+#include "ledstrip.h"
 
-IMPLEMENT_NVS_GET_SET_ENUM(OtaAnimationModes)
+IMPLEMENT_NVS_GET_SET_ENUM(BatteryCellType)
+IMPLEMENT_NVS_GET_SET_ENUM(BobbyQuickActions)
 IMPLEMENT_NVS_GET_SET_ENUM(HandbremseMode)
 IMPLEMENT_NVS_GET_SET_ENUM(LedstripAnimation)
-IMPLEMENT_NVS_GET_SET_ENUM(BobbyQuickActions)
+IMPLEMENT_NVS_GET_SET_ENUM(OtaAnimationModes)
-IMPLEMENT_NVS_GET_SET_ENUM(BatteryCellType)

main/configwrapper_bobby.cpp

@@ -4,8 +4,8 @@
 #define CONFIGWRAPPER_TOSTRING_USINGS using ::toString;
 #include <configwrapper_priv.h>
 
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(OtaAnimationModes)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BatteryCellType)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BobbyQuickActions)
 INSTANTIATE_CONFIGWRAPPER_TEMPLATES(HandbremseMode)
 INSTANTIATE_CONFIGWRAPPER_TEMPLATES(LedstripAnimation)
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BobbyQuickActions)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(OtaAnimationModes)
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BatteryCellType)

main/displays/menus/cloudsettingsmenu.cpp

@@ -10,17 +10,19 @@
 #include "icons/back.h"
 
 // local includes
-#include "displays/bobbychangevaluedisplay.h"
-#include "cloudtexthelpers.h"
 #include "accessors/settingsaccessors.h"
-#include "cloud.h"
-#include "displays/menus/settingsmenu.h"
 #include "bobbycheckbox.h"
+#include "cloud.h"
+#include "cloudtexthelpers.h"
+#include "displays/bobbychangevaluedisplay.h"
+#include "displays/menus/settingsmenu.h"
+#include "displays/menus/typesafeenumchangemenu.h"
 
 namespace {
 constexpr char TEXT_CLOUDSETTINGS[] = "Cloud settings";
 constexpr char TEXT_CLOUDENABLED[] = "Cloud enabled";
 constexpr char TEXT_CLOUDTRANSMITTIMEOUT[] = "Transmit timeout";
+constexpr char TEXT_SENDSTATISTICS[] = "Send Statistics";
 constexpr char TEXT_CLOUDCOLLECTRATE[] = "Cloud collect rate";
 constexpr char TEXT_CLOUDSENDRATE[] = "Cloud send rate";
 constexpr char TEXT_BACK[] = "Back";
@@ -65,13 +67,14 @@ CloudSettingsMenu::CloudSettingsMenu()
 {
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDENABLED>,         BobbyCheckbox, CloudEnabledAccessor>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDTRANSMITTIMEOUT>, PushScreenAction<CloudTransmitTimeoutChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SENDSTATISTICS>,       BobbyCheckbox, CloudSendStatisticsAccessor>>();
     constructMenuItem<makeComponent<MenuItem, CloudCreatedText,                      DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, CloudStartedText,                      DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, CloudConnectedText,                    DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, CloudBufferLengthText,                 DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDCOLLECTRATE>,     PushScreenAction<CloudCollectRateChangeDisplay>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDSENDRATE>,        PushScreenAction<CloudSendRateChangeDisplay>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
 std::string CloudSettingsMenu::text() const

main/displays/menus/mainmenu.h

@@ -22,7 +22,7 @@ namespace {
 
 class MainMenu : public bobbygui::MenuDisplayWithTime
 {
-    using Base = espgui::MenuDisplay;
+    using Base = bobbygui::MenuDisplayWithTime;
 
 public:
     MainMenu();

main/dpad.h

@@ -96,6 +96,8 @@ void update()
         debounceBack = now;
     }
 }
+
+constexpr const uint8_t BUTTON_COUNT = 4;
 #endif
-}
+} // namespace dpad
-}
+} // namespace

main/dpad3wire.h

@@ -111,6 +111,7 @@ void update()
         debounceBack = now;
     }
 }
+constexpr const uint8_t BUTTON_COUNT = 4;
 #endif
-}
+} // namespace dpad3wire
-}
+} // namespace

main/dpad5wire.h

@@ -1,8 +1,12 @@
 #pragma once
 
+// system includes
+#include <cstdint>
+
 #ifdef FEATURE_DPAD_5WIRESW
 namespace dpad5wire {
 void init();
 void update();
+constexpr const uint8_t BUTTON_COUNT = 8;
 } // namespace dpad5wire
 #endif

main/dpad5wire_2out.h

@@ -1,8 +1,12 @@
 #pragma once
 
+// system includes
+#include <cstdint>
+
 #ifdef FEATURE_DPAD_5WIRESW_2OUT
 namespace dpad5wire_2out {
 void init();
 void update();
+constexpr const uint8_t BUTTON_COUNT = 12;
 } // namespace dpad5wire_2out
 #endif

main/dpad6wire.h

@@ -1,8 +1,12 @@
 #pragma once
 
+// system includes
+#include <cstdint>
+
 #ifdef FEATURE_DPAD_6WIRESW
 namespace dpad6wire {
 void init();
 void update();
+constexpr const uint8_t BUTTON_COUNT = 10;
 } // namespace dpad6wire
 #endif

main/dpad_boardcomputer_v2.h

@@ -1,8 +1,12 @@
 #pragma once
 
+// system includes
+#include <cstdint>
+
 #ifdef DPAD_BOARDCOMPUTER_V2
 namespace dpad_boardcomputer_v2 {
 void init();
 void update();
+constexpr const uint8_t BUTTON_COUNT = 16;
 } // namespace dpad_boardcomputer_v2
 #endif

main/globals.cpp

@@ -39,6 +39,10 @@ bool simplified =
 ProfileSettings profileSettings;
 SettingsPersister settingsPersister;
 
+std::atomic<int8_t> rawButtonRequest;
+std::atomic<int8_t> buttonRequest;
+bool initScreenRequest{false};
+
 Controllers controllers;
 
 #ifdef FEATURE_BLUETOOTH

main/globals.h

@@ -2,6 +2,7 @@
 
 // system includes
 #include <array>
+#include <atomic>
 #include <memory>
 #include <optional>
 
@@ -25,11 +26,11 @@
 // local includes
 #include "controller.h"
 #include "display.h"
-#include "modeinterface.h"
-#include "profilesettings.h"
-#include "newsettings.h"
-#include "settingspersister.h"
 #include "macros_bobbycar.h"
+#include "modeinterface.h"
+#include "newsettings.h"
+#include "profilesettings.h"
+#include "settingspersister.h"
 
 extern std::optional<int16_t> raw_gas, raw_brems;
 extern std::optional<float> gas, brems;
@@ -66,6 +67,10 @@ extern bool simplified;
 extern ProfileSettings profileSettings;
 extern SettingsPersister settingsPersister;
 
+extern std::atomic<int8_t> rawButtonRequest;
+extern std::atomic<int8_t> buttonRequest;
+extern bool initScreenRequest;
+
 class Controllers : public std::array<Controller, 2>
 {
 public:

main/newsettings.h

@@ -27,6 +27,10 @@
 #include "handbremse.h"
 #include "ledstrip.h"
 #include "unifiedmodelmode.h"
+#include "displays/lockscreen.h"
+#include "handbremse.h"
+#include "bobbyquickactions.h"
+#include "cloud.h"
 
 using namespace espconfig;
 
@@ -197,6 +201,11 @@ public:
         url {std::string{}, DoReset, StringOr<StringEmpty, StringValidUrl>, urlKey  }
     {}
 
+    ConfiguredOtaServer(const char *nameKey, const char *urlKey, const char *default_name, const char *default_url) :
+        name{default_name, DoReset, {},                                    nameKey },
+        url {default_url,  DoReset, StringOr<StringEmpty, StringValidUrl>, urlKey  }
+    {}
+
     ConfigWrapperLegacy<std::string> name;
     ConfigWrapperLegacy<std::string> url;
 };
@@ -265,12 +274,12 @@ public:
     ConfigWrapperLegacy<int16_t>     gasMax             {4095,                                   DoReset,  MinMaxValue<int16_t, 0, 4095>, "gasMax"              };
     ConfigWrapperLegacy<int16_t>     gasMitte           {2048,                                   DoReset,  MinMaxValue<int16_t, 0, 4095>, "gasMiddle"           };
     ConfigWrapperLegacy<int16_t>     bremsMin           {0,                                      DoReset,  MinMaxValue<int16_t, 0, 4095>, "bremsMin"            };
-    ConfigWrapperLegacy<int16_t>     bremsMax           {4096,                                   DoReset,  MinMaxValue<int16_t, 0, 4095>, "bremsMax"            };
+    ConfigWrapperLegacy<int16_t>     bremsMax           {4095,                                   DoReset,  MinMaxValue<int16_t, 0, 4095>, "bremsMax"            };
     ConfigWrapperLegacy<int16_t>     bremsMitte         {2048,                                   DoReset,  MinMaxValue<int16_t, 0, 4095>, "bremsMiddle"         };
     ConfigWrapperLegacy<uint16_t>    deadband           {20,                                     DoReset,  MinMaxValue<uint16_t, 0, 4095>,"deadband"            };
 
     ConfigWrapperLegacy<uint8_t>     dpadDebounce       {25,                                     DoReset,   {},                           "dpadDebounce"        };
-    ConfigWrapperLegacy<uint16_t>    buttonReadDelay    {1,                                      DoReset,   {},                           "buttonDelay"         };
+    ConfigWrapperLegacy<uint16_t>    buttonReadDelay    {20,                                      DoReset,   {},                           "buttonDelay"         };
 
     ConfigWrapperLegacy<uint8_t>     dpadMappingLeft    {INPUT_MAPPING_NONE,                     DoReset,   {},                           "dpadMapLeft"         };
     ConfigWrapperLegacy<uint8_t>     dpadMappingRight   {INPUT_MAPPING_NONE,                     DoReset,   {},                           "dpadMapRight"        };
@@ -289,10 +298,10 @@ public:
     ConfigWrapperLegacy<uint8_t>     dpadMappingExtra3  {INPUT_MAPPING_NONE,                     DoReset,   {},                           "dpadMapExtra3"       };
     ConfigWrapperLegacy<uint8_t>     dpadMappingExtra4  {INPUT_MAPPING_NONE,                     DoReset,   {},                           "dpadMapExtra4"       };
 
-    ConfigWrapperLegacy<BobbyQuickActions> quickActionLeft2{  BobbyQuickActions::BLINK_LEFT,     DoReset,   {},                           "quickActleft2"       };
+    ConfigWrapperLegacy<BobbyQuickActions> quickActionLeft2 { BobbyQuickActions::BLINK_LEFT,     DoReset,   {},                           "quickActleft2"       };
     ConfigWrapperLegacy<BobbyQuickActions> quickActionRight2{ BobbyQuickActions::BLINK_RIGHT,    DoReset,   {},                           "quickActright2"      };
-    ConfigWrapperLegacy<BobbyQuickActions> quickActionUp2{    BobbyQuickActions::NONE,           DoReset,   {},                           "quickActup2"         };
+    ConfigWrapperLegacy<BobbyQuickActions> quickActionUp2   { BobbyQuickActions::NONE,           DoReset,   {},                           "quickActup2"         };
-    ConfigWrapperLegacy<BobbyQuickActions> quickActionDown2{  BobbyQuickActions::HANDBREMSE,     DoReset,   {},                           "quickActdown2"       };
+    ConfigWrapperLegacy<BobbyQuickActions> quickActionDown2 { BobbyQuickActions::HANDBREMSE,     DoReset,   {},                           "quickActdown2"       };
     ConfigWrapperLegacy<BobbyQuickActions> quickActionExtra1{ BobbyQuickActions::NONE,           DoReset,   {},                           "quickActextra1"      };
     ConfigWrapperLegacy<BobbyQuickActions> quickActionExtra2{ BobbyQuickActions::NONE,           DoReset,   {},                           "quickActextra2"      };
     ConfigWrapperLegacy<BobbyQuickActions> quickActionExtra3{ BobbyQuickActions::NONE,           DoReset,   {},                           "quickActextra3"      };
@@ -314,15 +323,15 @@ public:
     ConfigWrapperLegacy<int16_t>     reverseBeepDuration0{500,                                   DoReset,   {},                         "revBeepDur0"         };
     ConfigWrapperLegacy<int16_t>     reverseBeepDuration1{500,                                   DoReset,   {},                         "revBeepDur1"         };
 
-    ConfigWrapperLegacy<std::string> cloudUrl           {std::string{},                          DoReset,   StringOr<StringEmpty, StringValidUrl>, "cloudUrl" };
+    ConfigWrapperLegacy<std::string> cloudUrl           {"ws://api.bobbycar.cloud/ws",                          DoReset,   StringOr<StringEmpty, StringValidUrl>, "cloudUrl"     };
-    ConfigWrapperLegacy<std::string> udpCloudHost       {std::string{},                          DoReset,   {},                         "udpCloudHost"        };
+    ConfigWrapperLegacy<std::string> udpCloudHost       {"updates.bobbycar.cloud",                          DoReset,   {},                                        "udpCloudHost" };
 
     ConfigWrapperLegacy<std::string> otaUrl             {std::string{},                          DoReset,   StringOr<StringEmpty, StringValidUrl>, "otaUrl"   };
-    ConfigWrapperLegacy<std::string> otaUsername        {std::string{BOBBY_DEFAULT_OTA_NAME},                DoReset,   {},                         "otaUsername"         };
+    ConfigWrapperLegacy<std::string> otaUsername        {std::string{BOBBY_DEFAULT_OTA_NAME},    DoReset,   {},                                 "otaUsername" };
     ConfigWrapperLegacy<std::string> otaServerUrl       {std::string{},                          DoReset,   StringOr<StringEmpty, StringValidUrl>, "otaServerUrl" };
     ConfigWrapperLegacy<std::string> otaServerBranch    {std::string{},                          DoReset,   {},                         "otaServerBranch"     };
     std::array<ConfiguredOtaServer, 5> otaServers {
-        ConfiguredOtaServer { "otaName0", "otaUrl0" },
+        ConfiguredOtaServer { "otaName0", "otaUrl0", "bobbycloud", "http://updates.bobbycar.cloud" },
         ConfiguredOtaServer { "otaName1", "otaUrl1" },
         ConfiguredOtaServer { "otaName2", "otaUrl2" },
         ConfiguredOtaServer { "otaName3", "otaUrl3" },
@@ -331,7 +340,7 @@ public:
 
     ConfigWrapperLegacy<bool>        dns_announce_enabled{true,                                  DoReset,   {},                         "dnsAnnounceEnab"     };
     ConfigWrapperLegacy<std::string> dns_announce_key   {std::string{},                          DoReset,   {},                         "dnsAnnounceKey"      };
-    ConfigWrapperLegacy<std::string> webserverPassword  {std::string{},                          DoReset,   {},                         "websPassword"        };
+    ConfigWrapperLegacy<std::string> webserverPassword  {"Passwort_123",                         DoReset,   {},                         "websPassword"        };
 
     struct {
         ConfigWrapperLegacy<int16_t>  wheelDiameter     {DEFAULT_WHEELDIAMETER,                  DoReset,   {},                         "wheelDiameter"       };
@@ -361,6 +370,8 @@ public:
     struct {
         ConfigWrapperLegacy<bool> cloudEnabled          {false,                                  DoReset,   {},                         "cloudEnabled"        };
         ConfigWrapperLegacy<int16_t> cloudTransmitTimeout{10,                                    DoReset,   {},                         "clodTransmTmout"     };
+        ConfigWrapperLegacy<std::string> cloudKey       {std::string{},                          DoReset,   {},                         "cloudKey"            };
+        ConfigWrapperLegacy<bool> sendStatistic         {false,                                  DoReset,   {},                         "cloudSendStats"      };
     } cloudSettings;
 
     struct {
@@ -702,6 +713,8 @@ public:
     \
     x(cloudSettings.cloudEnabled) \
     x(cloudSettings.cloudTransmitTimeout) \
+    x(cloudSettings.cloudKey) \
+    x(cloudSettings.sendStatistic) \
     \
     x(udpCloudSettings.udpUid) \
     x(udpCloudSettings.udpCloudEnabled) \
@@ -839,6 +852,15 @@ public:
             std::ref<ConfiguredFeatureFlag>(feature.webserver_disable_lock)
         );
     }
+
+    constexpr size_t getConfigCount() const
+    {
+        size_t count = 0;
+#define HELPER(x) count++;
+        NEW_SETTINGS(HELPER)
+#undef HELPER
+        return count;
+    }
 };
 
 extern ConfigManager<ConfigContainer> configs;

main/screens.cpp

@@ -7,7 +7,6 @@
 // local includes
 #include "esptexthelpers.h"
 #include "globals.h"
-#include "utils.h"
 #include "icons/logo.h"
 
 using namespace espgui;
@@ -42,6 +41,27 @@ void updateDisplay()
         changeScreenCallback();
         changeScreenCallback = {};
     }
+
+    if (const int8_t rawButton = rawButtonRequest.load(); rawButton != -1 && currentDisplay)
+    {
+        currentDisplay->rawButtonPressed(rawButton);
+        currentDisplay->rawButtonReleased(rawButton);
+        rawButtonRequest = -1;
+    }
+
+    if (const int8_t button = buttonRequest.load(); button != -1 && currentDisplay)
+    {
+        const auto btn = espgui::Button(button);
+        currentDisplay->buttonPressed(btn);
+        currentDisplay->buttonReleased(btn);
+        buttonRequest = -1;
+    }
+
+    if (initScreenRequest && currentDisplay)
+    {
+        currentDisplay->initScreen();
+        initScreenRequest = false;
+    }
 }
 
 void redrawDisplay()

main/taskmanager.cpp

@@ -10,22 +10,6 @@
 
 // local includes
 #include "wifi_bobbycar.h"
-#include "dpad.h"
-#ifdef FEATURE_DPAD_3WIRESW
-#include "dpad3wire.h"
-#endif
-#ifdef FEATURE_DPAD_5WIRESW
-#include "dpad5wire.h"
-#endif
-#ifdef FEATURE_DPAD_5WIRESW_2OUT
-#include "dpad5wire_2out.h"
-#endif
-#ifdef FEATURE_DPAD_6WIRESW
-#include "dpad6wire.h"
-#endif
-#ifdef DPAD_BOARDCOMPUTER_V2
-#include "dpad_boardcomputer_v2.h"
-#endif
 #ifdef FEATURE_ROTARY
 #include "rotary.h"
 #endif
@@ -58,6 +42,7 @@
 #include "drivingstatistics.h"
 #include "dnsannounce.h"
 #include "screens.h"
+#include "utils.h"
 
 using namespace std::chrono_literals;
 
@@ -68,23 +53,8 @@ void not_needed() {}
 
 BobbySchedulerTask schedulerTasksArr[] {
     BobbySchedulerTask { "wifi",           wifi_begin,            wifi_update,             100ms },
-#ifdef FEATURE_DPAD
+#if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW) || defined(FEATURE_DPAD_5WIRESW_2OUT) || defined(FEATURE_DPAD_6WIRESW) || defined(DPAD_BOARDCOMPUTER_V2)
-    BobbySchedulerTask { "dpad",           dpad::init,            dpad::update,            20ms  },
+    BobbySchedulerTask { bobbydpad::dpad_name,  bobbydpad::dpad_init,       bobbydpad::dpad_update,       20ms  },
-#endif
-#ifdef FEATURE_DPAD_3WIRESW
-    BobbySchedulerTask { "dpad3wire",      dpad3wire::init,       dpad3wire::update,       20ms  },
-#endif
-#ifdef FEATURE_DPAD_5WIRESW
-    BobbySchedulerTask { "dpad5wire",      dpad5wire::init,       dpad5wire::update,       20ms  },
-#endif
-#ifdef FEATURE_DPAD_5WIRESW_2OUT
-    BobbySchedulerTask { "dpad5wire_2out", dpad5wire_2out::init,  dpad5wire_2out::update,  20ms  },
-#endif
-#ifdef FEATURE_DPAD_6WIRESW
-    BobbySchedulerTask { "dpad6wire",      dpad6wire::init,       dpad6wire::update,       20ms  },
-#endif
-#ifdef DPAD_BOARDCOMPUTER_V2
-    BobbySchedulerTask { "dpad_boardcomputer_v2", dpad_boardcomputer_v2::init, dpad_boardcomputer_v2::update, 20ms },
 #endif
 #ifdef FEATURE_ROTARY
     BobbySchedulerTask { "rotary",         initRotary,            updateRotary,            20ms  },

main/typeutils.h

@@ -0,0 +1,53 @@
+#pragma once
+
+namespace typeutils {
+    using namespace std;
+template<typename T>
+struct t_to_str
+{
+    t_to_str() = delete;
+    ~t_to_str() = delete;
+
+    static const char *str;
+};
+
+template<typename T>
+const char *t_to_str<T>::str = "unknown";
+
+#define DEFINE_FOR_TYPE2(TYPE, STR) \
+    template<> const char *t_to_str<TYPE>::str = #STR; \
+    template<> const char *t_to_str<TYPE const&>::str = #STR; \
+    template<> const char *t_to_str<std::optional<TYPE>>::str = "std::optional<" #STR ">"; \
+    template<> const char *t_to_str<std::optional<TYPE> const&>::str = "std::optional<" #STR ">"; \
+    template<> const char *t_to_str<ConfigWrapper<TYPE>>::str = #STR; \
+    template<> const char *t_to_str<ConfigWrapper<TYPE> const&>::str = #STR; \
+    template<> const char *t_to_str<ConfigWrapperLegacy<TYPE>>::str = #STR; \
+    template<> const char *t_to_str<ConfigWrapperLegacy<TYPE> const&>::str = #STR;
+
+#define DEFINE_FOR_TYPE(TYPE) DEFINE_FOR_TYPE2(TYPE, TYPE)
+DEFINE_FOR_TYPE(bool)
+DEFINE_FOR_TYPE(int8_t)
+DEFINE_FOR_TYPE(uint8_t)
+DEFINE_FOR_TYPE(int16_t)
+DEFINE_FOR_TYPE(uint16_t)
+DEFINE_FOR_TYPE(int32_t)
+DEFINE_FOR_TYPE(uint32_t)
+DEFINE_FOR_TYPE(int64_t)
+DEFINE_FOR_TYPE(uint64_t)
+DEFINE_FOR_TYPE(float)
+DEFINE_FOR_TYPE(double)
+DEFINE_FOR_TYPE(string)
+DEFINE_FOR_TYPE(sntp_sync_mode_t)
+DEFINE_FOR_TYPE(espchrono::DayLightSavingMode)
+DEFINE_FOR_TYPE(OtaAnimationModes)
+DEFINE_FOR_TYPE(LedstripAnimation)
+DEFINE_FOR_TYPE(HandbremseMode)
+DEFINE_FOR_TYPE(BobbyQuickActions)
+DEFINE_FOR_TYPE(BatteryCellType)
+DEFINE_FOR_TYPE(wifi_auth_mode_t)
+DEFINE_FOR_TYPE(wifi_stack::mac_t)
+DEFINE_FOR_TYPE(wifi_stack::ip_address_t)
+DEFINE_FOR_TYPE(espchrono::milliseconds32)
+DEFINE_FOR_TYPE(espchrono::minutes32)
+#undef DEFINE_FOR_TYPE
+} // namespace typeutils

main/utils.h

@@ -28,6 +28,25 @@
 #include "can.h"
 #endif
 
+#ifdef FEATURE_DPAD
+#include "dpad.h"
+#endif
+#ifdef FEATURE_DPAD_3WIRESW
+#include "dpad3wire.h"
+#endif
+#ifdef FEATURE_DPAD_5WIRESW
+#include "dpad5wire.h"
+#endif
+#ifdef FEATURE_DPAD_5WIRESW_2OUT
+#include "dpad5wire_2out.h"
+#endif
+#ifdef FEATURE_DPAD_6WIRESW
+#include "dpad6wire.h"
+#endif
+#ifdef DPAD_BOARDCOMPUTER_V2
+#include "dpad_boardcomputer_v2.h"
+#endif
+
 extern bool currentlyReverseBeeping;
 extern bool reverseBeepToggle;
 extern espchrono::millis_clock::time_point lastReverseBeepToggle;
@@ -80,3 +99,48 @@ inline CRGB UINT32_TO_CRGB(uint32_t color)
 std::string get_wifi_security_string(wifi_auth_mode_t authMode);
 float float_map(float x, float in_min, float in_max, float out_min, float out_max);
 bool is_valid_timestamp(espchrono::utc_clock::time_point timestamp);
+
+namespace bobbydpad {
+#ifdef FEATURE_DPAD
+static constexpr const auto ButtonCount = dpad::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad::init;
+static constexpr const auto &dpad_update = dpad::update;
+static constexpr const char * const dpad_name = "dpad";
+#endif
+#ifdef FEATURE_DPAD_3WIRESW
+static constexpr const auto ButtonCount = dpad3wire::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad3wire::init;
+static constexpr const auto &dpad_update = dpad3wire::update;
+static constexpr const char * const dpad_name = "dpad3wire";
+#endif
+#ifdef FEATURE_DPAD_5WIRESW
+static constexpr const auto ButtonCount = dpad5wire::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad5wire::init;
+static constexpr const auto &dpad_update = dpad5wire::update;
+static constexpr const char * const dpad_name = "dpad5wire";
+#endif
+#ifdef FEATURE_DPAD_5WIRESW_2OUT
+static constexpr const auto ButtonCount = dpad5wire_2out::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad5wire_2out::init;
+static constexpr const auto &dpad_update = dpad5wire_2out::update;
+static constexpr const char * const dpad_name = "dpad5wire_2out";
+#endif
+#ifdef FEATURE_DPAD_6WIRESW
+static constexpr const auto ButtonCount = dpad6wire::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad6wire::init;
+static constexpr const auto &dpad_update = dpad6wire::update;
+static constexpr const char * const dpad_name = "dpad6wire";
+#endif
+#ifdef DPAD_BOARDCOMPUTER_V2
+static constexpr const auto ButtonCount = dpad_boardcomputer_v2::BUTTON_COUNT;
+static constexpr const auto &dpad_init = dpad_boardcomputer_v2::init;
+static constexpr const auto &dpad_update = dpad_boardcomputer_v2::update;
+static constexpr const char * const dpad_name = "dpad_boardcomputer_v2";
+#endif
+#if !defined(FEATURE_DPAD) && !defined(FEATURE_DPAD_3WIRESW) && !defined(FEATURE_DPAD_5WIRESW) && !defined(FEATURE_DPAD_5WIRESW_2OUT) && !defined(FEATURE_DPAD_6WIRESW) && !defined(DPAD_BOARDCOMPUTER_V2)
+static constexpr const auto ButtonCount = 0;
+static constexpr const auto &dpad_init = nullptr;
+static constexpr const auto &dpad_update = nullptr;
+static constexpr const char * const dpad_name = "";
+#endif
+} // namespace bobbydpad

main/webserver_displaycontrol.cpp

@@ -23,8 +23,9 @@
 
 // local includes
 #include "bobbybuttons.h"
-#include "webserver_lock.h"
+#include "globals.h"
 #include "newsettings.h"
+#include "webserver_lock.h"
 
 using esphttpdutils::HtmlTag;
 using namespace std::chrono_literals;
@@ -190,7 +191,11 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
                         "<a href=\"/triggerRawButton?button=8\">Button8</a> "
                         "<a href=\"/triggerRawButton?button=9\">Button9</a> "
                         "<a href=\"/triggerRawButton?button=10\">Button10</a> "
-                        "<a href=\"/triggerRawButton?button=11\">Button11</a>";
+                        "<a href=\"/triggerRawButton?button=11\">Button11</a> "
+                        "<a href=\"/triggerRawButton?button=12\">Button12</a> "
+                        "<a href=\"/triggerRawButton?button=13\">Button13</a> "
+                        "<a href=\"/triggerRawButton?button=14\">Button14</a> "
+                        "<a href=\"/triggerRawButton?button=15\">Button15</a>";
             }
 
             {
@@ -207,7 +212,11 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
                                     "<a href=\"/triggerButton?button={}\">Left2</a> "
                                     "<a href=\"/triggerButton?button={}\">Right2</a> "
                                     "<a href=\"/triggerButton?button={}\">Up2</a> "
-                                    "<a href=\"/triggerButton?button={}\">Down2</a>",
+                                    "<a href=\"/triggerButton?button={}\">Down2</a>"
+                                    "<a href=\"/triggerButton?button={}\">Extra1</a>"
+                                    "<a href=\"/triggerButton?button={}\">Extra2</a>"
+                                    "<a href=\"/triggerButton?button={}\">Extra3</a>"
+                                    "<a href=\"/triggerButton?button={}\">Extra4</a>",
                                     std::to_underlying(espgui::Button::Left),
                                     std::to_underlying(espgui::Button::Right),
                                     std::to_underlying(espgui::Button::Up),
@@ -219,7 +228,11 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
                                     std::to_underlying(BobbyButton::Left2),
                                     std::to_underlying(BobbyButton::Right2),
                                     std::to_underlying(BobbyButton::Up2),
-                                    std::to_underlying(BobbyButton::Down2));
+                                    std::to_underlying(BobbyButton::Down2),
+                                    std::to_underlying(BobbyButton::Extra1),
+                                    std::to_underlying(BobbyButton::Extra2),
+                                    std::to_underlying(BobbyButton::Extra3),
+                                    std::to_underlying(BobbyButton::Extra4));
             }
 
             if (auto currentDisplay = static_cast<const espgui::Display *>(espgui::currentDisplay.get()))
@@ -285,7 +298,7 @@ esp_err_t webserver_triggerRawButton_handler(httpd_req_t *req)
         CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", result.error());
     }
 
-    uint8_t button;
+    int8_t button;
     constexpr const std::string_view buttonParamName{"button"};
 
     {
@@ -323,15 +336,7 @@ esp_err_t webserver_triggerRawButton_handler(httpd_req_t *req)
         }
     }
 
-    if (!espgui::currentDisplay)
+    rawButtonRequest.store(button);
-    {
-        constexpr const std::string_view msg = "espgui::currentDisplay is null";
-        ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
-        CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", msg);
-    }
-
-    espgui::currentDisplay->rawButtonPressed(button);
-    espgui::currentDisplay->rawButtonReleased(button);
 
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Location", "/")
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Access-Control-Allow-Origin", "http://web.bobbycar.cloud");
@@ -350,7 +355,7 @@ esp_err_t webserver_triggerButton_handler(httpd_req_t *req)
         CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", result.error());
     }
 
-    espgui::Button button;
+    int8_t button;
     constexpr const std::string_view buttonParamName{"button"};
 
     {
@@ -376,9 +381,9 @@ esp_err_t webserver_triggerButton_handler(httpd_req_t *req)
 
         std::string_view value{valueBuf};
 
-        if (auto parsed = cpputils::fromString<std::underlying_type_t<espgui::Button>>(value))
+        if (auto parsed = cpputils::fromString<int8_t>(value))
         {
-            button = espgui::Button(*parsed);
+            button = *parsed;
         }
         else
         {
@@ -388,15 +393,7 @@ esp_err_t webserver_triggerButton_handler(httpd_req_t *req)
         }
     }
 
-    if (!espgui::currentDisplay)
+    buttonRequest.store(button);
-    {
-        constexpr const std::string_view msg = "espgui::currentDisplay is null";
-        ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
-        CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", msg);
-    }
-
-    espgui::currentDisplay->buttonPressed(button);
-    espgui::currentDisplay->buttonReleased(button);
 
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Location", "/")
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Access-Control-Allow-Origin", "http://web.bobbycar.cloud");

main/webserver_newsettings.cpp

@@ -52,7 +52,7 @@ typename std::enable_if<
     !std::is_same_v<T, OtaAnimationModes> &&
     !std::is_same_v<T, LedstripAnimation> &&
     !std::is_same_v<T, HandbremseMode> &&
-    !std::is_same_v<T, BobbyQuickActions>
+    !std::is_same_v<T, BatteryCellType>
 , void>::type
 showInputForSetting(std::string_view key, T value, std::string &body)
 {
@@ -202,55 +202,16 @@ showInputForSetting(std::string_view key, T value, std::string &body)
 
 template<typename T>
 typename std::enable_if<
-    std::is_same_v<T, OtaAnimationModes>
+    std::is_same_v<T, OtaAnimationModes> ||
-, void>::type
+    std::is_same_v<T, LedstripAnimation> ||
-showInputForSetting(std::string_view key, T value, std::string &body)
+    std::is_same_v<T, BatteryCellType> ||
-{
-    HtmlTag select{"select", fmt::format("name=\"{}\"", esphttpdutils::htmlentities(key)), body};
-
-    iterateOtaAnimationModes([&](T enumVal, std::string_view enumKey){
-        HtmlTag option{"option", fmt::format("value=\"{}\"{}", std::to_underlying(enumVal), value == enumVal ? " selected" : ""), body};
-        body += esphttpdutils::htmlentities(enumKey);
-    });
-}
-
-template<typename T>
-typename std::enable_if<
-    std::is_same_v<T, LedstripAnimation>
-, void>::type
-showInputForSetting(std::string_view key, T value, std::string &body)
-{
-    HtmlTag select{"select", fmt::format("name=\"{}\"", esphttpdutils::htmlentities(key)), body};
-
-    iterateLedstripAnimation([&](T enumVal, std::string_view enumKey){
-        HtmlTag option{"option", fmt::format("value=\"{}\"{}", std::to_underlying(enumVal), value == enumVal ? " selected" : ""), body};
-        body += esphttpdutils::htmlentities(enumKey);
-    });
-}
-
-template<typename T>
-typename std::enable_if<
     std::is_same_v<T, HandbremseMode>
 , void>::type
 showInputForSetting(std::string_view key, T value, std::string &body)
 {
     HtmlTag select{"select", fmt::format("name=\"{}\"", esphttpdutils::htmlentities(key)), body};
 
-    iterateHandbremseMode([&](T enumVal, std::string_view enumKey){
+    iterateEnum<T>::iterate([&](T enumVal, std::string_view enumKey){
-        HtmlTag option{"option", fmt::format("value=\"{}\"{}", std::to_underlying(enumVal), value == enumVal ? " selected" : ""), body};
-        body += esphttpdutils::htmlentities(enumKey);
-    });
-}
-
-template<typename T>
-typename std::enable_if<
-    std::is_same_v<T, BobbyQuickActions>
-, void>::type
-showInputForSetting(std::string_view key, T value, std::string &body)
-{
-    HtmlTag select{"select", fmt::format("name=\"{}\"", esphttpdutils::htmlentities(key)), body};
-
-    iterateBobbyQuickActions([&](T enumVal, std::string_view enumKey){
         HtmlTag option{"option", fmt::format("value=\"{}\"{}", std::to_underlying(enumVal), value == enumVal ? " selected" : ""), body};
         body += esphttpdutils::htmlentities(enumKey);
     });

switchconf.sh

@@ -12,6 +12,7 @@ VALID_CONFIGS=(
     "gernot"
     "comred_new"
     "aveexy"
+    "testdevice"
 )
 
 print_usage() {