feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Smaller changes

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-30 03:50:43 +01:00
parent 7536e1be9a
commit e1a44e0138
5 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp-gui-lib

Submodule components/esp-gui-lib updated: 8914f2cc3b...8c450b8116

5
config_feedc0de.cmake
View File

@@ -80,7 +80,7 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DFEATURE_GARAGE # -DFEATURE_GARAGE
-DFEATURE_NTP -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DFEATURE_LEDSTRIP -DFEATURE_LEDSTRIP
@@ -93,5 +93,6 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
# -DFEATURE_ESPNOW # -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
-DFEATURE_ESPNOW
) )

4
main/displays/menus/mainmenu.cpp
View File

@@ -1,7 +1,5 @@
#include "mainmenu.h" #include "mainmenu.h"
// esp-idf includes
// 3rdparty lib includes // 3rdparty lib includes
#include "actions/switchscreenaction.h" #include "actions/switchscreenaction.h"
#include "icons/back.h" #include "icons/back.h"
@@ -88,8 +86,6 @@ MainMenu::MainMenu()
{ {
using namespace espgui; using namespace espgui;
ESP_LOGI(TAG, "called");
// constructMenuItem<makeComponent<MenuItem, mainmenu::CurrentTimeText, DummyAction, StaticMenuItemIcon<&bobbyicons::time>>>(); // constructMenuItem<makeComponent<MenuItem, mainmenu::CurrentTimeText, DummyAction, StaticMenuItemIcon<&bobbyicons::time>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>, SwitchScreenAction<StatusDisplay>, StaticMenuItemIcon<&espgui::icons::back>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>, SwitchScreenAction<StatusDisplay>, StaticMenuItemIcon<&espgui::icons::back>>>();
#ifdef FEATURE_LEDSTRIP #ifdef FEATURE_LEDSTRIP

19
main/displays/statusdisplay.cpp
View File

@@ -1,5 +1,8 @@
#include "statusdisplay.h" #include "statusdisplay.h"
// esp-idf includes
#include <esp_log.h>
// 3rdparty lib includes // 3rdparty lib includes
#include <fmt/core.h> #include <fmt/core.h>
#include <espwifistack.h> #include <espwifistack.h>
@@ -26,11 +29,6 @@ namespace {
constexpr const char * const TAG = "STATUS"; constexpr const char * const TAG = "STATUS";
} // namespace } // namespace
StatusDisplay::~StatusDisplay()
{
ESP_LOGI(TAG, "called");
}
void StatusDisplay::initScreen() void StatusDisplay::initScreen()
{ {
Base::initScreen(); Base::initScreen();
@@ -139,7 +137,7 @@ void StatusDisplay::redraw()
} }
else 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; goto showStaStatus;
} }
} }
@@ -158,7 +156,7 @@ showStaStatus:
m_labelIpAddress.redraw(wifi_stack::toString(result->ip)); m_labelIpAddress.redraw(wifi_stack::toString(result->ip));
else 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; goto clearIp;
} }
} }
@@ -187,13 +185,6 @@ clearIp:
m_labelProfile.redraw(profile ? std::to_string(*profile) : "-"); m_labelProfile.redraw(profile ? std::to_string(*profile) : "-");
} }
void StatusDisplay::stop()
{
Base::stop();
ESP_LOGI(TAG, "called");
}
void StatusDisplay::buttonPressed(espgui::Button button) void StatusDisplay::buttonPressed(espgui::Button button)
{ {
Base::buttonPressed(button); Base::buttonPressed(button);

3
main/displays/statusdisplay.h
View File

@@ -22,11 +22,8 @@ class StatusDisplay : public BobbyDisplay
using Base = BobbyDisplay; using Base = BobbyDisplay;
public: public:
~StatusDisplay() override;
void initScreen() override; void initScreen() override;
void redraw() override; void redraw() override;
void stop() override;
void buttonPressed(espgui::Button button) override; void buttonPressed(espgui::Button button) override;