Touch fixes

Followup to MarlinFirmware#26445
thinkyhead · Nov 23, 2023 · 53991fb · 53991fb
1 parent ded942a
commit 53991fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -90,7 +90,7 @@ void TouchCalibration::validate_calibration() {
   }
 }
 
-bool TouchCalibration::handleTouch(const xy_int_t &point) {
+bool TouchCalibration::handleTouch(const xy_uint_t &point) {
   const millis_t now = millis();
   if (next_touch_update_ms && PENDING(now, next_touch_update_ms)) return false;
   next_touch_update_ms = now + BUTTON_DELAY_MENU;

diff --git a/Marlin/src/lcd/tft_io/touch_calibration.h b/Marlin/src/lcd/tft_io/touch_calibration.h
@@ -100,7 +100,7 @@ class TouchCalibration {
     return !need_calibration();
   }
 
-  static bool handleTouch(const xy_int_t &point);
+  static bool handleTouch(const xy_uint_t &point);
 };
 
 extern TouchCalibration touch_calibration;

diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -92,9 +92,12 @@ uint8_t TouchButtons::read_buttons() {
           no_touch = true;
           return 0;
         }
+        x = int16_t((int32_t(x) * _TOUCH_CALIBRATION_X) >> 16) + _TOUCH_OFFSET_X;
+        y = int16_t((int32_t(y) * _TOUCH_CALIBRATION_Y) >> 16) + _TOUCH_OFFSET_Y;
+      #else
+        x = uint16_t((uint32_t(x) * _TOUCH_CALIBRATION_X) >> 16) + _TOUCH_OFFSET_X;
+        y = uint16_t((uint32_t(y) * _TOUCH_CALIBRATION_Y) >> 16) + _TOUCH_OFFSET_Y;
       #endif
-      x = uint16_t((uint32_t(x) * _TOUCH_CALIBRATION_X) >> 16) + _TOUCH_OFFSET_X;
-      y = uint16_t((uint32_t(y) * _TOUCH_CALIBRATION_Y) >> 16) + _TOUCH_OFFSET_Y;
 
     #elif ENABLED(TFT_TOUCH_DEVICE_GT911)