Added anhaenger id; everything should work now

2022-05-04 23:19:31 +02:00
parent 950d46b109
commit 8c884c0b4e
6 changed files with 69 additions and 55 deletions
--- a/main/accessors/settingsaccessors.h
+++ b/main/accessors/settingsaccessors.h
@@ -254,3 +254,6 @@ struct QuickActionExtra1Accessor : public NewSettingsAccessor<BobbyQuickActions>
 struct QuickActionExtra2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra2; } };
 struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
 struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
+
+// Other
+struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };
--- a/main/bobbyblinker.cpp
+++ b/main/bobbyblinker.cpp
@@ -18,17 +18,18 @@ namespace {

    void sendState(const std::string& state)
    {
-        if (const auto error = espnow::send_espnow_message(fmt::format("{}:0:0", state)); error != ESP_OK)
+        if (const auto error = espnow::send_espnow_message(fmt::format("{}:0:{}", state, configs.anhaenger_id.value)); error != ESP_OK)
        {
            ESP_LOGE(TAG, "Error sending blinker message: %s", esp_err_to_name(error));
        }
    }

-    bool hasSendNegativePwm{false};
+    bool brakeLightsOffSent{false};
 } // namespace

 namespace bobbyblinker {
    std::optional<espchrono::millis_clock::time_point> blinker_last_time_sent;
+    std::optional<espchrono::millis_clock::time_point> brake_last_time_sent;

    void handle_blinker()
    {
@@ -36,7 +37,7 @@ namespace bobbyblinker {
            return;

        const bool blinker_state = (cpputils::is_in(blinkAnimation, LEDSTRIP_OVERWRITE_BLINKLEFT, LEDSTRIP_OVERWRITE_BLINKRIGHT, LEDSTRIP_OVERWRITE_BLINKBOTH));
-        if ((blinker_state && !blinker_last_time_sent) || (blinker_state && blinker_last_time_sent && espchrono::ago(*blinker_last_time_sent) > 1s))
+        if ((blinker_state && !blinker_last_time_sent) || (blinker_state && blinker_last_time_sent && espchrono::ago(*blinker_last_time_sent) > 500ms))
        {
            blinker_last_time_sent = espchrono::millis_clock::now();
            if (blinkAnimation == LEDSTRIP_OVERWRITE_BLINKLEFT)
@@ -51,37 +52,32 @@ namespace bobbyblinker {
            {
                sendState("BLINKBOTH");
            }
-            else
-            {
-                sendState("BLINKOFF");
-            }
-
-            if (configs.ledstrip.enableBrakeLights.value)
-            {
-                float avgPwm{};
-                for (const Controller &controller: controllers)
-                {
-                    avgPwm +=
-                            controller.command.left.pwm * (controller.invertLeft ? -1 : 1) +
-                            controller.command.right.pwm * (controller.invertRight ? -1 : 1);
-                }
-                avgPwm /= 4;
-
-                if (avgPwm < -1.f && !hasSendNegativePwm)
-                {
-                    sendState("BRAKELIGHTSON");
-                    hasSendNegativePwm = true;
-                }
-                else if (avgPwm > -1.f && hasSendNegativePwm)
-                {
-                    sendState("BRAKELIGHTSOFF");
-                    hasSendNegativePwm = false;
-                }
-            }
        }
        else if (!blinker_state && blinker_last_time_sent)
        {
            blinker_last_time_sent = std::nullopt;
+            sendState("BLINKOFF");
+        }
+        if (configs.ledstrip.enableBrakeLights.value && espchrono::ago(*brake_last_time_sent) > 500ms)
+        {
+            float avgPwm{};
+            for (const Controller &controller: controllers) {
+                avgPwm +=
+                        controller.command.left.pwm * (controller.invertLeft ? -1 : 1) +
+                        controller.command.right.pwm * (controller.invertRight ? -1 : 1);
+            }
+            avgPwm /= 4;
+
+            if (avgPwm < -1.f)
+            {
+                sendState("BRAKELIGHTSON");
+                brakeLightsOffSent = false;
+            }
+            else if (!brakeLightsOffSent && avgPwm > -1.f)
+            {
+                sendState("BRAKELIGHTSOFF");
+                brakeLightsOffSent = true;
+            }
        }
    }
 } // namespace bobbyblinker
--- a/main/bobbyblinker.h
+++ b/main/bobbyblinker.h
@@ -5,5 +5,6 @@

 namespace bobbyblinker {
    extern std::optional<espchrono::millis_clock::time_point> blinker_last_time_sent;
+    extern std::optional<espchrono::millis_clock::time_point> brake_last_time_sent;
    void handle_blinker();
 } // namespace bobbyhupe
--- a/main/displays/menus/settingsmenu.cpp
+++ b/main/displays/menus/settingsmenu.cpp
@@ -9,35 +9,37 @@
 #include "icons/back.h"

 // local includes
-#include "utils.h"
-#include "icons/wifi.h"
-#include "icons/bluetooth.h"
-#include "icons/time.h"
-#include "icons/hardware.h"
-#include "icons/buzzer.h"
-#include "icons/info.h"
-#include "icons/demos.h"
-#include "icons/update.h"
-#include "globals.h"
 #include "accessors/settingsaccessors.h"
-#include "displays/menus/limitssettingsmenu.h"
-#include "displays/menus/networksettingsmenu.h"
-#include "displays/menus/bluetoothsettingsmenu.h"
+#include "bobbycheckbox.h"
+#include "displays/bobbychangevaluedisplay.h"
+#include "displays/menus/aboutmenu.h"
 #include "displays/menus/blesettingsmenu.h"
-#include "displays/menus/cloudsettingsmenu.h"
-#include "displays/menus/udpcloudsettingsmenu.h"
-#include "displays/menus/espnowmenu.h"
-#include "displays/menus/selectbuildservermenu.h"
-#include "displays/menus/timesettingsmenu.h"
-#include "displays/menus/modessettingsmenu.h"
-#include "displays/menus/controllerhardwaresettingsmenu.h"
+#include "displays/menus/bluetoothsettingsmenu.h"
 #include "displays/menus/boardcomputerhardwaresettingsmenu.h"
 #include "displays/menus/buzzermenu.h"
+#include "displays/menus/cloudsettingsmenu.h"
+#include "displays/menus/controllerhardwaresettingsmenu.h"
 #include "displays/menus/crashmenu.h"
-#include "displays/menus/aboutmenu.h"
-#include "displays/menus/mainmenu.h"
+#include "displays/menus/espnowmenu.h"
 #include "displays/menus/featureflagsmenu.h"
-#include "bobbycheckbox.h"
+#include "displays/menus/limitssettingsmenu.h"
+#include "displays/menus/mainmenu.h"
+#include "displays/menus/modessettingsmenu.h"
+#include "displays/menus/networksettingsmenu.h"
+#include "displays/menus/selectbuildservermenu.h"
+#include "displays/menus/timesettingsmenu.h"
+#include "displays/menus/udpcloudsettingsmenu.h"
+#include "globals.h"
+#include "icons/bluetooth.h"
+#include "icons/buzzer.h"
+#include "icons/demos.h"
+#include "icons/hardware.h"
+#include "icons/info.h"
+#include "icons/time.h"
+#include "icons/update.h"
+#include "icons/wifi.h"
+#include "textwithvaluehelper.h"
+#include "utils.h"

 namespace {
 constexpr char TEXT_SETTINGS[] = "Settings";
@@ -55,6 +57,7 @@ constexpr char TEXT_MODESSETTINGS[] = "Modes settings";
 constexpr char TEXT_CONTROLLERHARDWARESETTINGS[] = "Controller H/W settings";
 constexpr char TEXT_BOARDCOMPUTERHARDWARESETTINGS[] = "Boardcomputer H/W settings";
 constexpr char TEXT_FEATUREFLAGS[] = "Feature flags";
+constexpr char TEXT_ANHAENGER_ID[] = "Anhaenger ID";
 constexpr char TEXT_AUTOCONNECTBMS[] = "Auto connect BMS";
 constexpr char TEXT_BUZZER[] = "Buzzer";
 constexpr char TEXT_FRONTLED[] = "Front LED";
@@ -72,6 +75,14 @@ struct BacklightAccessor : public virtual espgui::AccessorInterface<bool>
 #endif
 struct FrontLedAccessor : public espgui::RefAccessor<bool> { bool &getRef() const override { return controllers.front.command.led; } };
 struct BackLedAccessor : public espgui::RefAccessor<bool> { bool &getRef() const override { return controllers.back.command.led; } };
+
+using AnhaengerIdChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<uint16_t>,
+    espgui::StaticText<TEXT_ANHAENGER_ID>,
+    AnhaengerIdAccessor,
+    espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+    espgui::BackActionInterface<espgui::PopScreenAction>
+>;
 } // namespace

 using namespace espgui;
@@ -106,6 +117,7 @@ SettingsMenu::SettingsMenu()
        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>, PushScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();
    }
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FEATUREFLAGS>,                  PushScreenAction<FeatureFlagsMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>();
+    constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_ANHAENGER_ID, AnhaengerIdAccessor>, espgui::PushScreenAction<AnhaengerIdChangeScreen>>>();
 //#if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
 //    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_AUTOCONNECTBMS>,                BobbyCheckbox, AutoConnectBmsAccessor>>();
 //#endif
--- a/main/espnowfunctions.cpp
+++ b/main/espnowfunctions.cpp
@@ -246,7 +246,7 @@ void handle()
            }
            else
            {
-                ESP_LOGI(TAG, "Unkown Type: %s - Message: %s", msg.type.c_str(), msg.content.c_str());
+                ESP_LOGI(TAG, "Unknown Type: %s - Message: %s", msg.type.c_str(), msg.content.c_str());
            }
        }
 clear:
@@ -307,7 +307,7 @@ esp_err_t send_espnow_message(std::string_view message)
        else
        {
            const auto timeAfter = espchrono::millis_clock::now();
-            ESP_LOGI(TAG, "Successfully executed esp_now_send(): Took %lldms", std::chrono::floor<std::chrono::milliseconds>(timeAfter-timeBefore).count());
+            ESP_LOGD(TAG, "Successfully executed esp_now_send(): Took %lldms", std::chrono::floor<std::chrono::milliseconds>(timeAfter-timeBefore).count());
        }
    }
    return ESP_OK;
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -368,6 +368,8 @@ public:
        ConfiguredFeatureFlag esp_now               {"featureEspNow", false, false, "espnow"};
    } feature;

+    ConfigWrapper<uint16_t> anhaenger_id          {0,                                      DoReset,   {},                         "anhaenger_id"        };
+
    struct {
        ConfigWrapper<bool> bleEnabled            {true,                                   DoReset,   {},                         "bleEnabled"          };
    } bleSettings;