diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-10-13 01:05:54 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-10-13 01:05:54 +0200 |
| commit | 0eeee2378810e2eaa263dfc23d1a3fb3470e1714 (patch) | |
| tree | 596d5f31916dd044af9a48642258b564a4509a3d | |
| parent | 6546c032504e8c671eba9d447d09110b14c88d99 (diff) | |
| parent | f414eaea62c0d90b2c34b73539317b6b4f370bd8 (diff) | |
| download | uGFX-0eeee2378810e2eaa263dfc23d1a3fb3470e1714.tar.gz uGFX-0eeee2378810e2eaa263dfc23d1a3fb3470e1714.tar.bz2 uGFX-0eeee2378810e2eaa263dfc23d1a3fb3470e1714.zip | |
Merge branch 'master' of github.com:Tectu/ChibiOS-GFX
| -rw-r--r-- | docs/releases.txt | 2 | ||||
| -rw-r--r-- | include/touchpad.h | 5 | ||||
| -rw-r--r-- | src/touchpad.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/docs/releases.txt b/docs/releases.txt index 91f0db0a..1af19272 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -10,6 +10,8 @@ FIX: huge internal bugfix in orientation stuff (big thanks to Abhishek) FEATURE: added TOUCHPAD_XY_INVERTED macro
FIX: struct cal renamed to struct cal_t
FIX: SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT
+FIX: struct TOUCHPAD_t renamed to struct TOUCHPADDriver_t
+FIX: struct GConsole renamed to struct GConsole_t
*** changes after 1.0 ***
FIX: removed gdisp and touchpad prefix of driver directories
diff --git a/include/touchpad.h b/include/touchpad.h index 18f72ec5..2fcb0c16 100644 --- a/include/touchpad.h +++ b/include/touchpad.h @@ -83,11 +83,6 @@ void tpCalibrate(void); uint16_t tpReadZ(void); #endif -#if TOUCHPAD_STORE_CALIBRATION - extern void lld_tpWriteCalibration(struct cal_t cal); - extern struct cal_t lld_tpReadCalibration(void); -#endif - #ifdef __cplusplus } #endif diff --git a/src/touchpad.c b/src/touchpad.c index 0759134e..dc1aaf74 100644 --- a/src/touchpad.c +++ b/src/touchpad.c @@ -32,6 +32,11 @@ #if HAL_USE_TOUCHPAD || defined(__DOXYGEN__) +#if TOUCHPAD_STORE_CALIBRATION +extern void lld_tpWriteCalibration(struct cal_t cal); +extern struct cal_t lld_tpReadCalibration(void); +#endif + /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ |