uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

TOUCHPAD_PRESSURE -> TOUCHPAD_HAS_PRESSURE

Browse source
This commit is contained in:
Tectu 2012-08-09 03:21:52 +02:00
parent 69bcdbba84
commit 956f612544
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c
View file

@ -134,7 +134,7 @@ uint16_t tp_lld_read_y(void) {
} }
/* ---- Optional Routines ---- */ /* ---- Optional Routines ---- */
#if TOUCHPAD_PRESSURE || defined(__DOXYGEN__) #if TOUCHPAD_HAS_PRESSURE || defined(__DOXYGEN__)
/* /*
* @brief Reads out the Z direction / pressure. * @brief Reads out the Z direction / pressure.
* *

2
halext/drivers/touchpad/touchpadXPT2046/touchpad_lld_config.h
View file

@ -35,7 +35,7 @@
/* Driver hardware support. */ /* Driver hardware support. */
/*===========================================================================*/ /*===========================================================================*/
#define TOUCHPAD_PRESSURE TRUE #define TOUCHPAD_HAS_PRESSURE TRUE
#endif /* HAL_USE_TOUCHPAD */ #endif /* HAL_USE_TOUCHPAD */

3
halext/include/touchpad.h
View file

@ -73,8 +73,9 @@ extern "C" {
void tpInit(TOUCHPADDriver *tp); void tpInit(TOUCHPADDriver *tp);
uint16_t tpReadX(void); uint16_t tpReadX(void);
uint16_t tpReadY(void); uint16_t tpReadY(void);
void tpCalibrate(void);
#if TOUCHPAD_PRESSURE #if TOUCHPAD_HAS_PRESSURE
uint16_t tpReadZ(void); uint16_t tpReadZ(void);
#endif #endif

4
halext/include/touchpad_lld.h
View file

@ -41,8 +41,8 @@
/* Error checks. */ /* Error checks. */
/*===========================================================================*/ /*===========================================================================*/
#ifndef TOUCHPAD_PRESSURE #ifndef TOUCHPAD_HAS_PRESSURE
#define TOUCHPAD_PRESSURE FALSE #define TOUCHPAD_HAS_PRESSURE FALSE
#endif #endif
/*===========================================================================*/ /*===========================================================================*/