From ac8705f13be0dd951002d5de0710d9591f243a0c Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 24 Mar 2024 02:34:28 +0100
Subject: [PATCH] feat: allow configuration of auto dimming for OLED screen
 (#4793)

---
 radio/src/gui/128x64/radio_setup.cpp   | 23 ++++++++++++++++-------
 radio/src/gui/common/stdlcd/features.h |  8 +++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index 8e9e53e51..c5a85d2fd 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -89,7 +89,7 @@ enum {
   CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_OFF)
   CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON)
   CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP)
-  ITEM_RADIO_SETUP_CONTRAST,
+  CASE_CONTRAST(ITEM_RADIO_SETUP_CONTRAST)
   CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
   ITEM_RADIO_SETUP_START_SOUND,
   CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED)
@@ -189,7 +189,7 @@ void menuRadioSetup(event_t event)
     CASE_PWM_BACKLIGHT(0)
     CASE_PWM_BACKLIGHT(0)
     CASE_BACKLIGHT(0)
-    0, // Contrast
+    CASE_CONTRAST(0)
     CASE_SPLASH_PARAM(0)
     0,
     CASE_PWR_BUTTON_PRESS(0)
@@ -471,18 +471,16 @@ void menuRadioSetup(event_t event)
         break;
 #endif
 
+#if !defined(OLED_SCREEN)
       case ITEM_RADIO_SETUP_CONTRAST:
-#if defined(OLED_SCREEN)
-        lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS);
-#else
         lcdDrawTextAlignedLeft(y, STR_CONTRAST);
-#endif
         lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT);
         if (attr) {
           CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
           lcdSetContrast();
         }
         break;
+#endif
 
       case ITEM_RADIO_SETUP_ALARMS_LABEL:
         lcdDrawTextAlignedLeft(y, STR_ALARMS_LABEL);
@@ -525,9 +523,13 @@ void menuRadioSetup(event_t event)
         if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
         break;
 
-#if defined(BACKLIGHT_GPIO)
+#if defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)
       case ITEM_RADIO_SETUP_BACKLIGHT_LABEL:
+#if defined(OLED_SCREEN)
+        lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS);
+#else
         lcdDrawTextAlignedLeft(y, STR_BACKLIGHT_LABEL);
+#endif
         break;
 
       case ITEM_RADIO_SETUP_BACKLIGHT_MODE:
@@ -549,11 +551,18 @@ void menuRadioSetup(event_t event)
 
       case ITEM_RADIO_SETUP_BRIGHTNESS:
         lcdDrawText(INDENT_WIDTH, y, STR_BRIGHTNESS);
+#if defined(OLED_SCREEN)
+        lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT);
+        if (attr) {
+          CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
+          lcdSetContrast();
+#else
         lcdDrawNumber(LCD_W-2, y, 100-g_eeGeneral.backlightBright, attr|RIGHT) ;
         if (attr) {
           uint8_t b = 100 - g_eeGeneral.backlightBright;
           CHECK_INCDEC_GENVAR(event, b, 0, 100);
           g_eeGeneral.backlightBright = 100 - b;
+#endif
         }
         break;
 #endif
diff --git a/radio/src/gui/common/stdlcd/features.h b/radio/src/gui/common/stdlcd/features.h
index e32dde981..13691dbae 100644
--- a/radio/src/gui/common/stdlcd/features.h
+++ b/radio/src/gui/common/stdlcd/features.h
@@ -35,7 +35,13 @@
 #define CASE_IMU(x)
 #endif
 
-#if defined(BACKLIGHT_GPIO)
+#if defined(OLED_SCREEN)
+#define CASE_CONTRAST(x)
+#else
+#define CASE_CONTRAST(x) x,
+#endif
+
+#if defined(BACKLIGHT_GPIO) || defined(OLED_SCREEN)
 #define CASE_BACKLIGHT(x) x,
 #else
 #define CASE_BACKLIGHT(x)