diff --git a/main/bobbyblinker.cpp b/main/bobbyblinker.cpp index c9bc71e..3754a77 100644 --- a/main/bobbyblinker.cpp +++ b/main/bobbyblinker.cpp @@ -18,7 +18,7 @@ namespace { void sendState(const std::string& state) { - if (const auto error = espnow::send_espnow_message(fmt::format("{}:{}:{}", state, espchrono::utc_clock::now().time_since_epoch().count(), configs.anhaenger_id.value)); error != ESP_OK) + if (const auto error = espnow::send_espnow_message(fmt::format("{}:{}:{}", state, espchrono::utc_clock::now().time_since_epoch().count(), configs.anhaenger_id.value())); error != ESP_OK) { ESP_LOGE(TAG, "Error sending blinker message: %s", esp_err_to_name(error)); } @@ -33,7 +33,7 @@ namespace bobbyblinker { void handle_blinker() { - if (!configs.espnow.syncBlink.value) + if (!configs.espnow.syncBlink.value()) return; const bool blinker_state = (cpputils::is_in(blinkAnimation, LEDSTRIP_OVERWRITE_BLINKLEFT, LEDSTRIP_OVERWRITE_BLINKRIGHT, LEDSTRIP_OVERWRITE_BLINKBOTH)); @@ -58,7 +58,7 @@ namespace bobbyblinker { blinker_last_time_sent = std::nullopt; sendState("BLINKOFF"); } - if (configs.ledstrip.enableBrakeLights.value && espchrono::ago(*brake_last_time_sent) > 500ms) + if (configs.ledstrip.enableBrakeLights.value() && espchrono::ago(*brake_last_time_sent) > 500ms) { float avgPwm{}; for (const Controller &controller: controllers) { diff --git a/main/bobbybuttons.cpp b/main/bobbybuttons.cpp index 9c87803..715044f 100644 --- a/main/bobbybuttons.cpp +++ b/main/bobbybuttons.cpp @@ -47,13 +47,13 @@ constexpr const char TAG[] = "BUTTONS"; return Button(BobbyButton::Up2); if (configs.dpadMappingDown2.value() == button) return Button(BobbyButton::Down2); - if (configs.dpadMappingExtra1.value == button) + if (configs.dpadMappingExtra1.value() == button) return Button(BobbyButton::Extra1); - if (configs.dpadMappingExtra2.value == button) + if (configs.dpadMappingExtra2.value() == button) return Button(BobbyButton::Extra2); - if (configs.dpadMappingExtra3.value == button) + if (configs.dpadMappingExtra3.value() == button) return Button(BobbyButton::Extra3); - if (configs.dpadMappingExtra4.value == button) + if (configs.dpadMappingExtra4.value() == button) return Button(BobbyButton::Extra4); ESP_LOGW(TAG, "unknown raw button %hhu", button); diff --git a/main/dpad_boardcomputer_v2.cpp b/main/dpad_boardcomputer_v2.cpp index fafbd68..ea56ea2 100644 --- a/main/dpad_boardcomputer_v2.cpp +++ b/main/dpad_boardcomputer_v2.cpp @@ -56,8 +56,8 @@ std::array Helper::read() pinMode(IN3, INPUT_PULLUP); pinMode(IN4, INPUT_PULLUP); - if (configs.buttonReadDelay.value != 0) { - delayMicroseconds(configs.buttonReadDelay.value); + if (configs.buttonReadDelay.value() != 0) { + delayMicroseconds(configs.buttonReadDelay.value()); } else { vPortYield(); } @@ -74,8 +74,8 @@ std::array Helper::read() pinMode(IN3, INPUT_PULLDOWN); pinMode(IN4, INPUT_PULLDOWN); - if (configs.buttonReadDelay.value != 0) { - delayMicroseconds(configs.buttonReadDelay.value); + if (configs.buttonReadDelay.value() != 0) { + delayMicroseconds(configs.buttonReadDelay.value()); } else { vPortYield(); } @@ -96,8 +96,8 @@ std::array Helper::read() pinMode(IN3, INPUT_PULLUP); pinMode(IN4, INPUT_PULLUP); - if (configs.buttonReadDelay.value != 0) { - delayMicroseconds(configs.buttonReadDelay.value); + if (configs.buttonReadDelay.value() != 0) { + delayMicroseconds(configs.buttonReadDelay.value()); } else { vPortYield(); } @@ -114,8 +114,8 @@ std::array Helper::read() pinMode(IN3, INPUT_PULLDOWN); pinMode(IN4, INPUT_PULLDOWN); - if (configs.buttonReadDelay.value != 0) { - delayMicroseconds(configs.buttonReadDelay.value); + if (configs.buttonReadDelay.value() != 0) { + delayMicroseconds(configs.buttonReadDelay.value()); } else { vPortYield(); } @@ -177,7 +177,7 @@ void update() const auto now = espchrono::millis_clock::now(); - const std::chrono::milliseconds dpadDebounce{configs.dpadDebounce.value}; + const std::chrono::milliseconds dpadDebounce{configs.dpadDebounce.value()}; for (auto i = 0; i < newState.size(); i++) if (lastState[i] != newState[i] && now - debounce[i] > dpadDebounce) diff --git a/main/newsettings.h b/main/newsettings.h index 11e9186..bda9bb3 100644 --- a/main/newsettings.h +++ b/main/newsettings.h @@ -270,31 +270,31 @@ public: ConfigWrapperLegacy dpadDebounce {25, DoReset, {}, "dpadDebounce" }; ConfigWrapperLegacy buttonReadDelay {1, DoReset, {}, "buttonDelay" }; - ConfigWrapper dpadMappingLeft {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapLeft" }; - ConfigWrapper dpadMappingRight {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapRight" }; - ConfigWrapper dpadMappingUp {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapUp" }; - ConfigWrapper dpadMappingDown {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapDown" }; - ConfigWrapper dpadMappingProfile0{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile0" }; - ConfigWrapper dpadMappingProfile1{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile1" }; - ConfigWrapper dpadMappingProfile2{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile2" }; - ConfigWrapper dpadMappingProfile3{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile3" }; - ConfigWrapper dpadMappingLeft2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapLeft2" }; - ConfigWrapper dpadMappingRight2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapRight2" }; - ConfigWrapper dpadMappingUp2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapUp2" }; - ConfigWrapper dpadMappingDown2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapDown2" }; - ConfigWrapper dpadMappingExtra1 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra1" }; - ConfigWrapper dpadMappingExtra2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra2" }; - ConfigWrapper dpadMappingExtra3 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra3" }; - ConfigWrapper dpadMappingExtra4 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra4" }; + ConfigWrapperLegacy dpadMappingLeft {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapLeft" }; + ConfigWrapperLegacy dpadMappingRight {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapRight" }; + ConfigWrapperLegacy dpadMappingUp {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapUp" }; + ConfigWrapperLegacy dpadMappingDown {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapDown" }; + ConfigWrapperLegacy dpadMappingProfile0{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile0" }; + ConfigWrapperLegacy dpadMappingProfile1{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile1" }; + ConfigWrapperLegacy dpadMappingProfile2{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile2" }; + ConfigWrapperLegacy dpadMappingProfile3{INPUT_MAPPING_NONE, DoReset, {}, "dpadMapProfile3" }; + ConfigWrapperLegacy dpadMappingLeft2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapLeft2" }; + ConfigWrapperLegacy dpadMappingRight2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapRight2" }; + ConfigWrapperLegacy dpadMappingUp2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapUp2" }; + ConfigWrapperLegacy dpadMappingDown2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapDown2" }; + ConfigWrapperLegacy dpadMappingExtra1 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra1" }; + ConfigWrapperLegacy dpadMappingExtra2 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra2" }; + ConfigWrapperLegacy dpadMappingExtra3 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra3" }; + ConfigWrapperLegacy dpadMappingExtra4 {INPUT_MAPPING_NONE, DoReset, {}, "dpadMapExtra4" }; - ConfigWrapper quickActionLeft2{ BobbyQuickActions::BLINK_LEFT, DoReset, {}, "quickActleft2" }; - ConfigWrapper quickActionRight2{ BobbyQuickActions::BLINK_RIGHT, DoReset, {}, "quickActright2" }; - ConfigWrapper quickActionUp2{ BobbyQuickActions::NONE, DoReset, {}, "quickActup2" }; - ConfigWrapper quickActionDown2{ BobbyQuickActions::HANDBREMSE, DoReset, {}, "quickActdown2" }; - ConfigWrapper quickActionExtra1{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra1" }; - ConfigWrapper quickActionExtra2{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra2" }; - ConfigWrapper quickActionExtra3{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra3" }; - ConfigWrapper quickActionExtra4{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra4" }; + ConfigWrapperLegacy quickActionLeft2{ BobbyQuickActions::BLINK_LEFT, DoReset, {}, "quickActleft2" }; + ConfigWrapperLegacy quickActionRight2{ BobbyQuickActions::BLINK_RIGHT, DoReset, {}, "quickActright2" }; + ConfigWrapperLegacy quickActionUp2{ BobbyQuickActions::NONE, DoReset, {}, "quickActup2" }; + ConfigWrapperLegacy quickActionDown2{ BobbyQuickActions::HANDBREMSE, DoReset, {}, "quickActdown2" }; + ConfigWrapperLegacy quickActionExtra1{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra1" }; + ConfigWrapperLegacy quickActionExtra2{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra2" }; + ConfigWrapperLegacy quickActionExtra3{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra3" }; + ConfigWrapperLegacy quickActionExtra4{ BobbyQuickActions::NONE, DoReset, {}, "quickActextra4" }; std::array wireless_door_configs { WirelessDoorsConfig { "door_id0", "door_token0" }, @@ -465,7 +465,7 @@ public: ConfiguredFeatureFlag esp_now {"featureEspNow", false, false, "espnow"}; } feature; - ConfigWrapper anhaenger_id {0, DoReset, {}, "anhaenger_id" }; + ConfigWrapperLegacy anhaenger_id {0, DoReset, {}, "anhaenger_id" }; struct { ConfigWrapperLegacy bleEnabled {true, DoReset, {}, "bleEnabled" };