diff options
Diffstat (limited to 'drivers/ginput')
8 files changed, 19 insertions, 19 deletions
diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c index 082c372a..3f23cad2 100644 --- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c +++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c @@ -65,8 +65,8 @@ static gBool ft5336ReadXYZ(GMouse* m, GMouseReading* pdr) // Only take a reading if exactly one touch contact point if (read_byte(m, FT5336_TD_STAT_REG) == 1) { // Get and return X, Y an Z values - pdr->y = (coord_t)(read_word(m, FT5336_P1_XH_REG) & 0x0FFF); - pdr->x = (coord_t)(read_word(m, FT5336_P1_YH_REG) & 0x0FFF); + pdr->y = (gCoord)(read_word(m, FT5336_P1_XH_REG) & 0x0FFF); + pdr->x = (gCoord)(read_word(m, FT5336_P1_YH_REG) & 0x0FFF); pdr->z = 1; } diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c index 50fa36a0..aef4de42 100644 --- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c +++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c @@ -68,8 +68,8 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) if ((read_byte(m, FT5x06_TOUCH_POINTS) & 0x07)) { /* Get the X, Y, Z values */ - pdr->x = (coord_t)(read_word(m, FT5x06_TOUCH1_XH) & 0x0fff); - pdr->y = (coord_t)read_word(m, FT5x06_TOUCH1_YH); + pdr->x = (gCoord)(read_word(m, FT5x06_TOUCH1_XH) & 0x0fff); + pdr->y = (gCoord)read_word(m, FT5x06_TOUCH1_YH); pdr->z = 1; // Rescale X,Y if we are using self-calibration diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c index 5f3902b3..674a057a 100644 --- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c +++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c @@ -68,8 +68,8 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) if ((read_byte(m, FT6x06_TOUCH_POINTS) & 0x07)) { /* Get the X, Y, Z values */ - pdr->x = (coord_t)(read_word(m, FT6x06_TOUCH1_XH) & 0x0fff); - pdr->y = (coord_t)read_word(m, FT6x06_TOUCH1_YH); + pdr->x = (gCoord)(read_word(m, FT6x06_TOUCH1_XH) & 0x0fff); + pdr->y = (gCoord)read_word(m, FT6x06_TOUCH1_YH); pdr->z = 1; // Rescale X,Y if we are using self-calibration diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index f2222898..034f8e3a 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -152,7 +152,7 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) return gTrue; } - // Strip the tags (we need to take care because coord_t is signed - and sign bit gets extended on shift!) + // Strip the tags (we need to take care because gCoord is signed - and sign bit gets extended on shift!) pdr->x = (uint16_t)(pdr->x) >> 4; pdr->y = (uint16_t)(pdr->y) >> 4; pdr->z = Z_MAX; diff --git a/drivers/ginput/touch/QWidget/example/mywidget.cpp b/drivers/ginput/touch/QWidget/example/mywidget.cpp index b14713b1..c4599193 100644 --- a/drivers/ginput/touch/QWidget/example/mywidget.cpp +++ b/drivers/ginput/touch/QWidget/example/mywidget.cpp @@ -2,9 +2,9 @@ #include "ugfx/src/ginput/ginput_driver_mouse.h" extern GMouse* qwidgetMouse; -extern coord_t qwidgetMouseX; -extern coord_t qwidgetMouseY; -extern coord_t qwidgetMouseZ; +extern gCoord qwidgetMouseX; +extern gCoord qwidgetMouseY; +extern gCoord qwidgetMouseZ; extern uint16_t qwidgetMouseButtons; MyWidget::MyWidget(QWidget* parent) : QWidget(parent) diff --git a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c index 53b167bb..13037136 100644 --- a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c +++ b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c @@ -14,9 +14,9 @@ #include "../../../../src/ginput/ginput_driver_mouse.h" GMouse* qwidgetMouse; -coord_t qwidgetMouseX; -coord_t qwidgetMouseY; -coord_t qwidgetMouseZ; +gCoord qwidgetMouseX; +gCoord qwidgetMouseY; +gCoord qwidgetMouseZ; uint16_t qwidgetMouseButtons; static gBool _init(GMouse* m, unsigned driverinstance) diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c index eab13de4..3d3acc55 100644 --- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c +++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c @@ -171,10 +171,10 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) #endif // Time to get some readings - pdr->x = (coord_t)read_word(m, STMPE610_REG_TSC_DATA_X); - pdr->y = (coord_t)read_word(m, STMPE610_REG_TSC_DATA_Y); + pdr->x = (gCoord)read_word(m, STMPE610_REG_TSC_DATA_X); + pdr->y = (gCoord)read_word(m, STMPE610_REG_TSC_DATA_Y); #if GMOUSE_STMPE610_READ_PRESSURE - pdr->z = (coord_t)read_byte(m, STMPE610_REG_TSC_DATA_Z); + pdr->z = (gCoord)read_byte(m, STMPE610_REG_TSC_DATA_Z); #else pdr->z = gmvmt(m)->z_max; #endif diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c index fe978828..6f8b442e 100644 --- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c +++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c @@ -171,10 +171,10 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr) #endif // Time to get some readings - pdr->x = (coord_t)read_word(m, STMPE811_REG_TSC_DATA_X); - pdr->y = (coord_t)read_word(m, STMPE811_REG_TSC_DATA_Y); + pdr->x = (gCoord)read_word(m, STMPE811_REG_TSC_DATA_X); + pdr->y = (gCoord)read_word(m, STMPE811_REG_TSC_DATA_Y); #if GMOUSE_STMPE811_READ_PRESSURE - pdr->z = (coord_t)read_byte(m, STMPE811_REG_TSC_DATA_Z); + pdr->z = (gCoord)read_byte(m, STMPE811_REG_TSC_DATA_Z); #else pdr->z = gmvmt(m)->z_max; #endif |