Browse Source

Fix touch test

Scott Lahteine 5 years ago
parent
commit
16cb4303a4
1 changed files with 8 additions and 5 deletions
  1. 8
    5
      Marlin/src/lcd/touch/xpt2046.cpp

+ 8
- 5
Marlin/src/lcd/touch/xpt2046.cpp View File

133
     // Touch within the button area simulates an encoder button
133
     // Touch within the button area simulates an encoder button
134
     if (y > BUTTON_AREA_TOP && y < BUTTON_AREA_BOT)
134
     if (y > BUTTON_AREA_TOP && y < BUTTON_AREA_BOT)
135
       return WITHIN(x,  14,  77) ? EN_D
135
       return WITHIN(x,  14,  77) ? EN_D
136
-          : WITHIN(x,  90, 153) ? EN_A
137
-          : WITHIN(x, 166, 229) ? EN_B
138
-          : WITHIN(x, 242, 305) ? EN_C
139
-          : 0;
136
+           : WITHIN(x,  90, 153) ? EN_A
137
+           : WITHIN(x, 166, 229) ? EN_B
138
+           : WITHIN(x, 242, 305) ? EN_C
139
+           : 0;
140
 
140
 
141
-    if (x > TOUCH_SENSOR_WIDTH || !WITHIN(y, SCREEN_START_TOP, SCREEN_START_TOP + SCREEN_HEIGHT)) return 0;
141
+    if ( !WITHIN(x, SCREEN_START_LEFT, SCREEN_START_LEFT + SCREEN_WIDTH)
142
+      || !WITHIN(y, SCREEN_START_TOP, SCREEN_START_TOP + SCREEN_HEIGHT)
143
+    ) return 0;
142
 
144
 
143
     // Column and row above BUTTON_AREA_TOP
145
     // Column and row above BUTTON_AREA_TOP
144
     int8_t col = (x - (SCREEN_START_LEFT)) * (LCD_WIDTH) / (TOUCHABLE_X_WIDTH),
146
     int8_t col = (x - (SCREEN_START_LEFT)) * (LCD_WIDTH) / (TOUCHABLE_X_WIDTH),
161
 }
163
 }
162
 
164
 
163
 #if ENABLED(TOUCH_BUTTONS_HW_SPI)
165
 #if ENABLED(TOUCH_BUTTONS_HW_SPI)
166
+
164
   #include <SPI.h>
167
   #include <SPI.h>
165
 
168
 
166
   static void touch_spi_init(uint8_t spiRate) {
169
   static void touch_spi_init(uint8_t spiRate) {

Loading…
Cancel
Save