diff --git a/components/esp-gui-lib b/components/esp-gui-lib index 8914f2c..8c450b8 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit 8914f2cc3bebe516c28159ba5abb7dd96a63624b +Subproject commit 8c450b8116d2aa1c982843a0b6144f626b721301 diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake index 438c036..5372cac 100644 --- a/config_feedc0de.cmake +++ b/config_feedc0de.cmake @@ -80,7 +80,7 @@ set(BOBBYCAR_BUILDFLAGS -DFEATURE_LEDBACKLIGHT -DPINS_LEDBACKLIGHT=23 -DLEDBACKLIGHT_INVERTED - -DFEATURE_GARAGE +# -DFEATURE_GARAGE -DFEATURE_NTP -DFEATURE_WIRELESS_CONFIG -DFEATURE_LEDSTRIP @@ -93,5 +93,6 @@ set(BOBBYCAR_BUILDFLAGS -DOLD_NVS -DFEATURE_DNS_NS # -DSWITCH_BLINK -# -DFEATURE_ESPNOW +# -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET + -DFEATURE_ESPNOW ) diff --git a/main/displays/menus/mainmenu.cpp b/main/displays/menus/mainmenu.cpp index c22001d..024fc6b 100644 --- a/main/displays/menus/mainmenu.cpp +++ b/main/displays/menus/mainmenu.cpp @@ -1,7 +1,5 @@ #include "mainmenu.h" -// esp-idf includes - // 3rdparty lib includes #include "actions/switchscreenaction.h" #include "icons/back.h" @@ -88,8 +86,6 @@ MainMenu::MainMenu() { using namespace espgui; - ESP_LOGI(TAG, "called"); - // constructMenuItem>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); #ifdef FEATURE_LEDSTRIP diff --git a/main/displays/statusdisplay.cpp b/main/displays/statusdisplay.cpp index bf00284..308aff1 100644 --- a/main/displays/statusdisplay.cpp +++ b/main/displays/statusdisplay.cpp @@ -1,5 +1,8 @@ #include "statusdisplay.h" +// esp-idf includes +#include + // 3rdparty lib includes #include #include @@ -26,11 +29,6 @@ namespace { constexpr const char * const TAG = "STATUS"; } // namespace -StatusDisplay::~StatusDisplay() -{ - ESP_LOGI(TAG, "called"); -} - void StatusDisplay::initScreen() { Base::initScreen(); @@ -139,7 +137,7 @@ void StatusDisplay::redraw() } else { - ESP_LOGW("BOBBY", "get_sta_ap_info() failed with %.*s", result.error().size(), result.error().data()); + ESP_LOGW(TAG, "get_sta_ap_info() failed with %.*s", result.error().size(), result.error().data()); goto showStaStatus; } } @@ -158,7 +156,7 @@ showStaStatus: m_labelIpAddress.redraw(wifi_stack::toString(result->ip)); else { - ESP_LOGW("BOBBY", "get_ip_info() failed with %.*s", result.error().size(), result.error().data()); + ESP_LOGW(TAG, "get_ip_info() failed with %.*s", result.error().size(), result.error().data()); goto clearIp; } } @@ -187,13 +185,6 @@ clearIp: m_labelProfile.redraw(profile ? std::to_string(*profile) : "-"); } -void StatusDisplay::stop() -{ - Base::stop(); - - ESP_LOGI(TAG, "called"); -} - void StatusDisplay::buttonPressed(espgui::Button button) { Base::buttonPressed(button); diff --git a/main/displays/statusdisplay.h b/main/displays/statusdisplay.h index b6a3acd..e810b0d 100644 --- a/main/displays/statusdisplay.h +++ b/main/displays/statusdisplay.h @@ -22,11 +22,8 @@ class StatusDisplay : public BobbyDisplay using Base = BobbyDisplay; public: - ~StatusDisplay() override; - void initScreen() override; void redraw() override; - void stop() override; void buttonPressed(espgui::Button button) override;