diff options
| author | Tectu <joel@unormal.org> | 2012-08-09 02:22:10 +0200 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-08-09 02:22:10 +0200 |
| commit | 4c3e1847dede93bf3f1671a00e86c57c0c1387ac (patch) | |
| tree | 18dbf2ae32eb509eaa5af28633fd58dbe72a2cf7 /halext/include | |
| parent | 19bb3b15dd368b019cdab1b12565156b84f9d32a (diff) | |
| download | uGFX-4c3e1847dede93bf3f1671a00e86c57c0c1387ac.tar.gz uGFX-4c3e1847dede93bf3f1671a00e86c57c0c1387ac.tar.bz2 uGFX-4c3e1847dede93bf3f1671a00e86c57c0c1387ac.zip | |
removed TOUCHPAD_NEED_MULTITASKING
Diffstat (limited to 'halext/include')
| -rw-r--r-- | halext/include/touchpad.h | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h index c6e44b55..222411cf 100644 --- a/halext/include/touchpad.h +++ b/halext/include/touchpad.h @@ -45,6 +45,16 @@ /* Type definitions */ /*===========================================================================*/ +/** + * @brief Struct used for calibration + */ +struct cal { + float xm; + float ym; + float xn; + float yn; +}; + /*===========================================================================*/ /* External declarations. */ /*===========================================================================*/ @@ -53,29 +63,14 @@ extern "C" { #endif -#if TOUCHPAD_NEED_MULTITHREAD - - void tpInit(TOUCHPADDriver *tp); - uint16_t tpReadX(void); - uint16_t tpReadY(void); - - #if TOUCHPAD_PRESSURE - uint16_t tpReadZ(void); - #endif - -#else - - #define tpInit(tp) tp_lld_init(tp) - #define tpReadX() tp_lld_read_x() - #define tpReadY() tp_lld_read_y() - - #if TOUCHPAD_PRESSURE - #define tpReadZ() tp_lld_read_z() - #endif +void tpInit(TOUCHPADDriver *tp); +uint16_t tpReadX(void); +uint16_t tpReadY(void); +#if TOUCHPAD_PRESSURE + uint16_t tpReadZ(void); #endif - #ifdef __cplusplus } #endif |