Merge pull request #486 from bmorcelli/main

CYD brightness Control and powersave fix
pr3y · Nov 26, 2024 · ecaeff8 · ecaeff8
2 parents d2b795a + 87cd2aa
commit ecaeff8
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/ports/CYD-2432S028/interface.cpp b/ports/CYD-2432S028/interface.cpp
@@ -31,7 +31,16 @@ void _setup_gpio() {
         log_i("Touch IC not Started");
     } else log_i("Touch IC Started");
     digitalWrite(XPT2046_CS, LOW);
-    // Brightness control -> Not working yet, don't know why! @Pirata
+
+}
+
+/***************************************************************************************
+** Function name: _post_setup_gpio()
+** Location: main.cpp
+** Description:   second stage gpio setup to make a few functions work
+***************************************************************************************/
+void _post_setup_gpio() { 
+    // Brightness control must be initialized after tft in this case @Pirata
     pinMode(TFT_BL,OUTPUT);
     ledcSetup(TFT_BRIGHT_CHANNEL,TFT_BRIGHT_FREQ, TFT_BRIGHT_Bits); //Channel 0, 10khz, 8bits
     ledcAttachPin(TFT_BL, TFT_BRIGHT_CHANNEL);
@@ -169,6 +178,7 @@ bool checkPrevPress() {
 ** Verifies if Select or OK was pressed
 **********************************************************************/
 bool checkSelPress() { 
+    checkPowerSaveTime();
     if(menuPress(SEL)) {
         if(wakeUpScreen()) {
         delay(200);

diff --git a/ports/CYD-2432S028/interface.h b/ports/CYD-2432S028/interface.h
@@ -13,6 +13,12 @@
 ***************************************************************************************/
 void _setup_gpio();
 
+/***************************************************************************************
+** Function name: _post_setup_gpio()
+** Location: main.cpp
+** Description:   second stage gpio setup to make a few functions work
+***************************************************************************************/
+void _post_setup_gpio();
 
 /***************************************************************************************
 ** Function name: getBattery()

diff --git a/ports/_New-Device-Model/interface.cpp b/ports/_New-Device-Model/interface.cpp
@@ -9,6 +9,12 @@
 ***************************************************************************************/
 void _setup_gpio() { }
 
+/***************************************************************************************
+** Function name: _post_setup_gpio()
+** Location: main.cpp
+** Description:   second stage gpio setup to make a few functions work
+***************************************************************************************/
+void _post_setup_gpio() { }
 
 /***************************************************************************************
 ** Function name: getBattery()

diff --git a/ports/_New-Device-Model/interface.h b/ports/_New-Device-Model/interface.h
@@ -13,6 +13,12 @@
 ***************************************************************************************/
 void _setup_gpio();
 
+/***************************************************************************************
+** Function name: _post_setup_gpio()
+** Location: main.cpp
+** Description:   second stage gpio setup to make a few functions work
+***************************************************************************************/
+void _post_setup_gpio();
 
 /***************************************************************************************
 ** Function name: getBattery()

diff --git a/src/main.cpp b/src/main.cpp
@@ -87,6 +87,13 @@ void begin_storage() {
 void _setup_gpio() __attribute__((weak));
 void _setup_gpio() { }
 
+/*********************************************************************
+**  Function: _post_setup_gpio()
+**  Sets up a weak (empty) function to be replaced by /ports/* /interface.h
+*********************************************************************/
+void _post_setup_gpio() __attribute__((weak));
+void _post_setup_gpio() { }
+
 /*********************************************************************
 **  Function: setup_gpio
 **  Setup GPIO pins
@@ -264,6 +271,9 @@ void setup() {
 
   init_clock();
 
+  // Some GPIO Settings (such as CYD's brightness control must be set after tft and sdcard)
+  _post_setup_gpio();
+  // end of post gpio begin
   boot_screen_anim();
 
   startup_sound();