Merge pull request #154 from TobiasE-github/master

Dont't display ILUM on Min Power
norbert-walter · Jan 26, 2025 · cbe06f6 · cbe06f6
2 parents e7d5ada + 38f1d5d
commit cbe06f6
Show file tree

Hide file tree

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

diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp
@@ -555,6 +555,7 @@ void OBP60Task(GwApi *api){
     commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight,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.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
 
     bool uvoltage = api->getConfig()->getConfigItem(api->getConfig()->underVoltage,true)->asBoolean();
     String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();