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

Add XPT2046 calibration functions (#15140)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-09-05 00:32:20 +02:00 committed by Scott Lahteine
parent cff502c6d4
commit 85f0556118
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/feature/touch/xpt2046.cpp
View file

@ -135,4 +135,12 @@ uint16_t XPT2046::getInTouch(const XPTCoordinate coordinate) {
return (data[1] + data[2]) >> 1; return (data[1] + data[2]) >> 1;
} }
bool XPT2046::getTouchPoint(uint16_t &x, uint16_t &y) {
if (isTouched()) {
x = getInTouch(XPT2046_X);
y = getInTouch(XPT2046_Y);
}
return isTouched();
}
#endif // TOUCH_BUTTONS #endif // TOUCH_BUTTONS

5
Marlin/src/feature/touch/xpt2046.h
View file

@ -42,8 +42,11 @@ class XPT2046 {
public: public:
static void init(void); static void init(void);
static uint8_t read_buttons(); static uint8_t read_buttons();
private: bool getTouchPoint(uint16_t &x, uint16_t &y);
static bool isTouched(); static bool isTouched();
inline void waitForRelease(void) { while (isTouched()) { /* nada */ } }
inline void waitForTouch(uint16_t &x, uint16_t &y) { while (!getTouchPoint(x, y)) { /* nada */ } }
private:
static uint16_t getInTouch(const XPTCoordinate coordinate); static uint16_t getInTouch(const XPTCoordinate coordinate);
}; };