diff options
| -rw-r--r-- | demos/console/main.c | 2 | ||||
| -rw-r--r-- | include/console.h | 6 | ||||
| -rw-r--r-- | src/console.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/demos/console/main.c b/demos/console/main.c index ea27c727..2a0f2c77 100644 --- a/demos/console/main.c +++ b/demos/console/main.c @@ -47,7 +47,7 @@ int main(void) { gdispInit();
gdispClear(Lime);
- lcdConsoleInit(&CON1, 0, 0, gdispGetWidth(), gdispGetHeight(), &fontLarger, Black, White);
+ gfxConsoleInit(&CON1, 0, 0, gdispGetWidth(), gdispGetHeight(), &fontLarger, Black, White);
chprintf((BaseSequentialStream *)&CON1, "Hello the time is %d\nGoodbye.", chTimeNow());
diff --git a/include/console.h b/include/console.h index e0bf7de6..1874c57d 100644 --- a/include/console.h +++ b/include/console.h @@ -70,9 +70,9 @@ typedef struct _GConsole { extern "C" {
#endif
-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 *console, char c);
-msg_t lcdConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
+msg_t gfxConsoleInit(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 gfxConsolePut(GConsole *console, char c);
+msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
#ifdef __cplusplus
}
diff --git a/src/console.c b/src/console.c index ba94e640..d1ccdc17 100644 --- a/src/console.c +++ b/src/console.c @@ -28,7 +28,7 @@ * Interface implementation. The interface is write only
*/
static size_t write(void *ip, const uint8_t *bp, size_t n) {
- return lcdConsoleWrite((GConsole *)ip, bp, n);
+ return gfxConsoleWrite((GConsole *)ip, bp, n);
}
static size_t read(void *ip, uint8_t *bp, size_t n) {
@@ -42,7 +42,7 @@ static size_t read(void *ip, uint8_t *bp, size_t n) { static msg_t put(void *ip, uint8_t b) {
(void)ip;
- return lcdConsolePut((GConsole *)ip, (char)b);
+ return gfxConsolePut((GConsole *)ip, (char)b);
}
static msg_t get(void *ip) {
@@ -56,7 +56,7 @@ static msg_t putt(void *ip, uint8_t b, systime_t timeout) { /* TODO: handle timeout */
- return lcdConsolePut((GConsole *)ip, (char)b);
+ return gfxConsolePut((GConsole *)ip, (char)b);
}
static msg_t gett(void *ip, systime_t timeout) {
@@ -69,7 +69,7 @@ static msg_t gett(void *ip, systime_t timeout) { static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) {
(void)time;
- return lcdConsoleWrite((GConsole *)ip, bp, n);
+ return gfxConsoleWrite((GConsole *)ip, bp, n);
}
static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) {
@@ -86,7 +86,7 @@ static const struct GConsoleVMT vmt = { putt, gett, writet, readt
};
-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 gfxConsoleInit(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;
/* read font, get height & padding */
console->fy = gdispGetFontMetric(font, fontHeight);
@@ -110,7 +110,7 @@ msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, c return RDY_OK;
}
-msg_t lcdConsolePut(GConsole *console, char c) {
+msg_t gfxConsolePut(GConsole *console, char c) {
uint8_t width;
if(c == '\n') {
@@ -164,10 +164,10 @@ msg_t lcdConsolePut(GConsole *console, char c) { return RDY_OK;
}
-msg_t lcdConsoleWrite(GConsole *console, const uint8_t *bp, size_t n) {
+msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n) {
size_t i;
for(i = 0; i < n; i++)
- lcdConsolePut(console, bp[i]);
+ gfxConsolePut(console, bp[i]);
return RDY_OK;
}
|