Smaller changes
This commit is contained in:
Submodule components/esp-gui-lib updated: 8914f2cc3b...8c450b8116
@ -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
|
||||
)
|
||||
|
@ -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<makeComponent<MenuItem, mainmenu::CurrentTimeText, DummyAction, StaticMenuItemIcon<&bobbyicons::time>>>();
|
||||
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>, SwitchScreenAction<StatusDisplay>, StaticMenuItemIcon<&espgui::icons::back>>>();
|
||||
#ifdef FEATURE_LEDSTRIP
|
||||
|
@ -1,5 +1,8 @@
|
||||
#include "statusdisplay.h"
|
||||
|
||||
// esp-idf includes
|
||||
#include <esp_log.h>
|
||||
|
||||
// 3rdparty lib includes
|
||||
#include <fmt/core.h>
|
||||
#include <espwifistack.h>
|
||||
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user