diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake index 1067dee..7b5ba5e 100644 --- a/config_allfeatures.cmake +++ b/config_allfeatures.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL # -DFEATURE_MOSFETS -DFEATURE_WEBSERVER - -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/config_comred.cmake b/config_comred.cmake index ec64278..8a6867f 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL # -DFEATURE_MOSFETS -DFEATURE_WEBSERVER - -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake index 9aa3a22..99fe846 100644 --- a/config_feedc0de.cmake +++ b/config_feedc0de.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL -DFEATURE_MOSFETS -DFEATURE_WEBSERVER - -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/config_greyhash.cmake b/config_greyhash.cmake index 8afda6c..6dcefb3 100644 --- a/config_greyhash.cmake +++ b/config_greyhash.cmake @@ -16,6 +16,7 @@ add_definitions( ) set(BOBBYCAR_BUILDFLAGS +<<<<<<< HEAD -DFEATURE_ADC_IN -DPINS_GAS=34 -DPINS_BREMS=35 @@ -74,6 +75,69 @@ set(BOBBYCAR_BUILDFLAGS # -DSWITCH_BLINK # -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_ESPNOW +======= +# Pins + -DPINS_GAS=34 + -DPINS_BREMS=35 +# -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_WEBSERVER +# -DFEATURE_BLUETOOTH +# -DFEATURE_BMS +# -DFEATURE_GAMETRAK +# -DFEATURE_POWERSUPPLY +# -DFEATURE_LEDBACKLIGHT +# -DFEATURE_ESPNOW + + -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=3 + -DDEFAULT_IDCMAX=4 + -DDEFAULT_NMOTMAX=2000 + -DDEFAULT_FIELDWEAKMAX=1 + -DDEFAULT_FIELDADVMAX=40 + +# DPAD + -DFEATURE_DPAD_5WIRESW_2OUT + -DPINS_DPAD_5WIRESW_OUT1=18 + -DPINS_DPAD_5WIRESW_OUT2=19 + -DPINS_DPAD_5WIRESW_IN1=4 + -DPINS_DPAD_5WIRESW_IN2=5 + -DPINS_DPAD_5WIRESW_IN3=27 +# -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 +>>>>>>> 6934614 (Moved FEATURE_OTA into config-system) ) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") diff --git a/config_mick.cmake b/config_mick.cmake index ec66fda..338a9f5 100644 --- a/config_mick.cmake +++ b/config_mick.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL # -DFEATURE_MOSFETS -DFEATURE_WEBSERVER - -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake index ef2944f..c6027fc 100644 --- a/config_nofeatures.cmake +++ b/config_nofeatures.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL # -DFEATURE_MOSFETS # -DFEATURE_WEBSERVER -# -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/config_peter.cmake b/config_peter.cmake index 2824838..c8ae9af 100644 --- a/config_peter.cmake +++ b/config_peter.cmake @@ -38,7 +38,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_SERIAL # -DFEATURE_MOSFETS -DFEATURE_WEBSERVER - -DFEATURE_OTA # -DFEATURE_BLUETOOTH # -DFEATURE_BMS # -DFEATURE_GAMETRAK diff --git a/main/accessors/settingsaccessors.h b/main/accessors/settingsaccessors.h index 212f7cc..8dbcf77 100644 --- a/main/accessors/settingsaccessors.h +++ b/main/accessors/settingsaccessors.h @@ -189,9 +189,7 @@ struct EnableLedstripStVOFrontlight : public NewSettingsAccessor { ConfigW struct AnimationMultiplierAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.ledstrip.animationMultiplier; } }; struct LedstripBrightnessAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.ledstrip.brightness; } }; struct LedstripEnableBlinkAnimationAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.ledstrip.enableAnimBlink; } }; -#ifdef FEATURE_OTA struct LedstripOtaAnimationAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.ledstrip.otaMode; } }; -#endif struct LedstripEnableVisualizeBlinkAnimationAccessor : public NewSettingsAccessor { ConfigWrapper &getConfig() const override { return configs.ledstrip.enableVisualizeBlink; } }; // Battery diff --git a/main/buildserver.cpp b/main/buildserver.cpp index 8ea6dca..3c9e1c0 100644 --- a/main/buildserver.cpp +++ b/main/buildserver.cpp @@ -16,8 +16,6 @@ #include "globals.h" #include "newsettings.h" -#ifdef FEATURE_OTA - namespace buildserver { uint16_t count_available_buildserver() @@ -271,4 +269,3 @@ namespace buildserver { } } // namespace SelectBuild } // namespace buildserver -#endif diff --git a/main/buildserver.h b/main/buildserver.h index 99eb6d8..c45f2f5 100644 --- a/main/buildserver.h +++ b/main/buildserver.h @@ -6,7 +6,6 @@ #include #include -#ifdef FEATURE_OTA namespace buildserver { uint16_t count_available_buildserver(); @@ -48,4 +47,3 @@ namespace SelectBuild { bool get_request_running(); } // namespace SelectBuild } // namespace buildserver -#endif diff --git a/main/displays/menus/aboutmenu.cpp b/main/displays/menus/aboutmenu.cpp index 535c7c3..02a5812 100644 --- a/main/displays/menus/aboutmenu.cpp +++ b/main/displays/menus/aboutmenu.cpp @@ -8,11 +8,9 @@ #include "esptexthelpers.h" #include "displays/menus/settingsmenu.h" -#ifdef FEATURE_OTA #include #include #include "fmt/core.h" -#endif namespace { constexpr char TEXT_ABOUT[] = "About"; @@ -23,17 +21,13 @@ class CurrentVersionText : public virtual espgui::TextInterface public: std::string text() const override { -#ifdef FEATURE_OTA if (const esp_app_desc_t *app_desc = esp_ota_get_app_description()) { return fmt::format("Version: {}", app_desc->version); } -#endif - return "Version: 1.0"; + return "Version: Unkown"; }; }; - -constexpr char TEXT_VERSION[] = "Version: 1.0"; } // namespace AboutMenu::AboutMenu() diff --git a/main/displays/menus/ledstripmenu.cpp b/main/displays/menus/ledstripmenu.cpp index c0ed836..1c68458 100644 --- a/main/displays/menus/ledstripmenu.cpp +++ b/main/displays/menus/ledstripmenu.cpp @@ -166,9 +166,8 @@ LedstripMenu::LedstripMenu() if (!simplified) { constructMenuItem, espgui::SwitchScreenAction>>(); } constructMenuItem, espgui::SwitchScreenAction>>(); -#ifdef FEATURE_OTA - if (!simplified) { constructMenuItem, espgui::SwitchScreenAction>>(); } -#endif + if (configs.feature.ota.value) + if (!simplified) { constructMenuItem, espgui::SwitchScreenAction>>(); } constructMenuItem, espgui::SwitchScreenAction>>(); if (!simplified) { constructMenuItem, espgui::SwitchScreenAction>>(); } if (!simplified) { constructMenuItem, espgui::SwitchScreenAction>>(); } diff --git a/main/displays/menus/ledstripselectotamode.cpp b/main/displays/menus/ledstripselectotamode.cpp index c84bf25..81dd95a 100644 --- a/main/displays/menus/ledstripselectotamode.cpp +++ b/main/displays/menus/ledstripselectotamode.cpp @@ -10,7 +10,6 @@ #include "utils.h" #include "ledstripmenu.h" -#ifdef FEATURE_OTA namespace { constexpr char TEXT_BLINKANIMATION[] = "Blink animation"; constexpr char TEXT_OTAANIM_NONE[] = "None"; @@ -47,4 +46,3 @@ void LedstripOtaAnimationChangeMenu::back() { espgui::switchScreen(); } -#endif diff --git a/main/displays/menus/ledstripselectotamode.h b/main/displays/menus/ledstripselectotamode.h index b104d12..982f02c 100644 --- a/main/displays/menus/ledstripselectotamode.h +++ b/main/displays/menus/ledstripselectotamode.h @@ -3,7 +3,6 @@ // local includes #include "displays/bobbymenudisplay.h" -#ifdef FEATURE_OTA class LedstripOtaAnimationChangeMenu : public BobbyMenuDisplay { public: @@ -12,4 +11,3 @@ public: std::string text() const override; void back() override; }; -#endif diff --git a/main/displays/menus/mainmenu.cpp b/main/displays/menus/mainmenu.cpp index 546df67..9837aae 100644 --- a/main/displays/menus/mainmenu.cpp +++ b/main/displays/menus/mainmenu.cpp @@ -39,9 +39,7 @@ #include "icons/settings.h" #include "icons/lock.h" #include "icons/demos.h" -#ifdef FEATURE_OTA #include "icons/update.h" -#endif #include "icons/neopixel.h" #include "icons/poweroff.h" #include "icons/reboot.h" @@ -104,9 +102,8 @@ MainMenu::MainMenu() if (SHOWITEM) { constructMenuItem, SwitchScreenAction>>(); } } #endif -#ifdef FEATURE_OTA - if (SHOWITEM) { constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::update>>>(); } -#endif + if (configs.feature.ota.value) + if (SHOWITEM) { constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::update>>>(); } if (SHOWITEM) { constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::graph>>>(); } #if defined(FEATURE_CAN) && defined(FEATURE_POWERSUPPLY) if (SHOWITEM) { constructMenuItem, SwitchScreenAction>>(); } diff --git a/main/displays/menus/otamenu.cpp b/main/displays/menus/otamenu.cpp index 007e6e4..64dceb3 100644 --- a/main/displays/menus/otamenu.cpp +++ b/main/displays/menus/otamenu.cpp @@ -15,7 +15,6 @@ #include "displays/menus/mainmenu.h" #include "displays/updatedisplay.h" -#ifdef FEATURE_OTA namespace { constexpr char TEXT_UPDATE[] = "Update"; constexpr char TEXT_UPDATENOW[] = "Update now"; @@ -44,4 +43,3 @@ void OtaMenu::back() { espgui::switchScreen(); } -#endif diff --git a/main/displays/menus/selectbuildserverbranch.cpp b/main/displays/menus/selectbuildserverbranch.cpp index 5412f84..931c8e3 100644 --- a/main/displays/menus/selectbuildserverbranch.cpp +++ b/main/displays/menus/selectbuildserverbranch.cpp @@ -1,4 +1,3 @@ -#ifdef FEATURE_OTA #include "selectbuildserverbranch.h" // 3rd party includes @@ -164,4 +163,3 @@ void SelectBuildserverBranchMenu::buildMenuRequestError(std::string error) item.setTitle(error); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } -#endif diff --git a/main/displays/menus/selectbuildserverbranch.h b/main/displays/menus/selectbuildserverbranch.h index 92a4fd1..d0326f4 100644 --- a/main/displays/menus/selectbuildserverbranch.h +++ b/main/displays/menus/selectbuildserverbranch.h @@ -3,8 +3,6 @@ // local includes #include "displays/bobbymenudisplay.h" -#ifdef FEATURE_OTA - class SelectBuildserverBranchMenu : public BobbyMenuDisplay { using Base = espgui::MenuDisplay; @@ -17,5 +15,3 @@ public: void update() override; void back() override; }; - -#endif diff --git a/main/displays/menus/selectbuildservermenu.cpp b/main/displays/menus/selectbuildservermenu.cpp index 87f6786..87b84d0 100644 --- a/main/displays/menus/selectbuildservermenu.cpp +++ b/main/displays/menus/selectbuildservermenu.cpp @@ -15,8 +15,6 @@ #include "utils.h" #include "newsettings.h" -#ifdef FEATURE_OTA - using namespace buildserver::SelectBuild; namespace { @@ -84,4 +82,3 @@ void SelectBuildServerMenu::back() { espgui::switchScreen(); } -#endif diff --git a/main/displays/menus/selectbuildservermenu.h b/main/displays/menus/selectbuildservermenu.h index bb84d20..7a3b26e 100644 --- a/main/displays/menus/selectbuildservermenu.h +++ b/main/displays/menus/selectbuildservermenu.h @@ -5,8 +5,6 @@ // local includes #include "displays/bobbymenudisplay.h" -#ifdef FEATURE_OTA - class SelectBuildServerMenu : public BobbyMenuDisplay { public: @@ -16,4 +14,3 @@ public: void back() override; }; -#endif diff --git a/main/displays/menus/selectotabuildmenu.cpp b/main/displays/menus/selectotabuildmenu.cpp index 7853c76..caa706a 100644 --- a/main/displays/menus/selectotabuildmenu.cpp +++ b/main/displays/menus/selectotabuildmenu.cpp @@ -15,7 +15,6 @@ #include "globals.h" #include "newsettings.h" -#ifdef FEATURE_OTA #define MESSAGE(text) constructMenuItem, DefaultFont, StaticColor, DummyAction>>() using namespace espgui; @@ -151,4 +150,3 @@ void SelectBuildMenu::back() { switchScreen(); } -#endif diff --git a/main/displays/menus/selectotabuildmenu.h b/main/displays/menus/selectotabuildmenu.h index 4eedc55..1e3c153 100644 --- a/main/displays/menus/selectotabuildmenu.h +++ b/main/displays/menus/selectotabuildmenu.h @@ -3,8 +3,6 @@ // local includes #include "displays/bobbymenudisplay.h" -#ifdef FEATURE_OTA - class SelectBuildMenu : public BobbyMenuDisplay { using Base = BobbyMenuDisplay; @@ -21,4 +19,3 @@ private: void buildMenuFromJson(); void buildMenuRequestError(std::string error); }; -#endif diff --git a/main/displays/menus/settingsmenu.cpp b/main/displays/menus/settingsmenu.cpp index d1e0b9e..5e2076e 100644 --- a/main/displays/menus/settingsmenu.cpp +++ b/main/displays/menus/settingsmenu.cpp @@ -96,9 +96,8 @@ SettingsMenu::SettingsMenu() constructMenuItem, SwitchScreenAction>>(); if (configs.feature.udpcloud.value) constructMenuItem, SwitchScreenAction>>(); -#ifdef FEATURE_OTA - constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::update>>>(); -#endif + if (configs.feature.ota.value) + constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::update>>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::time>>>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::hardware>>>(); diff --git a/main/displays/updatedisplay.cpp b/main/displays/updatedisplay.cpp index 9ab6075..31a1b5c 100644 --- a/main/displays/updatedisplay.cpp +++ b/main/displays/updatedisplay.cpp @@ -10,10 +10,8 @@ // 3rdparty lib includes #include #include -#ifdef FEATURE_OTA #include #include -#endif // local includes #include "globals.h" @@ -21,7 +19,6 @@ #include "displays/menus/otamenu.h" #include "newsettings.h" -#ifdef FEATURE_OTA void UpdateDisplay::initScreen() { Base::initScreen(); @@ -118,4 +115,3 @@ void UpdateDisplay::buttonPressed(espgui::Button button) default:; } } -#endif diff --git a/main/displays/updatedisplay.h b/main/displays/updatedisplay.h index b845f3b..6a7e9d6 100644 --- a/main/displays/updatedisplay.h +++ b/main/displays/updatedisplay.h @@ -7,7 +7,6 @@ // local includes #include "bobbydisplay.h" -#ifdef FEATURE_OTA class UpdateDisplay : public BobbyDisplay { using Base = BobbyDisplay; @@ -28,4 +27,3 @@ private: espgui::Label m_newVersionLabel{20, 275}; }; -#endif diff --git a/main/ledstrip.cpp b/main/ledstrip.cpp index afca764..38083ad 100644 --- a/main/ledstrip.cpp +++ b/main/ledstrip.cpp @@ -200,9 +200,7 @@ void showAnimation() { if (configs.ledstrip.enableLedAnimation.value && !simplified -#ifdef FEATURE_OTA && !(asyncOtaTaskStarted && configs.ledstrip.otaMode.value != OtaAnimationModes::None) -#endif ) { switch (configs.ledstrip.animationType.value) @@ -214,20 +212,17 @@ void showAnimation() default: showDefaultLedstrip(); } } -#ifdef FEATURE_OTA else if (asyncOtaTaskStarted && configs.ledstrip.otaMode.value != OtaAnimationModes::None) { // show ota animation showOtaAnimation(); } -#endif else { std::fill(std::begin(leds), std::end(leds), CRGB{0, 0, 0}); } } -#ifdef FEATURE_OTA void showOtaAnimation() { std::fill(std::begin(leds), std::end(leds), CRGB{0,0,0}); @@ -256,7 +251,6 @@ void showOtaAnimation() } } } -#endif void showBetterRainbow() { diff --git a/main/ledstrip.h b/main/ledstrip.h index bef628f..06f0037 100644 --- a/main/ledstrip.h +++ b/main/ledstrip.h @@ -45,9 +45,7 @@ void showAnimation(); void showBetterRainbow(); void showSpeedSyncAnimation(); void showCustomColor(); -#ifdef FEATURE_OTA void showOtaAnimation(); -#endif void initLedStrip(); void updateLedStrip(); diff --git a/main/newsettings.h b/main/newsettings.h index 4ae157d..bfe387c 100644 --- a/main/newsettings.h +++ b/main/newsettings.h @@ -314,6 +314,7 @@ public: ConfigWrapper dnsannounce {false, DoReset, {}, "f_dnsannounce" }; ConfigWrapper ntp {false, DoReset, {}, "f_ntp" }; ConfigWrapper ble {false, DoReset, {}, "f_ble" }; + ConfigWrapper ota {false, DoReset, {}, "f_ota" }; ConfigWrapper gschissene_diode {false, DoReset, {}, "f_gschissDiode" }; } feature; @@ -614,6 +615,7 @@ public: x(feature.dnsannounce) \ x(feature.ntp) \ x(feature.ble) \ + x(feature.ota) \ x(feature.gschissene_diode) //x(bleSettings.bleEnabled) @@ -625,7 +627,8 @@ public: x(feature.cloud) \ x(feature.dnsannounce) \ x(feature.ntp) \ - x(feature.ble) + x(feature.ble) \ + x(feature.ota) //x(feature.gschisseneDiode) template diff --git a/main/ota.cpp b/main/ota.cpp index 06214ae..264aa01 100644 --- a/main/ota.cpp +++ b/main/ota.cpp @@ -6,7 +6,9 @@ // 3rdparty lib includes #include -#ifdef FEATURE_OTA +// local includes +#include "globals.h" + cpputils::DelayedConstruction asyncOta; bool asyncOtaTaskStarted{}; @@ -26,6 +28,9 @@ void handleOta() tl::expected triggerOta(std::string_view url) { + if (!configs.feature.ota.value) + return tl::make_unexpected("OTA is not enabled!"); + ESP_LOGI(TAG, "%.*s", url.size(), url.data()); if (!asyncOta) @@ -49,4 +54,3 @@ tl::expected triggerOta(std::string_view url) return {}; } -#endif diff --git a/main/ota.h b/main/ota.h index 0b501da..6eb41a0 100644 --- a/main/ota.h +++ b/main/ota.h @@ -1,18 +1,12 @@ #pragma once // 3rdparty lib includes -#ifdef FEATURE_OTA #include -#endif #include -// local includes - -#ifdef FEATURE_OTA extern cpputils::DelayedConstruction asyncOta; extern bool asyncOtaTaskStarted; void initOta(); void handleOta(); tl::expected triggerOta(std::string_view url); -#endif diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp index b229ea8..abb4789 100644 --- a/main/taskmanager.cpp +++ b/main/taskmanager.cpp @@ -45,9 +45,7 @@ #ifdef FEATURE_SERIAL #include "serial_bobby.h" #endif -#ifdef FEATURE_OTA #include "ota.h" -#endif #include "ble_bobby.h" #ifdef FEATURE_WEBSERVER #include "webserver.h" @@ -108,9 +106,7 @@ BobbySchedulerTask schedulerTasksArr[] { #ifdef FEATURE_SERIAL BobbySchedulerTask { "serial", initSerial, updateSerial, 50ms }, #endif -#ifdef FEATURE_OTA BobbySchedulerTask { "ota", initOta, handleOta, 50ms }, -#endif BobbySchedulerTask { "ble", initBle, handleBle, 100ms }, #ifdef FEATURE_WEBSERVER BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms }, diff --git a/main/webserver.cpp b/main/webserver.cpp index 9c60b98..945d493 100644 --- a/main/webserver.cpp +++ b/main/webserver.cpp @@ -20,9 +20,7 @@ // local includes #include "webserver_lock.h" #include "webserver_displaycontrol.h" -#ifdef FEATURE_OTA #include "webserver_ota.h" -#endif #include "webserver_settings.h" #include "webserver_newsettings.h" #include "webserver_dumpnvs.h" @@ -74,11 +72,9 @@ void initWebserver() httpd_uri_t { .uri = "/triggerItem", .method = HTTP_GET, .handler = webserver_triggerItem_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/setValue", .method = HTTP_GET, .handler = webserver_setValue_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/reboot", .method = HTTP_GET, .handler = webserver_reboot_handler, .user_ctx = NULL }, -#ifdef FEATURE_OTA httpd_uri_t { .uri = "/ota", .method = HTTP_GET, .handler = webserver_ota_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/otaPercent", .method = HTTP_GET, .handler = webserver_ota_percentage_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/triggerOta", .method = HTTP_GET, .handler = webserver_trigger_ota_handler, .user_ctx = NULL }, -#endif httpd_uri_t { .uri = "/settings", .method = HTTP_GET, .handler = webserver_settings_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/saveSettings", .method = HTTP_GET, .handler = webserver_saveSettings_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/newSettings", .method = HTTP_GET, .handler = webserver_newSettings_handler, .user_ctx = NULL }, diff --git a/main/webserver_displaycontrol.cpp b/main/webserver_displaycontrol.cpp index be21141..b1c7e5c 100644 --- a/main/webserver_displaycontrol.cpp +++ b/main/webserver_displaycontrol.cpp @@ -181,10 +181,7 @@ esp_err_t webserver_root_handler(httpd_req_t *req) { HtmlTag pTag{"p", body}; body += "Display control - " -#ifdef FEATURE_OTA "Update - " -#endif - "Settings - " "New Settings - " "Dump NVS"; diff --git a/main/webserver_dumpnvs.cpp b/main/webserver_dumpnvs.cpp index de26b90..f1671f0 100644 --- a/main/webserver_dumpnvs.cpp +++ b/main/webserver_dumpnvs.cpp @@ -38,9 +38,7 @@ typename std::enable_if< !std::is_same::value && !std::is_same::value && !std::is_same::value -#ifdef FEATURE_OTA && !std::is_same::value -#endif , bool>::type showInputForSetting(std::string_view key, T value, JsonObject &body) { @@ -120,8 +118,6 @@ showInputForSetting(std::string_view key, T value, JsonObject &body) return true; } -#ifdef FEATURE_OTA - template typename std::enable_if< std::is_same::value @@ -131,7 +127,6 @@ showInputForSetting(std::string_view key, T value, JsonObject &body) body[key] = int(value); return true; } -#endif esp_err_t webserver_dump_nvs_handler(httpd_req_t *req) { diff --git a/main/webserver_newsettings.cpp b/main/webserver_newsettings.cpp index 955938d..a79d942 100644 --- a/main/webserver_newsettings.cpp +++ b/main/webserver_newsettings.cpp @@ -317,9 +317,7 @@ esp_err_t webserver_newSettings_handler(httpd_req_t *req) { HtmlTag pTag{"p", body}; body += "Display control - " -#ifdef FEATURE_OTA "Update - " -#endif "Settings - " "New Settings - " "Dump NVS"; diff --git a/main/webserver_ota.cpp b/main/webserver_ota.cpp index 7ef9d67..86ebe34 100644 --- a/main/webserver_ota.cpp +++ b/main/webserver_ota.cpp @@ -17,14 +17,12 @@ #include // local includes -#ifdef FEATURE_OTA #include "ota.h" -#endif #include "webserver_lock.h" #include "globals.h" #include "newsettings.h" -#if defined(FEATURE_WEBSERVER) && defined(FEATURE_OTA) +#ifdef FEATURE_WEBSERVER using namespace std::chrono_literals; using esphttpdutils::HtmlTag; diff --git a/main/webserver_ota.h b/main/webserver_ota.h index c76ed46..e1619a4 100644 --- a/main/webserver_ota.h +++ b/main/webserver_ota.h @@ -6,7 +6,7 @@ #endif #include -#if defined(FEATURE_WEBSERVER) && defined(FEATURE_OTA) +#ifdef FEATURE_WEBSERVER esp_err_t webserver_ota_handler(httpd_req_t *req); esp_err_t webserver_ota_percentage_handler(httpd_req_t *req); esp_err_t webserver_trigger_ota_handler(httpd_req_t *req); diff --git a/main/webserver_settings.cpp b/main/webserver_settings.cpp index f6d5ddb..180e9aa 100644 --- a/main/webserver_settings.cpp +++ b/main/webserver_settings.cpp @@ -142,9 +142,7 @@ esp_err_t webserver_settings_handler(httpd_req_t *req) { HtmlTag pTag{"p", body}; body += "Display control - " -#ifdef FEATURE_OTA "Update - " -#endif "Settings - " "New Settings - " "Dump NVS";