diff --git a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c index 03f04203..8a2de34e 100644 --- a/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c +++ b/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.c @@ -19,10 +19,10 @@ */ /** - * @file gdispTestStub/gdisp_lld.c - * @brief GDISP Graphics Driver subsystem low level driver source (stub). + * @file touchpadXPT2046/touchpad_lld.c + * @brief Touchpad Driver subsystem low level driver source. * - * @addtogroup GDISP + * @addtogroup TOUCHPAD * @{ */ @@ -78,7 +78,7 @@ * * @notapi */ -void tp_lld_init(TOUCHPADDriver *tp) { +void tp_lld_init(void) { /* Initialise the TOUCHPAD structure */ /* ToDo */ @@ -92,7 +92,7 @@ void tp_lld_init(TOUCHPADDriver *tp) { */ uint16_t tp_lld_read_x(void) { /* ToDo */ - return 0; + return 42; } /* @@ -102,7 +102,7 @@ uint16_t tp_lld_read_x(void) { */ uint16_t tp_lld_read_y(void) { /* ToDo */ - return 0; + return 42; } /* ---- Optional Routines ---- */ @@ -114,7 +114,7 @@ uint16_t tp_lld_read_y(void) { */ uint16_t tp_lld_read_y(void) { /* ToDo */ - return 0; + return 42; } #endif diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h index 5991b6ae..12b462fd 100644 --- a/halext/include/touchpad.h +++ b/halext/include/touchpad.h @@ -67,7 +67,7 @@ extern "C" { #else - #define tpInit(tp) tp_lld_init(tp) + #define tpInit(tp) tp_lld_init() #define tpReadX() tp_lld_read_x() #define tpReadY() tp_lld_read_y() diff --git a/halext/readme.txt b/halext/readme.txt index 5983635a..1123e827 100644 --- a/halext/readme.txt +++ b/halext/readme.txt @@ -6,14 +6,14 @@ To include any of these functions/drivers in your project... include $(LCDLIB)/lcd.mk 3/ In your project Makefile add the makefiles for any specific drivers you want e.g - include $(LCDLIB)/halext/drivers/gdispNokia6610/gdisp_lld.mk + include $(LCDLIB)/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.mk 4/ In your project halconf.h turn on the support you want eg. /** - * @brief Enables the GDISP subsystem. + * @brief Enables the Touchpad subsystem. */ - #if !defined(HAL_USE_GDISP) || defined(__DOXYGEN__) - #define HAL_USE_GDISP TRUE + #if !defined(HAL_USE_TOUCHPAD) || defined(__DOXYGEN__) + #define HAL_USE_TOUCHPAD TRUE #endif 5/ Do a make clean.