Skip to content

Add XPT2046 calibration functions #15140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
Sep 4, 2019
Merged

Add XPT2046 calibration functions #15140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6fbd2
xpt2046: add useful functions for calibration
tpruvot Sep 2, 2019
c0329cc
Update xpt2046.cpp
thinkyhead Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Marlin/src/feature/touch/xpt2046.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,12 @@ uint16_t XPT2046::getInTouch(const XPTCoordinate coordinate) {
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
5 changes: 4 additions & 1 deletion Marlin/src/feature/touch/xpt2046.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ class XPT2046 {
public:
static void init(void);
static uint8_t read_buttons();
private:
bool getTouchPoint(uint16_t &x, uint16_t &y);
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);
};

Expand Down