2.5.3 Retore T-Deck OTA

#212

Author: bmorcelli

README.md

@@ -81,6 +81,10 @@ Things that needs to be done in next updates
 <details>
   <summary><h2>Changelog</h2></summary>
 
+* 2.5.3:
+     * [x] Restored T-Deck OTA
+     * [x] Refined T-Deck Touchscreen inputs
+
 * 2.5.2:
      * [x] Fixed Marauder V6 touchscreen and CYDs touchscreen unresponsive [issue](https://github.com/bmorcelli/Launcher/issues/210) and fixed Dim screen
      * [x] Fixed Marauder Mini and V7 screen dimming.

boards/lilygo-t-deck/interface.cpp

@@ -73,12 +73,6 @@ void _setup_gpio() {
     if (!touch.begin(Wire, GT911_SLAVE_ADDRESS_L)) {
         Serial.println("Failed to find GT911 - check your wiring!");
     }
-    // Set touch max xy
-    touch.setMaxCoordinates(320, 240);
-    // Set swap xy
-    touch.setSwapXY(true);
-    // Set mirror xy
-    touch.setMirrorXY(false, true);
 
     pinMode(9, OUTPUT); // LoRa Radio CS Pin to HIGH (Inhibit the SPI Communication for this module)
     digitalWrite(9, HIGH);
@@ -129,30 +123,42 @@ void _setBrightness(uint8_t brightval) {
 **********************************************************************/
 void InputHandler(void) {
     char keyValue = 0;
-    static unsigned long _tmptmp;
+    static unsigned long tm = millis();
     TouchPointPro t;
     uint8_t touched = 0;
-    touched = touch.getPoint(&t.x, &t.y);
-    if ((millis() - _tmptmp) > 190 || LongPress) { // one reading each 190ms
-        // Serial.printf("\nPressed x=%d , y=%d, rot: %d",t.x, t.y, rotation);
-        if (touched) {
-
-            // Serial.printf("\nPressed x=%d , y=%d, rot: %d, millis=%d, tmp=%d",t.x, t.y, rotation, millis(),
-            // _tmptmp);
-            _tmptmp = millis();
-
-            if (!wakeUpScreen()) AnyKeyPress = true;
-            else return;
-
-            // Touch point global variable
-            touchPoint.x = t.x;
-            touchPoint.y = t.y;
-            touchPoint.pressed = true;
-            touchHeatMap(touchPoint);
-            touched = 0;
-            return;
+    uint8_t rot = 5;
+    if (rot != rotation) {
+        if (rotation == 1) {
+            touch.setMaxCoordinates(320, 240);
+            touch.setSwapXY(true);
+            touch.setMirrorXY(true, true);
+        }
+        if (rotation == 3) {
+            touch.setMaxCoordinates(320, 240);
+            touch.setSwapXY(true);
+            touch.setMirrorXY(false, false);
+        }
+        if (rotation == 0) {
+            touch.setMaxCoordinates(240, 320);
+            touch.setSwapXY(false);
+            touch.setMirrorXY(false, true);
+        }
+        if (rotation == 2) {
+            touch.setMaxCoordinates(240, 320);
+            touch.setSwapXY(false);
+            touch.setMirrorXY(true, false);
         }
+        rot = rotation;
     }
+    touched = touch.getPoint(&t.x, &t.y);
+    delay(1);
+    Wire.requestFrom(LILYGO_KB_SLAVE_ADDRESS, 1);
+    while (Wire.available() > 0) {
+        keyValue = Wire.read();
+        delay(1);
+    }
+    if (millis() - tm < 200 && !LongPress) return;
+
     // 0 - UP
     // 1 - Down
     // 2 - Left
@@ -168,7 +174,7 @@ void InputHandler(void) {
             ISR_rst();
         } else {
             if (!wakeUpScreen()) AnyKeyPress = true;
-            else goto END;
+            else return;
         }
         delay(50);
         // Print "bot - xx - yy",  1 is normal value for xx and yy 0 and 2 means movement on the axis
@@ -183,34 +189,48 @@ void InputHandler(void) {
         } // right, Down
     }
 
-    delay(1);
-    Wire.requestFrom(LILYGO_KB_SLAVE_ADDRESS, 1);
-    while (Wire.available() > 0) { keyValue = Wire.read(); }
     if (keyValue != (char)0x00) {
+        if (!wakeUpScreen()) {
+            AnyKeyPress = true;
+        } else return;
         KeyStroke.Clear();
         KeyStroke.hid_keys.push_back(keyValue);
         if (keyValue == ' ') KeyStroke.exit_key = true; // key pressed to try to exit
         if (keyValue == (char)0x08) KeyStroke.del = true;
         if (keyValue == (char)0x0D) KeyStroke.enter = true;
         if (digitalRead(SEL_BTN) == BTN_ACT) KeyStroke.fn = true;
         KeyStroke.word.push_back(keyValue);
+        if (KeyStroke.del) EscPress = true;
+        if (KeyStroke.enter) SelPress = true;
         KeyStroke.pressed = true;
-    } else KeyStroke.Clear();
+        tm = millis();
+    } else KeyStroke.pressed = false;
 
-    if (digitalRead(SEL_BTN) == BTN_ACT || KeyStroke.enter) {
+    if (digitalRead(SEL_BTN) == BTN_ACT) {
+        tm = millis();
         if (!wakeUpScreen()) {
-            SelPress = true;
             AnyKeyPress = true;
-        } else goto END;
-    }
-    if (keyValue == 0x08) {
-        EscPress = true;
-        AnyKeyPress = true;
+        } else return;
+        SelPress = true;
     }
-END:
-    if (AnyKeyPress) {
-        long tmp = millis();
-        while ((millis() - tmp) < 200 && (digitalRead(SEL_BTN) == BTN_ACT));
+
+    if ((millis() - tm) > 190 || LongPress) { // one reading each 190ms
+        if (touched) {
+
+            // Serial.printf("\nPressed x=%d , y=%d, rot: %d", t.x, t.y, rotation);
+            tm = millis();
+
+            if (!wakeUpScreen()) AnyKeyPress = true;
+            else return;
+
+            // Touch point global variable
+            touchPoint.x = t.x;
+            touchPoint.y = t.y;
+            touchPoint.pressed = true;
+            touchHeatMap(touchPoint);
+            touched = 0;
+            return;
+        }
     }
 }
 

boards/lilygo-t-deck/platformio.ini

@@ -15,7 +15,6 @@ build_src_filter =${env.build_src_filter} +<../boards/lilygo-t-deck>
 build_flags =
 	${env.build_flags}
 	-Iboards/lilygo-t-deck
-	-DDISABLE_OTA
 
 	-DBOARD_HAS_PSRAM=1
 	-DARDUINO_USB_CDC_ON_BOOT=1

support_files/merge.py

@@ -111,7 +111,7 @@ def q(p): return f'"{p}"'
     cmd_parts = [
         "pio pkg exec -p \"tool-esptoolpy\" -- esptool",
         "--chip", chip_arg,
-        "merge-bin",
+        "merge_bin",
         "--output", q(out_bin),
         hex(boot_offset), q(boot_bin),
         hex(PART_TABLE_OFFSET), q(part_bin),
@@ -135,6 +135,7 @@ def q(p): return f'"{p}"'
     print("[merge_bin] Merging binaries...")
     result = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     rc = result.returncode
+    # rc = env.Execute(cmd) # debug purposes
 
     if rc != 0:
         print(f"[merge_bin] Failed with exit code {rc}")