TFT brightness corrections

richonguzman · richonguzman · commit 46aef03472f1 · 2025-03-07T11:02:34.000-03:00
diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
@@ -57,7 +57,7 @@ TinyGPSPlus                         gps;
     BluetoothSerial                 SerialBT;
 #endif
 
-String      versionDate             = "2025.03.06";
+String      versionDate             = "2025.03.07";
 
 uint8_t     myBeaconsIndex          = 0;
 int         myBeaconsSize           = Config.beacons.size();
@@ -109,7 +109,7 @@ extern bool gpsIsActive;
 
 void setup() {
     Serial.begin(115200);
-    
+
     #ifndef DEBUG
         logger.setDebugLevel(logging::LoggerLevel::LOGGER_LEVEL_INFO);
     #endif
diff --git a/src/display.cpp b/src/display.cpp
@@ -80,7 +80,7 @@ const uint8_t *symbolsAPRS[]  = {runnerSymbol, carSymbol, jeepSymbol, bikeSymbol
 //#define OLED_DISPLAY_HAS_RST_PIN
 
 int         lastMenuDisplay         = 0;
-uint8_t     screenBrightness        = 1;    //from 1 to 255 to regulate brightness of oled scren
+uint8_t     screenBrightness        = 1;    //from 1 to 255 to regulate brightness of screens
 bool        symbolAvailable         = true;
 
 extern logging::Logger logger;
@@ -155,7 +155,6 @@ extern logging::Logger logger;
         sprite.fillRect(0, 60, 320, 2, greyColorDark);
     }
 
-
     void draw_T_DECK_MenuButtons(int menu) {
         int ladoCuadrado            = 45;
         int curvaCuadrado           = 8;
@@ -460,7 +459,6 @@ void displayShow(const String& header, const String& line1, const String& line2,
     delay(wait);
 }
 
-
 void drawSymbol(int symbolIndex, bool bluetoothActive) {
     const uint8_t *bitMap = symbolsAPRS[symbolIndex];
     #ifdef HAS_TFT
@@ -476,7 +474,6 @@ void drawSymbol(int symbolIndex, bool bluetoothActive) {
     #endif
 }
 
-
 void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, int wait) {
     #ifdef HAS_TFT
         #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp
@@ -332,18 +332,26 @@ namespace KEYBOARD_Utils {
             menuDisplay = 2210;
         } else if (menuDisplay >= 2210 && menuDisplay <= 2212) {
             switch (menuDisplay) {
-                case 2210:
-                    screenBrightness = 1;
+                case 2210:  // low
+                    #ifdef HAS_TFT
+                        screenBrightness = 70;
+                    #else
+                        screenBrightness = 1;
+                    #endif
                     break;
-                case 2211:
-                    screenBrightness = 40;
+                case 2211:  // mid
+                    #ifdef HAS_TFT
+                        screenBrightness = 150;
+                    #else
+                        screenBrightness = 40;
+                    #endif
                     break;
-                case 2212:
+                case 2212:  // max
                     screenBrightness = 255;
                     break;
                 default:
                     #ifdef HAS_TFT
-                        screenBrightness = 40;
+                        screenBrightness = 255;
                     #else
                         screenBrightness = 1;
                     #endif
diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp
@@ -81,13 +81,23 @@ namespace MENU_Utils {
     }
 
     const String screenBrightnessAsString(const uint8_t bright) {
-        if (bright == 255) {
-            return "Max";
-        } else if (bright == 1) {
-            return "Low";
-        } else {
-            return "Mid";
-        }
+        #ifdef HAS_TFT
+            if (bright == 255) {
+                return "Max";
+            } else if (bright == 70) {
+                return "Low";
+            } else {
+                return "Mid";
+            }
+        #else
+            if (bright == 255) {
+                return "Max";
+            } else if (bright == 1) {
+                return "Low";
+            } else {
+                return "Mid";
+            }
+        #endif
     }
 
     void showOnScreen() {
diff --git a/src/station_utils.cpp b/src/station_utils.cpp
@@ -349,41 +349,40 @@ namespace STATION_Utils {
             default: return; // Invalid type, exit function
         }
     
-        File fileIndex = SPIFFS.open(filePath);
-        if (!fileIndex) {
+        if (!SPIFFS.exists(filePath)) {
             switch (type) {
                 case 0: myBeaconsIndex = 0; break;
                 case 1: loraIndex = 0; break;
-                case 2: 
+                case 2:
                     #ifdef HAS_TFT
-                        screenBrightness = 40;
+                        screenBrightness = 255;
                     #else
                         screenBrightness = 1;
                     #endif
                     break;
                 default: return; // Invalid type, exit function
             }
             return;
+        } else {
+            File fileIndex = SPIFFS.open(filePath, "r");
+            while (fileIndex.available()) {
+                String firstLine = fileIndex.readStringUntil('\n');
+                int index = firstLine.toInt();
+                String logMessage;
+                if (type == 0) {
+                    myBeaconsIndex = index;
+                    logMessage = "Callsign Index:";
+                } else if (type == 1) {
+                    loraIndex = index;
+                    logMessage = "LoRa Freq Index:";
+                } else {
+                    screenBrightness = index;
+                    logMessage = "Brightness:";
+                }
+                logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "%s %s", logMessage.c_str(), firstLine);
+            }        
+            fileIndex.close();
         }
-    
-        while (fileIndex.available()) {
-            String firstLine = fileIndex.readStringUntil('\n');
-            int index = firstLine.toInt();
-            String logMessage;
-            if (type == 0) {
-                myBeaconsIndex = index;
-                logMessage = "Callsign Index:";
-            } else if (type == 1) {
-                loraIndex = index;
-                logMessage = "LoRa Freq Index:";
-            } else {
-                screenBrightness = index;
-                logMessage = "Brightness:";
-            }
-            logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "%s %s", logMessage.c_str(), firstLine);
-        }
-    
-        fileIndex.close();
     }
 
 }
diff --git a/variants/ESP32_DIY_1W_LoRa_GPS_LLCC68/platformio.ini b/variants/ESP32_DIY_1W_LoRa_GPS_LLCC68/platformio.ini
@@ -3,7 +3,7 @@ extends = env:esp32
 board = esp32dev
 build_flags =
 	${common.build_flags}
- 	-D ESP32_DIY_1W_LoRa_GPS_LLCC68
+	-D ESP32_DIY_1W_LoRa_GPS_LLCC68
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
diff --git a/variants/F4GOH_1W_LoRa_Tracker/platformio.ini b/variants/F4GOH_1W_LoRa_Tracker/platformio.ini
@@ -3,7 +3,7 @@ extends = env:esp32
 board = esp32dev
 build_flags =
 	${common.build_flags}
- 	-D F4GOH_1W_LoRa_Tracker
+	-D F4GOH_1W_LoRa_Tracker
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
diff --git a/variants/Wemos_ESP32_Bat_LoRa_GPS/platformio.ini b/variants/Wemos_ESP32_Bat_LoRa_GPS/platformio.ini
@@ -3,7 +3,7 @@ extends = env:esp32
 board = esp32dev
 build_flags =
 	${common.build_flags}
- 	-D WEMOS_ESP32_Bat_LoRa_GPS
+	-D WEMOS_ESP32_Bat_LoRa_GPS
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
diff --git a/variants/heltec_wireless_tracker/platformio.ini b/variants/heltec_wireless_tracker/platformio.ini
@@ -6,28 +6,28 @@ build_flags =
 	${common.build_flags}
 	${common.usb_flags}
 	-D HELTEC_WIRELESS_TRACKER
-    -D USER_SETUP_LOADED
+	-D USER_SETUP_LOADED
 	-D TFT_WIDTH=80
 	-D TFT_HEIGHT=160
-    -D ST7735_DRIVER
-    -D ST7735_GREENTAB160x80
-    -D TFT_RGB_ORDER=TFT_BGR
-    -D TFT_MOSI=42
-    -D TFT_SCLK=41
-    -D TFT_CS=38
-    -D TFT_DC=40
-    -D TFT_RST=39
+	-D ST7735_DRIVER
+	-D ST7735_GREENTAB160x80
+	-D TFT_RGB_ORDER=TFT_BGR
+	-D TFT_MOSI=42
+	-D TFT_SCLK=41
+	-D TFT_CS=38
+	-D TFT_DC=40
+	-D TFT_RST=39
 	-D TFT_BL=21
 	-D TFT_BACKLIGHT_ON=1
-    -D TOUCH_CS=-1
-    -D LOAD_GLCD
-    -D LOAD_FONT2
-    -D LOAD_FONT4
-    -D LOAD_FONT6
-    -D LOAD_FONT7
-    -D LOAD_FONT8
-    -D SPI_FREQUENCY=27000000
-    -D USE_HSPI_PORT
+	-D TOUCH_CS=-1
+	-D LOAD_GLCD
+	-D LOAD_FONT2
+	-D LOAD_FONT4
+	-D LOAD_FONT6
+	-D LOAD_FONT7
+	-D LOAD_FONT8
+	-D SPI_FREQUENCY=27000000
+	-D USE_HSPI_PORT
 lib_deps =
 	${common.lib_deps}
 	bodmer/TFT_eSPI @ 2.5.43
diff --git a/variants/ttgo-t-lora32-v2_1_GPS_915/platformio.ini b/variants/ttgo-t-lora32-v2_1_GPS_915/platformio.ini
@@ -7,4 +7,4 @@ build_flags =
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
-	adafruit/Adafruit SH110X @ 2.1.10
+	adafruit/Adafruit SH110X @ 2.1.10
diff --git a/variants/ttgo_t_beam_s3_SUPREME_v3/platformio.ini b/variants/ttgo_t_beam_s3_SUPREME_v3/platformio.ini
@@ -5,9 +5,9 @@ board_build.mcu = esp32s3
 build_flags =
 	${common.build_flags}
 	${common.usb_flags}
-    -D TTGO_T_Beam_S3_SUPREME_V3
+	-D TTGO_T_Beam_S3_SUPREME_V3
 lib_deps =
-  	${common.lib_deps}
+	${common.lib_deps}
 	${common.display_libs}
-  	lewisxhe/XPowersLib @ 0.2.4
+	lewisxhe/XPowersLib @ 0.2.4
 	adafruit/Adafruit SH110X @ 2.1.10
diff --git a/variants/ttgo_t_deck_GPS/platformio.ini b/variants/ttgo_t_deck_GPS/platformio.ini
@@ -20,31 +20,31 @@ build_flags =
 	${common.usb_flags}
 	-D TTGO_T_DECK_GPS
 	-D BOARD_HAS_PSRAM
-    -D USER_SETUP_LOADED
-    -D ST7789_DRIVER
+	-D USER_SETUP_LOADED
+	-D ST7789_DRIVER
 	-D TFT_WIDTH=240
 	-D TFT_HEIGHT=320
-    -D TFT_RGB_ORDER=TFT_BGR
-    -D TFT_INVERSION_ON
-    -D TFT_MISO=38
-    -D TFT_MOSI=41
-    -D TFT_SCLK=40
-    -D TFT_CS=12
-    -D TFT_DC=11
-    -D TFT_RST=-1
+	-D TFT_RGB_ORDER=TFT_BGR
+	-D TFT_INVERSION_ON
+	-D TFT_MISO=38
+	-D TFT_MOSI=41
+	-D TFT_SCLK=40
+	-D TFT_CS=12
+	-D TFT_DC=11
+	-D TFT_RST=-1
 	-D TFT_BUSY=-1
 	-D TFT_BL=42
 	-D TFT_BACKLIGHT_ON=1
-    -D TOUCH_CS=-1
-    -D LOAD_GLCD
-    -D LOAD_FONT2
-    -D LOAD_FONT4
-    -D LOAD_FONT6
-    -D LOAD_FONT7
-    -D LOAD_FONT8
-    -D SPI_FREQUENCY=40000000
-    -D SPI_READ_FREQUENCY=16000000
+	-D TOUCH_CS=-1
+	-D LOAD_GLCD
+	-D LOAD_FONT2
+	-D LOAD_FONT4
+	-D LOAD_FONT6
+	-D LOAD_FONT7
+	-D LOAD_FONT8
+	-D SPI_FREQUENCY=40000000
+	-D SPI_READ_FREQUENCY=16000000
 lib_deps =
 	${common.lib_deps}
 	bodmer/TFT_eSPI @ 2.5.43
-    https://github.com/mmMicky/TouchLib.git
+	https://github.com/mmMicky/TouchLib.git
diff --git a/variants/ttgo_t_deck_plus/platformio.ini b/variants/ttgo_t_deck_plus/platformio.ini
@@ -20,31 +20,31 @@ build_flags =
 	${common.usb_flags}
 	-D TTGO_T_DECK_PLUS
 	-D BOARD_HAS_PSRAM
-    -D USER_SETUP_LOADED
-    -D ST7789_DRIVER
+	-D USER_SETUP_LOADED
+	-D ST7789_DRIVER
 	-D TFT_WIDTH=240
 	-D TFT_HEIGHT=320
-    -D TFT_RGB_ORDER=TFT_BGR
-    -D TFT_INVERSION_ON
-    -D TFT_MISO=38
-    -D TFT_MOSI=41
-    -D TFT_SCLK=40
-    -D TFT_CS=12
-    -D TFT_DC=11
-    -D TFT_RST=-1
+	-D TFT_RGB_ORDER=TFT_BGR
+	-D TFT_INVERSION_ON
+	-D TFT_MISO=38
+	-D TFT_MOSI=41
+	-D TFT_SCLK=40
+	-D TFT_CS=12
+	-D TFT_DC=11
+	-D TFT_RST=-1
 	-D TFT_BUSY=-1
 	-D TFT_BL=42
 	-D TFT_BACKLIGHT_ON=1
-    -D TOUCH_CS=-1
-    -D LOAD_GLCD
-    -D LOAD_FONT2
-    -D LOAD_FONT4
-    -D LOAD_FONT6
-    -D LOAD_FONT7
-    -D LOAD_FONT8
-    -D SPI_FREQUENCY=40000000
-    -D SPI_READ_FREQUENCY=16000000
+	-D TOUCH_CS=-1
+	-D LOAD_GLCD
+	-D LOAD_FONT2
+	-D LOAD_FONT4
+	-D LOAD_FONT6
+	-D LOAD_FONT7
+	-D LOAD_FONT8
+	-D SPI_FREQUENCY=40000000
+	-D SPI_READ_FREQUENCY=16000000
 lib_deps =
 	${common.lib_deps}
 	bodmer/TFT_eSPI @ 2.5.43
-    https://github.com/mmMicky/TouchLib.git
+	https://github.com/mmMicky/TouchLib.git
