Fix CYD start and Core2/S3 debounce

pr3y · Jan 3, 2025 · 51d2cd9 · 51d2cd9
1 parent d1e9728
commit 51d2cd9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 25 deletions.
diff --git a/boards/CYD-2432S028/interface.cpp b/boards/CYD-2432S028/interface.cpp
@@ -43,15 +43,6 @@ void _post_setup_gpio() {
     ledcWrite(TFT_BRIGHT_CHANNEL,255);
 }
 
-
-/***************************************************************************************
-** Function name: getBattery()
-** location: display.cpp
-** Description:   Delivers the battery value from 1-100
-***************************************************************************************/
-int getBattery() { }
-
-
 /*********************************************************************
 ** Function: setBrightness
 ** location: settings.cpp

diff --git a/boards/m5stack-core2/interface.cpp b/boards/m5stack-core2/interface.cpp
@@ -72,7 +72,13 @@ void InputHandler(void) {
     END:
     if(AnyKeyPress) {
       long tmp=millis();
-      while((millis()-tmp)<200 && t.isHolding());
+      M5.update();
+      t = M5.Touch.getDetail();
+      while((millis()-tmp)<200 && (t.isPressed() || t.isHolding())) {
+        M5.update();
+        t = M5.Touch.getDetail();
+        delay(10);
+      }
     }
 }
 

diff --git a/boards/m5stack-cores3/interface.cpp b/boards/m5stack-cores3/interface.cpp
@@ -73,7 +73,13 @@ void InputHandler(void) {
     END:
     if(AnyKeyPress) {
       long tmp=millis();
-      while((millis()-tmp)<200 && t.isHolding());
+      M5.update();
+      t = M5.Touch.getDetail();
+      while((millis()-tmp)<200 && (t.isPressed() || t.isHolding())) {
+        M5.update();
+        t = M5.Touch.getDetail();
+        delay(10);
+      }
     }
 }
 

diff --git a/custom_4Mb.csv b/custom_4Mb.csv
@@ -1,5 +1,4 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 app0,     app,  ota_0,   0x10000, 0x260000,
-spiffs,   data, spiffs,  0x270000,0x180000,
-coredump, data, coredump,0x3F0000,0x10000,
+spiffs,   data, spiffs,  0x270000,0x190000,
diff --git a/custom_4Mb_full.csv b/custom_4Mb_full.csv
@@ -1,5 +1,4 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
-app0,     app,  ota_0,   0x10000, 0x370000,
-spiffs,   data, spiffs,  0x380000,0x70000,
-coredump, data, coredump,0x3F0000,0x10000,
+app0,     app,  ota_0,   0x10000, 0x380000,
+spiffs,   data, spiffs,  0x390000,0x70000,
diff --git a/src/main.cpp b/src/main.cpp
@@ -17,22 +17,15 @@ MainMenu mainMenu;
 SPIClass sdcardSPI;
 SPIClass CC_NRF_SPI;
 
+// Navigation Variables
 volatile bool NextPress=false;
-
 volatile bool PrevPress=false;
-
 volatile bool UpPress=false;
-
 volatile bool DownPress=false;
-
 volatile bool SelPress=false;
-
 volatile bool EscPress=false;
-
 volatile bool AnyKeyPress=false;
-
 volatile bool NextPagePress=false;
-
 volatile bool PrevPagePress=false;
 
 TouchPoint touchPoint;
@@ -355,7 +348,7 @@ void setup() {
   #endif
 
   delay(200);
-  previousMillis = millis();
+  wakeUpScreen();
 
   if (bruceConfig.startupApp != "" && !startupApp.startApp(bruceConfig.startupApp)) {
     bruceConfig.setStartupApp("");