Merge pull request #50 from bmorcelli/dev

CYD and Lylygo bright fix
bmorcelli · Jul 21, 2024 · c18cd20 · c18cd20
2 parents c5f3da4 + 8eba678
commit c18cd20
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,7 @@
         "initializer_list": "cpp",
         "regex": "cpp",
         "list": "cpp",
-        "unordered_set": "cpp"
+        "unordered_set": "cpp",
+        "chrono": "cpp"
     }
 }
diff --git a/Launcher/Launcher_2.0_C.bin b/Launcher/Launcher_2.0_C.bin
diff --git a/Launcher/Launcher_2.0_CYD-2-USB.bin b/Launcher/Launcher_2.0_CYD-2-USB.bin
diff --git a/Launcher/Launcher_2.0_CYD-2432S028.bin b/Launcher/Launcher_2.0_CYD-2432S028.bin
diff --git a/Launcher/Launcher_2.0_Cardputer.bin b/Launcher/Launcher_2.0_Cardputer.bin
diff --git a/Launcher/Launcher_2.0_CoreS3.bin b/Launcher/Launcher_2.0_CoreS3.bin
diff --git a/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin b/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin
diff --git a/Launcher/Launcher_2.0_core2.bin b/Launcher/Launcher_2.0_core2.bin
diff --git a/Launcher/Launcher_2.0_core_16Mb.bin b/Launcher/Launcher_2.0_core_16Mb.bin
diff --git a/Launcher/Launcher_2.0_cplus1_1.bin b/Launcher/Launcher_2.0_cplus1_1.bin
diff --git a/Launcher/Launcher_2.0_cplus2.bin b/Launcher/Launcher_2.0_cplus2.bin
diff --git a/platformio.ini b/platformio.ini
@@ -577,8 +577,8 @@ build_flags =
 	-DXPT2046_CS=33
 
 	-DTFT_BRIGHT_CHANNEL=0
-	-DTFT_BRIGHT_Bits=12
-	-DTFT_BRIGHT_FREQ=5000	
+	-DTFT_BRIGHT_Bits=8
+	-DTFT_BRIGHT_FREQ=10000	
 
 lib_deps = 
 	${common.lib_deps}
@@ -651,8 +651,8 @@ build_flags =
 	-DXPT2046_CS=33
 
 	-DTFT_BRIGHT_CHANNEL=0
-	-DTFT_BRIGHT_Bits=12
-	-DTFT_BRIGHT_FREQ=5000	
+	-DTFT_BRIGHT_Bits=8
+	-DTFT_BRIGHT_FREQ=10000		
 lib_deps = 
 	${common.lib_deps}
 	https://github.com/PaulStoffregen/XPT2046_Touchscreen
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -20,7 +20,14 @@ void setBrightness(int brightval, bool save) {
   #elif defined(M5STACK)
   M5.Display.setBrightness(brightval);  
   #elif  defined(T_DISPLAY_S3) || defined(CYD)
-  int dutyCycle = (brightval*255)/100;
+  int dutyCycle;
+  if (brightval==100) dutyCycle=255;
+  else if (brightval==75) dutyCycle=130;
+  else if (brightval==50) dutyCycle=70;
+  else if (brightval==25) dutyCycle=20;
+  else if (brightval==0) dutyCycle=5;
+  else dutyCycle = ((brightval*255)/100);
+
   log_i("dutyCycle for bright 0-255: %d",dutyCycle);
   ledcWrite(TFT_BRIGHT_CHANNEL,dutyCycle); // Channel 0
   #endif
@@ -52,8 +59,14 @@ void getBrightness() {
   axp192.ScreenBreath(bright);
 #elif defined(M5STACK)
   M5.Display.setBrightness(bright);  
-#elif  defined(T_DISPLAY_S3) || defined(CYD)
-  int dutyCycle = (bright*255)/100;
+  #elif  defined(T_DISPLAY_S3) || defined(CYD)
+  int dutyCycle;
+  if (bright==100) dutyCycle=255;
+  else if (bright==75) dutyCycle=130;
+  else if (bright==50) dutyCycle=70;
+  else if (bright==25) dutyCycle=20;
+  else if (bright==0) dutyCycle=5;
+  else dutyCycle = ((bright*255)/100);
   log_i("dutyCycle for bright 0-255: %d",dutyCycle);
   ledcWrite(TFT_BRIGHT_CHANNEL,dutyCycle); // Channel 0
 #endif
@@ -67,8 +80,14 @@ void getBrightness() {
   axp192.ScreenBreath(bright);
 #elif defined(M5STACK)
   M5.Display.setBrightness(bright);
-#elif  defined(T_DISPLAY_S3) || defined(CYD)
-  int dutyCycle = (bright*255)/100;
+  #elif  defined(T_DISPLAY_S3) || defined(CYD)
+  int dutyCycle;
+  if (bright==100) dutyCycle=255;
+  else if (bright==75) dutyCycle=130;
+  else if (bright==50) dutyCycle=70;
+  else if (bright==25) dutyCycle=20;
+  else if (bright==0) dutyCycle=5;
+  else dutyCycle = ((bright*255)/100);
   log_i("dutyCycle for bright 0-255: %d",dutyCycle);
   ledcWrite(TFT_BRIGHT_CHANNEL,dutyCycle); // Channel 0
 #endif