aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-10-13 16:35:57 +1000
committerinmarket <andrewh@inmarket.com.au>2014-10-13 16:35:57 +1000
commiteb0cc2187236fb0eac18bee536cf0d8f8cb7b7f8 (patch)
tree1cc61a9b3546a6e7cfd43368bb5d754308869b2e /drivers/ginput/touch/MCU/gmouse_lld_MCU.c
parentdc1ff7afa843b08a82874fcab7e06037aa663bac (diff)
downloaduGFX-eb0cc2187236fb0eac18bee536cf0d8f8cb7b7f8.tar.gz
uGFX-eb0cc2187236fb0eac18bee536cf0d8f8cb7b7f8.tar.bz2
uGFX-eb0cc2187236fb0eac18bee536cf0d8f8cb7b7f8.zip
Tidy up MCU mouse defines
Diffstat (limited to 'drivers/ginput/touch/MCU/gmouse_lld_MCU.c')
-rw-r--r--drivers/ginput/touch/MCU/gmouse_lld_MCU.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
index 222b759b..babf8bc3 100644
--- a/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
+++ b/drivers/ginput/touch/MCU/gmouse_lld_MCU.c
@@ -15,11 +15,6 @@
// Get the hardware interface
#include "gmouse_lld_MCU_board.h"
-// If the board file doesn't specify how many extra bytes it wants - assume 0
-#ifndef BOARD_DATA_SIZE
- #define BOARD_DATA_SIZE 0
-#endif
-
const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
{
GDRIVER_TYPE_TOUCH,
@@ -28,13 +23,13 @@ const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{
// Extra flags for testing only
//GMOUSE_VFLG_DEFAULTFINGER|GMOUSE_VFLG_CAL_EXTREMES - Possible
//GMOUSE_VFLG_NOPOLL|GMOUSE_VFLG_DYNAMICONLY|GMOUSE_VFLG_SELFROTATION|GMOUSE_VFLG_CAL_LOADFREE - unlikely
- sizeof(GMouse)+BOARD_DATA_SIZE,
+ sizeof(GMouse) + GMOUSE_MCU_BOARD_DATA_SIZE,
_gmouseInitDriver, _gmousePostInitDriver, _gmouseDeInitDriver
},
- Z_MAX, // z_max
- Z_MIN, // z_min
- Z_TOUCHON, // z_touchon
- Z_TOUCHOFF, // z_touchoff
+ GMOUSE_MCU_Z_MAX, // z_max
+ GMOUSE_MCU_Z_MIN, // z_min
+ GMOUSE_MCU_Z_TOUCHON, // z_touchon
+ GMOUSE_MCU_Z_TOUCHOFF, // z_touchoff
{ // pen_jitter
GMOUSE_MCU_PEN_CALIBRATE_ERROR, // calibrate
GMOUSE_MCU_PEN_CLICK_ERROR, // click