fixed a few TOUCHPAD_MULTITHREAD stuffs

ugfx_release_2.6
Tectu 2012-08-09 01:00:09 +02:00
parent ebcc53e8e7
commit ed29707da6
3 changed files with 14 additions and 7 deletions

View File

@ -59,22 +59,27 @@ extern "C" {
uint16_t tpReadX(void); uint16_t tpReadX(void);
uint16_t tpReadY(void); uint16_t tpReadY(void);
#if TOUCHPAD_PRESSURE
uint16_t tpReadZ(void);
#endif
#else #else
#define tpInit(tp) tp_lld_init(tp) #define tpInit(tp) tp_lld_init(tp)
#define tpReadX() tp_lld_read_x() #define tpReadX() tp_lld_read_x()
#define tpReadY() tp_lld_read_y() #define tpReadY() tp_lld_read_y()
#endif #if TOUCHPAD_PRESSURE
#define tpReadZ() tp_lld_read_z()
#endif
#if TOUCHPAD_PRESSURE
uint16_t tpReadZ(void);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -35,7 +35,7 @@
/* Include the low level driver configuration information */ /* Include the low level driver configuration information */
/*===========================================================================*/ /*===========================================================================*/
#include "gdisp_lld_config.h" #include "touchpad_lld_config.h"
/*===========================================================================*/ /*===========================================================================*/
/* Error checks. */ /* Error checks. */
@ -49,6 +49,8 @@
/* Driver types. */ /* Driver types. */
/*===========================================================================*/ /*===========================================================================*/
typedef struct TOUCHPADDriver TOUCHPADDriver;
/** /**
* @brief Structure representing a Touchpad driver. * @brief Structure representing a Touchpad driver.
*/ */

View File

@ -32,7 +32,7 @@
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__) #if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GDISP_NEED_MULTITHREAD #if GDISP_NEED_MULTITHREAD
#warning "GDISP: Multithread support not complete" #warning "TOUCHPAD: Multithread support not complete"
#define MUTEX_INIT /* Not defined yet */ #define MUTEX_INIT /* Not defined yet */
#define MUTEX_ENTER /* Not defined yet */ #define MUTEX_ENTER /* Not defined yet */
#define MUTEX_EXIT /* Not defined yet */ #define MUTEX_EXIT /* Not defined yet */