pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-10 15:37:17 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix build errors and add T190 for testing

Browse Source
This commit is contained in:
Jason P 2025-06-29 08:03:28 -05:00
parent 3598c40aa5
commit 991284ced5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/draw/MenuHandler.cpp
View File

@ -307,10 +307,12 @@ void menuHandler::systemBaseMenu()
#if HAS_TFT #if HAS_TFT
static const char *optionsArray[] = {"Back", "Beeps Action", "Switch to MUI"}; static const char *optionsArray[] = {"Back", "Beeps Action", "Switch to MUI"};
options = 3; options = 3;
#endif #ifelse defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190)
#ifdef HELTEC_MESH_NODE_T114
static const char *optionsArray[] = {"Back", "Beeps Action", "Screen Color"}; static const char *optionsArray[] = {"Back", "Beeps Action", "Screen Color"};
options = 3; options = 3;
#else
static const char *optionsArray[] = {"Back", "Beeps Action"};
options = 2;
#endif #endif
optionsArrayPtr = optionsArray; optionsArrayPtr = optionsArray;
screen->showOverlayBanner("System Action", 30000, optionsArrayPtr, options, [](int selected) -> void { screen->showOverlayBanner("System Action", 30000, optionsArrayPtr, options, [](int selected) -> void {
@ -322,7 +324,7 @@ void menuHandler::systemBaseMenu()
#if HAS_TFT #if HAS_TFT
menuHandler::menuQueue = menuHandler::mui_picker; menuHandler::menuQueue = menuHandler::mui_picker;
#endif #endif
#ifdef HELTEC_MESH_NODE_T114 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190)
menuHandler::menuQueue = menuHandler::tftcolormenupicker; menuHandler::menuQueue = menuHandler::tftcolormenupicker;
#endif #endif
screen->setInterval(0); screen->setInterval(0);
@ -485,7 +487,6 @@ void menuHandler::TFTColorPickerMenu()
{ {
static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Red", "Orange", "Purple", "Teal"}; static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Red", "Orange", "Purple", "Teal"};
screen->showOverlayBanner("Current Screen Color?", 30000, optionsArray, 7, [](int selected) -> void { screen->showOverlayBanner("Current Screen Color?", 30000, optionsArray, 7, [](int selected) -> void {
// auto *tft = static_cast<ST7789Spi *>(dispdev);
if (selected == 1) { if (selected == 1) {
LOG_INFO("Setting color to soft yellow"); LOG_INFO("Setting color to soft yellow");
TFT_MESH = COLOR565(255, 255, 128); TFT_MESH = COLOR565(255, 255, 128);
@ -506,10 +507,13 @@ void menuHandler::TFTColorPickerMenu()
TFT_MESH = COLOR565(64, 224, 208); TFT_MESH = COLOR565(64, 224, 208);
} }
#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190)
if (selected != 0) { if (selected != 0) {
static_cast<ST7789Spi *>(screen->getDisplayDevice())->setRGB(TFT_MESH); static_cast<ST7789Spi *>(screen->getDisplayDevice())->setRGB(TFT_MESH);
screen->setFrames(graphics::Screen::FOCUS_SYSTEM); screen->setFrames(graphics::Screen::FOCUS_SYSTEM);
} }
#endif
}); });
} }