瀏覽代碼

touch_ms followup

Scott Lahteine 3 年之前
父節點
當前提交
0f6fc48f85
共有 2 個文件被更改,包括 5 次插入8 次删除
  1. 4
    4
      Marlin/src/lcd/tft/touch.cpp
  2. 1
    4
      Marlin/src/lcd/tft/touch.h

+ 4
- 4
Marlin/src/lcd/tft/touch.cpp 查看文件

@@ -40,10 +40,10 @@ int16_t Touch::x, Touch::y;
40 40
 touch_control_t Touch::controls[];
41 41
 touch_control_t *Touch::current_control;
42 42
 uint16_t Touch::controls_count;
43
-millis_t Touch::last_touch_ms = 0;
44
-millis_t Touch::time_to_hold;
45
-millis_t Touch::repeat_delay;
46
-millis_t Touch::touch_time;
43
+millis_t Touch::last_touch_ms = 0,
44
+         Touch::time_to_hold,
45
+         Touch::repeat_delay,
46
+         Touch::touch_time;
47 47
 TouchControlType  Touch::touch_control_type = NONE;
48 48
 touch_calibration_t Touch::calibration;
49 49
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)

+ 1
- 4
Marlin/src/lcd/tft/touch.h 查看文件

@@ -140,10 +140,7 @@ class Touch {
140 140
     static touch_control_t *current_control;
141 141
     static uint16_t controls_count;
142 142
 
143
-    static millis_t now;
144
-    static millis_t time_to_hold;
145
-    static millis_t repeat_delay;
146
-    static millis_t touch_time;
143
+    static millis_t last_touch_ms, time_to_hold, repeat_delay, touch_time;
147 144
     static TouchControlType touch_control_type;
148 145
 
149 146
     static inline bool get_point(int16_t *x, int16_t *y);

Loading…
取消
儲存