From 2c73edfac33b11a7bca0ff5d2118458101432bde Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Fri, 23 Mar 2012 05:25:53 +0100 Subject: [PATCH] v1.0.0 reorg --- project/commands/drawing/cmd_pixel.c | 2 +- project/commands/drawing/cmd_text.c | 8 ++++---- project/commands/drawing/cmd_textw.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/commands/drawing/cmd_pixel.c b/project/commands/drawing/cmd_pixel.c index cdc118f..9acbdd7 100644 --- a/project/commands/drawing/cmd_pixel.c +++ b/project/commands/drawing/cmd_pixel.c @@ -84,7 +84,7 @@ void cmd_getpixel(uint8_t argc, char **argv) getNumber (argv[1], &y); // Get pixel and switch R and B - uint16_t value = drawBGR2RGB(lcdGetPixel(x, y)); + uint16_t value = colorsBGR2RGB(lcdGetPixel(x, y)); // Output the results printf("%d%s", value, CFG_PRINTF_NEWLINE); diff --git a/project/commands/drawing/cmd_text.c b/project/commands/drawing/cmd_text.c index a662844..ad669d0 100644 --- a/project/commands/drawing/cmd_text.c +++ b/project/commands/drawing/cmd_text.c @@ -88,18 +88,18 @@ void cmd_text(uint8_t argc, char **argv) switch (font) { case 1: // DejaVu Sans Mono 8 - drawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansMono8ptFontInfo, (char *)&data); + fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansMono8ptFontInfo, (char *)&data); break; case 2: // DejaVu Sans Bold 9 - drawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansBold9ptFontInfo, (char *)&data); + fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansBold9ptFontInfo, (char *)&data); break; default: // DejaVu Sans 9 - drawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data); + fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data); break; } #else // Always use Vera Mono 9 is used by default - drawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data); + fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data); #endif } diff --git a/project/commands/drawing/cmd_textw.c b/project/commands/drawing/cmd_textw.c index fa57fd9..fdcd0aa 100644 --- a/project/commands/drawing/cmd_textw.c +++ b/project/commands/drawing/cmd_textw.c @@ -84,18 +84,18 @@ void cmd_textw(uint8_t argc, char **argv) switch (font) { case 1: // DejaVu Sans Mono 8 - printf("%d %s", drawGetStringWidth(&dejaVuSansMono8ptFontInfo, data), CFG_PRINTF_NEWLINE); + printf("%d %s", fontsGetStringWidth(&dejaVuSansMono8ptFontInfo, data), CFG_PRINTF_NEWLINE); break; case 2: // DejaVu Sans Bold 9 - printf("%d %s", drawGetStringWidth(&dejaVuSansBold9ptFontInfo, data), CFG_PRINTF_NEWLINE); + printf("%d %s", fontsGetStringWidth(&dejaVuSansBold9ptFontInfo, data), CFG_PRINTF_NEWLINE); break; default: // DejaVu Sans 9 - printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE); + printf("%d %s", fontsGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE); break; } #else // Always use DejaVu Sans 9 by default - printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE); + printf("%d %s", fontsGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE); #endif -- 2.20.1