From 9e3ca7f605899ae9cbdc90dbba373421f32e4809 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Sun, 25 Dec 2022 17:05:28 +0100 Subject: [PATCH] Updated submodule, add debug information, changed timings --- components/esp-gui-lib | 2 +- configs/sdkconfig_comred_new | 1 + main/screens/dynamicdebugmenu.cpp | 48 ++++++++++++++++++++++++------- main/screens/mainmenu.cpp | 2 +- main/taskmanager.cpp | 14 ++++----- 5 files changed, 47 insertions(+), 20 deletions(-) diff --git a/components/esp-gui-lib b/components/esp-gui-lib index 8c891bb..7f24e4b 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit 8c891bb55653d0f6d61a71a2c54fbd0e58a7f3db +Subproject commit 7f24e4bc37755249e762edfa974f4388742224d7 diff --git a/configs/sdkconfig_comred_new b/configs/sdkconfig_comred_new index 22111da..8f0f73a 100644 --- a/configs/sdkconfig_comred_new +++ b/configs/sdkconfig_comred_new @@ -356,6 +356,7 @@ CONFIG_ARDUINO_SELECTIVE_Wire=y # ESP Gui settings # CONFIG_ESPGUI_MENUDISPLAY_ROWS=10 +CONFIG_ESPGUI_ICONS_SWAPBYTES=y # end of ESP Gui settings # diff --git a/main/screens/dynamicdebugmenu.cpp b/main/screens/dynamicdebugmenu.cpp index ec4da1d..f97cc75 100644 --- a/main/screens/dynamicdebugmenu.cpp +++ b/main/screens/dynamicdebugmenu.cpp @@ -5,17 +5,19 @@ #include // 3rdparty lib includes -#include "espchrono.h" -#include "fmt/core.h" -#include "randomutils.h" -#include "esprandom.h" -#include "menuitem.h" -#include "actions/dummyaction.h" -#include "icons/back.h" -#include "changevaluedisplay.h" -#include "changevaluedisplay_bool.h" -#include "actions/pushscreenaction.h" -#include "actions/popscreenaction.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // local includes #include "guihelpers/bobbychangevaluedisplay.h" @@ -42,6 +44,17 @@ constexpr char TEXT_LOCKTOGGLE[] = "Lock toggle"; constexpr char TEXT_DEBUGTOGGLE[] = "Toggle"; constexpr char TEXT_DEBUGTOGGLEMENU[] = "Toggle (with menu)"; 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"; bool toggleLocked{}; @@ -130,6 +143,19 @@ DynamicDebugMenu::DynamicDebugMenu() constructMenuItem, DummyAction>>(); constructMenuItem, DummyAction>>(); + // color tests + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + constructMenuItem, StaticColor, DummyAction>>(); + // the interesting bits constructMenuItem, OpenPopupAction>>(); constructMenuItem>(); diff --git a/main/screens/mainmenu.cpp b/main/screens/mainmenu.cpp index 3b8a028..8e56381 100644 --- a/main/screens/mainmenu.cpp +++ b/main/screens/mainmenu.cpp @@ -117,7 +117,7 @@ MainMenu::MainMenu() constructMenuItem, PushScreenAction, StaticMenuItemIcon<&bobbyicons::demos>>>(); if (SHOWITEM) { constructMenuItem, PushScreenAction, StaticMenuItemIcon<&bobbyicons::presets>>>(); } if (SHOWITEM) { constructMenuItem,PushScreenAction, StaticMenuItemIcon<&bobbyicons::presets>>>(); } - if (SHOWITEM) { constructMenuItem, PushScreenAction>>(); } + constructMenuItem, PushScreenAction>>(); constructMenuItem, PushScreenAction, StaticMenuItemIcon<&bobbyicons::poweroff>>>(); constructMenuItem, PushScreenAction>>(); constructMenuItem, PushScreenAction, StaticMenuItemIcon<&bobbyicons::reboot>>>(); diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp index 51e0170..70f8aae 100644 --- a/main/taskmanager.cpp +++ b/main/taskmanager.cpp @@ -78,18 +78,18 @@ BobbySchedulerTask schedulerTasksArr[] { #ifdef FEATURE_SERIAL BobbySchedulerTask { "serial", initSerial, updateSerial, 50ms, false }, #endif - BobbySchedulerTask { "ota", initOta, handleOta, 50ms, false }, + BobbySchedulerTask { "ota", initOta, handleOta, 75ms, false }, BobbySchedulerTask { "ble", initBle, handleBle, 100ms, false }, BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms, false }, - BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 30ms, false }, - BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 100ms, false }, + BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 24ms, false }, + BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 150ms, false }, BobbySchedulerTask { "cloud", initCloud, updateCloud, 50ms, false }, BobbySchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms, false }, - BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms, false }, - BobbySchedulerTask { "drivingstatistics", initStatistics, calculateStatistics, 100ms, false }, - BobbySchedulerTask { "dnsannounce", init_dns_announce, handle_dns_announce, 100ms, false }, + BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 15ms, false }, + BobbySchedulerTask { "drivingstatistics", initStatistics, calculateStatistics, 150ms, false }, + BobbySchedulerTask { "dnsannounce", init_dns_announce, handle_dns_announce, 250ms, false }, 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}, }; } // namespace