Merge branch 'master' of github.com:Tectu/ChibiOS-GFX

ugfx_release_2.6
Joel Bodenmann 2012-10-13 01:05:54 +02:00
commit 0eeee23788
3 changed files with 7 additions and 5 deletions

View File

@ -10,6 +10,8 @@ FIX: huge internal bugfix in orientation stuff (big thanks to Abhishek)
FEATURE: added TOUCHPAD_XY_INVERTED macro FEATURE: added TOUCHPAD_XY_INVERTED macro
FIX: struct cal renamed to struct cal_t FIX: struct cal renamed to struct cal_t
FIX: SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT 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 *** *** changes after 1.0 ***
FIX: removed gdisp and touchpad prefix of driver directories FIX: removed gdisp and touchpad prefix of driver directories

View File

@ -83,11 +83,6 @@ void tpCalibrate(void);
uint16_t tpReadZ(void); uint16_t tpReadZ(void);
#endif #endif
#if TOUCHPAD_STORE_CALIBRATION
extern void lld_tpWriteCalibration(struct cal_t cal);
extern struct cal_t lld_tpReadCalibration(void);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -32,6 +32,11 @@
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__) #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. */ /* Driver local definitions. */
/*===========================================================================*/ /*===========================================================================*/