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

Updated submodule, add debug information, changed timings

Browse Source
This commit is contained in:
CommanderRedYT
2022-12-25 17:05:28 +01:00
parent de6752b1c2
commit 9e3ca7f605
5 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp-gui-lib

Submodule components/esp-gui-lib updated: 8c891bb556...7f24e4bc37

1
configs/sdkconfig_comred_new
View File

@@ -356,6 +356,7 @@ CONFIG_ARDUINO_SELECTIVE_Wire=y
# ESP Gui settings # ESP Gui settings
# #
CONFIG_ESPGUI_MENUDISPLAY_ROWS=10 CONFIG_ESPGUI_MENUDISPLAY_ROWS=10
CONFIG_ESPGUI_ICONS_SWAPBYTES=y
# end of ESP Gui settings # end of ESP Gui settings
# #

48
main/screens/dynamicdebugmenu.cpp
View File

@@ -5,17 +5,19 @@
#include <optional> #include <optional>
// 3rdparty lib includes // 3rdparty lib includes
#include "espchrono.h" #include <actions/dummyaction.h>
#include "fmt/core.h" #include <actions/popscreenaction.h>
#include "randomutils.h" #include <actions/pushscreenaction.h>
#include "esprandom.h" #include <changevaluedisplay.h>
#include "menuitem.h" #include <changevaluedisplay_bool.h>
#include "actions/dummyaction.h" #include <colorinterface.h>
#include "icons/back.h" #include <espchrono.h>
#include "changevaluedisplay.h" #include <esprandom.h>
#include "changevaluedisplay_bool.h" #include <fmt/core.h>
#include "actions/pushscreenaction.h" #include <icons/back.h>
#include "actions/popscreenaction.h" #include <menuitem.h>
#include <randomutils.h>
#include <tftcolors.h>
// local includes // local includes
#include "guihelpers/bobbychangevaluedisplay.h" #include "guihelpers/bobbychangevaluedisplay.h"
@@ -42,6 +44,17 @@ constexpr char TEXT_LOCKTOGGLE[] = "Lock toggle";
constexpr char TEXT_DEBUGTOGGLE[] = "Toggle"; constexpr char TEXT_DEBUGTOGGLE[] = "Toggle";
constexpr char TEXT_DEBUGTOGGLEMENU[] = "Toggle (with menu)"; constexpr char TEXT_DEBUGTOGGLEMENU[] = "Toggle (with menu)";
constexpr char TEXT_OPENPOPUP[] = "Open popup"; constexpr char TEXT_OPENPOPUP[] = "Open popup";
constexpr char TEXT_RED[] = "Red";
constexpr char TEXT_GREEN[] = "Green";
constexpr char TEXT_BLUE[] = "Blue";
constexpr char TEXT_YELLOW[] = "Yellow";
constexpr char TEXT_WHITE[] = "White";
constexpr char TEXT_GRAY[] = "Gray";
constexpr char TEXT_ORANGE[] = "Orange";
constexpr char TEXT_PURPLE[] = "Purple";
constexpr char TEXT_CYAN[] = "Cyan";
constexpr char TEXT_BROWN[] = "Brown";
constexpr char TEXT_PINK[] = "Pink";
constexpr char TEXT_BACK[] = "Back"; constexpr char TEXT_BACK[] = "Back";
bool toggleLocked{}; bool toggleLocked{};
@@ -130,6 +143,19 @@ DynamicDebugMenu::DynamicDebugMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DUMMYITEM>, DummyAction>>();
// color tests
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RED>, StaticColor<espgui::TFT_RED>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GREEN>, StaticColor<espgui::TFT_GREEN>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLUE>, StaticColor<espgui::TFT_BLUE>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_YELLOW>, StaticColor<espgui::TFT_YELLOW>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_WHITE>, StaticColor<espgui::TFT_WHITE>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GRAY>, StaticColor<espgui::TFT_GREY>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ORANGE>, StaticColor<espgui::TFT_ORANGE>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PURPLE>, StaticColor<espgui::TFT_PURPLE>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CYAN>, StaticColor<espgui::TFT_CYAN>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BROWN>, StaticColor<espgui::TFT_BROWN>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PINK>, StaticColor<espgui::TFT_PINK>, DummyAction>>();
// the interesting bits // the interesting bits
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_OPENPOPUP>, OpenPopupAction>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_OPENPOPUP>, OpenPopupAction>>();
constructMenuItem<makeComponent<MenuItem, RandomText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, RandomText, DummyAction>>();

2
main/screens/mainmenu.cpp
View File

@@ -117,7 +117,7 @@ MainMenu::MainMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEMOS>, PushScreenAction<DemosMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEMOS>, PushScreenAction<DemosMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>();
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILES>, PushScreenAction<ProfilesMenu>, StaticMenuItemIcon<&bobbyicons::presets>>>(); } if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILES>, PushScreenAction<ProfilesMenu>, StaticMenuItemIcon<&bobbyicons::presets>>>(); }
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MANAGEPROFILESMENU>,PushScreenAction<ManageProfilesMenu>, StaticMenuItemIcon<&bobbyicons::presets>>>(); } if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MANAGEPROFILESMENU>,PushScreenAction<ManageProfilesMenu>, StaticMenuItemIcon<&bobbyicons::presets>>>(); }
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEBUG>, PushScreenAction<DebugMenu>>>(); } constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEBUG>, PushScreenAction<DebugMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POWEROFF>, PushScreenAction<PoweroffDisplay>, StaticMenuItemIcon<&bobbyicons::poweroff>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POWEROFF>, PushScreenAction<PoweroffDisplay>, StaticMenuItemIcon<&bobbyicons::poweroff>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONFISCATIONMODE>, PushScreenAction<ConfiscationDisplay>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONFISCATIONMODE>, PushScreenAction<ConfiscationDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REBOOT>, PushScreenAction<RebootScreen>, StaticMenuItemIcon<&bobbyicons::reboot>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REBOOT>, PushScreenAction<RebootScreen>, StaticMenuItemIcon<&bobbyicons::reboot>>>();

14
main/taskmanager.cpp
View File

@@ -78,18 +78,18 @@ BobbySchedulerTask schedulerTasksArr[] {
#ifdef FEATURE_SERIAL #ifdef FEATURE_SERIAL
BobbySchedulerTask { "serial", initSerial, updateSerial, 50ms, false }, BobbySchedulerTask { "serial", initSerial, updateSerial, 50ms, false },
#endif #endif
BobbySchedulerTask { "ota", initOta, handleOta, 50ms, false }, BobbySchedulerTask { "ota", initOta, handleOta, 75ms, false },
BobbySchedulerTask { "ble", initBle, handleBle, 100ms, false }, BobbySchedulerTask { "ble", initBle, handleBle, 100ms, false },
BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms, false }, BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms, false },
BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 30ms, false }, BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 24ms, false },
BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 100ms, false }, BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 150ms, false },
BobbySchedulerTask { "cloud", initCloud, updateCloud, 50ms, false }, BobbySchedulerTask { "cloud", initCloud, updateCloud, 50ms, false },
BobbySchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms, false }, BobbySchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms, false },
BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms, false }, BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 15ms, false },
BobbySchedulerTask { "drivingstatistics", initStatistics, calculateStatistics, 100ms, false }, BobbySchedulerTask { "drivingstatistics", initStatistics, calculateStatistics, 150ms, false },
BobbySchedulerTask { "dnsannounce", init_dns_announce, handle_dns_announce, 100ms, false }, BobbySchedulerTask { "dnsannounce", init_dns_announce, handle_dns_announce, 250ms, false },
BobbySchedulerTask { "updateDisp", not_needed, bobby::updateDisplay, 20ms, true }, BobbySchedulerTask { "updateDisp", not_needed, bobby::updateDisplay, 20ms, true },
BobbySchedulerTask { "redrawDisp", not_needed, bobby::redrawDisplay, 40ms, true }, BobbySchedulerTask { "redrawDisp", not_needed, bobby::redrawDisplay, 80ms, true },
BobbySchedulerTask { "feedbackEmulator", feedbackemulator::init, feedbackemulator::update, 500ms, false}, BobbySchedulerTask { "feedbackEmulator", feedbackemulator::init, feedbackemulator::update, 500ms, false},
}; };
} // namespace } // namespace