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

TOUCHPADDriver_t -> TOUCHPADDriver | GConsole_t -> GConsole

ugfx_release_2.6
Joel Bodenmann 2012-10-13 01:05:20 +02:00
parent 9174141aca
commit 6546c03250
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/console.h
View File

@ -39,9 +39,9 @@
extern "C" { extern "C" {
#endif #endif
msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color); msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color);
msg_t lcdConsolePut(GConsole_t *console, char c); msg_t lcdConsolePut(GConsole *console, char c);
msg_t lcdConsoleWrite(GConsole_t *console, const uint8_t *bp, size_t n); msg_t lcdConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
include/touchpad.h
View File

@ -70,7 +70,7 @@ typedef struct cal_t {
extern "C" { extern "C" {
#endif #endif
void tpInit(const TOUCHPADDriver_t *tp); void tpInit(const TOUCHPADDriver *tp);
uint16_t tpReadX(void); uint16_t tpReadX(void);
uint16_t tpReadY(void); uint16_t tpReadY(void);
void tpCalibrate(void); void tpCalibrate(void);

6
include/touchpad_lld.h
View File

@ -76,7 +76,7 @@
/** /**
* @brief Structure representing a Touchpad driver. * @brief Structure representing a Touchpad driver.
*/ */
typedef struct _TOUCHPADDriver_t { typedef struct _TOUCHPADDriver {
/* /*
* @brief Pointer to SPI driver. * @brief Pointer to SPI driver.
* @note SPI driver must be enabled in mcuconf.h and halconf.h * @note SPI driver must be enabled in mcuconf.h and halconf.h
@ -113,7 +113,7 @@ typedef struct _TOUCHPADDriver_t {
* bus with a fast flash memory chip. * bus with a fast flash memory chip.
*/ */
bool_t direct_init; bool_t direct_init;
} TOUCHPADDriver_t; } TOUCHPADDriver;
/*===========================================================================*/ /*===========================================================================*/
@ -126,7 +126,7 @@ extern "C" {
#endif #endif
/* Core functions */ /* Core functions */
void tp_lld_init(const TOUCHPADDriver_t *tp); void tp_lld_init(const TOUCHPADDriver *tp);
uint16_t tp_lld_read_value(uint8_t cmd); uint16_t tp_lld_read_value(uint8_t cmd);
uint16_t tp_lld_read_x(void); uint16_t tp_lld_read_x(void);

10
src/console.c
View File

@ -41,7 +41,7 @@ struct GConsoleVMT {
* @details This class extends @p BaseAsynchronousChannel by adding physical * @details This class extends @p BaseAsynchronousChannel by adding physical
* I/O queues. * I/O queues.
*/ */
typedef struct _GConsole_t { typedef struct _GConsole {
/** @brief Virtual Methods Table.*/ /** @brief Virtual Methods Table.*/
const struct GConsoleVMT *vmt; const struct GConsoleVMT *vmt;
_base_asynchronous_channel_data _base_asynchronous_channel_data
@ -60,7 +60,7 @@ typedef struct _GConsole_t {
uint8_t fy; uint8_t fy;
/* font inter-character padding in pixels */ /* font inter-character padding in pixels */
uint8_t fp; uint8_t fp;
} GConsole_t; } GConsole;
/* /*
* Interface implementation. The interface is write only * Interface implementation. The interface is write only
@ -130,7 +130,7 @@ static const struct GConsoleVMT vmt = {
}; };
msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) { msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) {
console->vmt = &vmt; console->vmt = &vmt;
/* read font, get height & padding */ /* read font, get height & padding */
console->fy = gdispGetFontMetric(font, fontHeight); console->fy = gdispGetFontMetric(font, fontHeight);
@ -154,7 +154,7 @@ msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width,
return RDY_OK; return RDY_OK;
} }
msg_t lcdConsolePut(GLCDConsole_t *console, char c) { msg_t lcdConsolePut(GLCDConsole *console, char c) {
uint8_t width; uint8_t width;
if(c == '\n') { if(c == '\n') {
@ -208,7 +208,7 @@ msg_t lcdConsolePut(GLCDConsole_t *console, char c) {
return RDY_OK; return RDY_OK;
} }
msg_t lcdConsoleWrite(GLCDConsole_t *console, const uint8_t *bp, size_t n) { msg_t lcdConsoleWrite(GLCDConsole *console, const uint8_t *bp, size_t n) {
size_t i; size_t i;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
lcdConsolePut(console, bp[i]); lcdConsolePut(console, bp[i]);

2
src/touchpad.c
View File

@ -126,7 +126,7 @@ static void _tpDrawCross(uint16_t x, uint16_t y) {
* *
* @api * @api
*/ */
void tpInit(const TOUCHPADDriver_t *tp) { void tpInit(const TOUCHPADDriver *tp) {
/* Initialise Mutex */ /* Initialise Mutex */
//MUTEX_INIT //MUTEX_INIT