zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

touch_ms followup

Browse source
This commit is contained in:
Scott Lahteine 2020-10-16 19:54:59 -05:00
parent 1e13a7161a
commit 0f6fc48f85
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/tft/touch.cpp
View file

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

5
Marlin/src/lcd/tft/touch.h
View file

@ -140,10 +140,7 @@ class Touch {
static touch_control_t *current_control; static touch_control_t *current_control;
static uint16_t controls_count; static uint16_t controls_count;
static millis_t now; static millis_t last_touch_ms, time_to_hold, repeat_delay, touch_time;
static millis_t time_to_hold;
static millis_t repeat_delay;
static millis_t touch_time;
static TouchControlType touch_control_type; static TouchControlType touch_control_type;
static inline bool get_point(int16_t *x, int16_t *y); static inline bool get_point(int16_t *x, int16_t *y);