bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Drop C-style 'void' argument

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-16 20:31:08 -05:00
parent 7d8c38693f
commit f01f0d1956
174 changed files with 864 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/touch/xpt2046.cpp
View File

@ -43,7 +43,7 @@
XPT2046 touch;
extern int8_t encoderDiff;
void XPT2046::init(void) {
void XPT2046::init() {
SET_INPUT(TOUCH_MISO_PIN);
SET_OUTPUT(TOUCH_MOSI_PIN);
SET_OUTPUT(TOUCH_SCK_PIN);

4
Marlin/src/feature/touch/xpt2046.h
View File

@ -40,11 +40,11 @@ enum XPTCoordinate : uint8_t {
class XPT2046 {
public:
static void init(void);
static void init();
static uint8_t read_buttons();
bool getTouchPoint(uint16_t &x, uint16_t &y);
static bool isTouched();
inline void waitForRelease(void) { while (isTouched()) { /* nada */ } }
inline void waitForRelease() { 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);