Fix broken auto sleep

suchmememanyskill · Feb 7, 2024 · fb928d2 · fb928d2
1 parent 716f934
commit fb928d2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/CYD-Klipper/.vscode/settings.json b/CYD-Klipper/.vscode/settings.json
@@ -11,6 +11,7 @@
         "initializer_list": "cpp",
         "algorithm": "cpp",
         "cstddef": "cpp",
-        "functional": "cpp"
+        "functional": "cpp",
+        "*.tcc": "cpp"
     }
 }
diff --git a/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp b/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp
@@ -125,6 +125,8 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
             return;
         }
 
+        screen_timer_wake();
+
         TS_Point p = touchscreen_point();
         data->state = LV_INDEV_STATE_PR;
         data->point.x = p.x;

diff --git a/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp b/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp
@@ -55,6 +55,17 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
     }
     else
     {
+        if (is_screen_asleep())
+        {
+            screen_timer_wake();
+            while (tp.isTouched) {
+                tp.read();
+            }
+            return;
+        }
+
+        screen_timer_wake();
+
         data->state = LV_INDEV_STATE_PR;
         for (int i = 0; i < tp.touches; i++)
         {
@@ -74,12 +85,6 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
             data->point.x = magicX;
             data->point.y = magicY;
         }
-
-        if (is_screen_asleep()) 
-        {
-            screen_timer_wake();
-        }
-
     }
 }
 

diff --git a/CYD-Klipper/src/core/lv_setup.cpp b/CYD-Klipper/src/core/lv_setup.cpp
@@ -25,6 +25,11 @@ void set_screen_brightness()
 void screen_timer_wake()
 {
     lv_timer_reset(screenSleepTimer);
+
+    if (!isScreenInSleep){
+        return;
+    }
+
     isScreenInSleep = false;
     set_screen_brightness();