thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Merge pull request #154 from TobiasE-github/master 

Dont't display ILUM on Min Power
This commit is contained in:
Norbert Walter 2025-01-26 15:07:52 +01:00 committed by GitHub
parent e7d5ada610 38f1d5de44
commit cbe06f65be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/obp60task/Pagedata.h
View File

@ -95,6 +95,7 @@ typedef struct{
uint16_t fgcolor; uint16_t fgcolor;
uint16_t bgcolor; uint16_t bgcolor;
bool keylock = false; bool keylock = false;
String powermode;
} CommonData; } CommonData;
//a base class that all pages must inherit from //a base class that all pages must inherit from
@ -112,7 +113,7 @@ class Page{
commonData->keydata[2].label = "#LEFT"; commonData->keydata[2].label = "#LEFT";
commonData->keydata[3].label = "#RIGHT"; commonData->keydata[3].label = "#RIGHT";
commonData->keydata[4].label = ""; commonData->keydata[4].label = "";
if (commonData->backlight.mode == KEY) { if ((commonData->backlight.mode == KEY) && !(commonData->powermode == "Min Power")) {
commonData->keydata[5].label = "ILUM"; commonData->keydata[5].label = "ILUM";
} else { } else {
commonData->keydata[5].label = ""; commonData->keydata[5].label = "";

1
lib/obp60task/obp60task.cpp
View File

@ -555,6 +555,7 @@ void OBP60Task(GwApi *api){
commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight,true)->asString()); commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight,true)->asString());
commonData.backlight.color = colorMapping(config->getConfigItem(config->blColor,true)->asString()); commonData.backlight.color = colorMapping(config->getConfigItem(config->blColor,true)->asString());
commonData.backlight.brightness = 2.55 * uint(config->getConfigItem(config->blBrightness,true)->asInt()); commonData.backlight.brightness = 2.55 * uint(config->getConfigItem(config->blBrightness,true)->asInt());
commonData.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
bool uvoltage = api->getConfig()->getConfigItem(api->getConfig()->underVoltage,true)->asBoolean(); bool uvoltage = api->getConfig()->getConfigItem(api->getConfig()->underVoltage,true)->asBoolean();
String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString(); String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();