From a7be12a4e68fcaaa92f81a394bc316a592ec6270 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Fri, 9 Mar 2012 14:00:19 +0100 Subject: [PATCH] See changelog v0.9.8 --- ChangeLog.txt | 2 + Makefile | 16 ++- .../LPC1343 Workspace.workspace.session | 14 +-- build/codelite/LPC1343_CodeBase.project | 115 +++++++++++------- build/crossworks/LPC1343_CodeBase.hzp | 92 ++++++-------- build/crossworks/LPC1343_CodeBase.hzs | 16 +-- drivers/{lcd => displays}/bitmap/readme.txt | 0 .../bitmap/sharpmem/sharpmem.c | 6 +- .../bitmap/sharpmem/sharpmem.h | 2 +- .../bitmap/ssd1306/ssd1306.c | 10 +- .../bitmap/ssd1306/ssd1306.h | 2 +- .../{lcd => displays}/bitmap/st7565/st7565.c | 10 +- .../{lcd => displays}/bitmap/st7565/st7565.h | 2 +- .../samsung_20T202DA2JA/samsung_20T202DA2JA.c | 0 .../samsung_20T202DA2JA/samsung_20T202DA2JA.h | 0 drivers/{lcd => displays}/icons16.h | 0 drivers/{lcd => displays}/smallfonts.c | 0 drivers/{lcd => displays}/smallfonts.h | 0 drivers/{lcd => displays}/tft/bmp.c | 8 +- drivers/{lcd => displays}/tft/bmp.h | 0 drivers/{lcd => displays}/tft/colors.h | 0 .../tft/dialogues/alphanumeric.c | 12 +- .../tft/dialogues/alphanumeric.h | 0 drivers/{lcd => displays}/tft/drawing.c | 16 +-- drivers/{lcd => displays}/tft/drawing.h | 4 +- .../{lcd => displays}/tft/fonts/bitmapfonts.h | 0 .../{lcd => displays}/tft/fonts/dejavusans9.c | 0 .../{lcd => displays}/tft/fonts/dejavusans9.h | 0 .../tft/fonts/dejavusansbold9.c | 0 .../tft/fonts/dejavusansbold9.h | 0 .../tft/fonts/dejavusanscondensed9.c | 0 .../tft/fonts/dejavusanscondensed9.h | 0 .../tft/fonts/dejavusansmono8.c | 0 .../tft/fonts/dejavusansmono8.h | 0 .../tft/fonts/dejavusansmonobold8.c | 0 .../tft/fonts/dejavusansmonobold8.h | 0 .../{lcd => displays}/tft/fonts/verdana14.c | 0 .../{lcd => displays}/tft/fonts/verdana14.h | 0 .../{lcd => displays}/tft/fonts/verdana9.c | 0 .../{lcd => displays}/tft/fonts/verdana9.h | 0 .../tft/fonts/verdanabold14.c | 0 .../tft/fonts/verdanabold14.h | 0 drivers/{lcd => displays}/tft/hw/ILI9325.c | 2 +- drivers/{lcd => displays}/tft/hw/ILI9325.h | 2 +- drivers/{lcd => displays}/tft/hw/ILI9328.c | 2 +- drivers/{lcd => displays}/tft/hw/ILI9328.h | 2 +- drivers/{lcd => displays}/tft/hw/hx8340b.c | 0 drivers/{lcd => displays}/tft/hw/hx8340b.h | 2 +- drivers/{lcd => displays}/tft/hw/readme.txt | 0 drivers/{lcd => displays}/tft/hw/ssd1331.c | 0 drivers/{lcd => displays}/tft/hw/ssd1331.h | 2 +- drivers/{lcd => displays}/tft/hw/ssd1351.c | 10 +- drivers/{lcd => displays}/tft/hw/ssd1351.h | 4 +- drivers/{lcd => displays}/tft/hw/st7735.c | 0 drivers/{lcd => displays}/tft/hw/st7735.h | 2 +- drivers/{lcd => displays}/tft/hw/st7783.c | 2 +- drivers/{lcd => displays}/tft/hw/st7783.h | 2 +- drivers/{lcd => displays}/tft/hw/template.c | 2 +- drivers/{lcd => displays}/tft/lcd.h | 0 drivers/{lcd => displays}/tft/readme.txt | 0 drivers/{lcd => displays}/tft/touchscreen.c | 8 +- drivers/{lcd => displays}/tft/touchscreen.h | 0 main.c | 2 + project/commands/cmd_sysinfo.c | 2 +- project/commands/drawing/cmd_backlight.c | 4 +- project/commands/drawing/cmd_bmp.c | 4 +- project/commands/drawing/cmd_button.c | 8 +- project/commands/drawing/cmd_calibrate.c | 2 +- project/commands/drawing/cmd_circle.c | 4 +- project/commands/drawing/cmd_clear.c | 4 +- project/commands/drawing/cmd_gettext.c | 8 +- project/commands/drawing/cmd_line.c | 4 +- project/commands/drawing/cmd_orientation.c | 4 +- project/commands/drawing/cmd_pixel.c | 4 +- project/commands/drawing/cmd_progress.c | 4 +- project/commands/drawing/cmd_rectangle.c | 4 +- project/commands/drawing/cmd_roundedcorner.c | 4 +- project/commands/drawing/cmd_text.c | 10 +- project/commands/drawing/cmd_textw.c | 10 +- project/commands/drawing/cmd_triangle.c | 4 +- project/commands/drawing/cmd_tsthreshhold.c | 2 +- project/commands/drawing/cmd_tswait.c | 2 +- projectconfig.h | 12 +- sysinit.c | 14 +-- tools/examples/lcd/tft/basic_ui/main.c | 18 +-- tools/examples/lcd/tft/drawing_basic/main.c | 16 +-- tools/examples/lcd/tft/oscilloscope/main.c | 10 +- tools/examples/lcd/tft/touchscreen/main.c | 10 +- tools/readme.txt | 2 +- 89 files changed, 276 insertions(+), 265 deletions(-) rename drivers/{lcd => displays}/bitmap/readme.txt (100%) rename drivers/{lcd => displays}/bitmap/sharpmem/sharpmem.c (98%) rename drivers/{lcd => displays}/bitmap/sharpmem/sharpmem.h (99%) rename drivers/{lcd => displays}/bitmap/ssd1306/ssd1306.c (98%) rename drivers/{lcd => displays}/bitmap/ssd1306/ssd1306.h (99%) rename drivers/{lcd => displays}/bitmap/st7565/st7565.c (98%) rename drivers/{lcd => displays}/bitmap/st7565/st7565.h (99%) rename drivers/{lcd => displays}/character/samsung_20T202DA2JA/samsung_20T202DA2JA.c (100%) rename drivers/{lcd => displays}/character/samsung_20T202DA2JA/samsung_20T202DA2JA.h (100%) rename drivers/{lcd => displays}/icons16.h (100%) rename drivers/{lcd => displays}/smallfonts.c (100%) rename drivers/{lcd => displays}/smallfonts.h (100%) rename drivers/{lcd => displays}/tft/bmp.c (98%) rename drivers/{lcd => displays}/tft/bmp.h (100%) rename drivers/{lcd => displays}/tft/colors.h (100%) rename drivers/{lcd => displays}/tft/dialogues/alphanumeric.c (97%) rename drivers/{lcd => displays}/tft/dialogues/alphanumeric.h (100%) rename drivers/{lcd => displays}/tft/drawing.c (99%) rename drivers/{lcd => displays}/tft/drawing.h (98%) rename drivers/{lcd => displays}/tft/fonts/bitmapfonts.h (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusans9.c (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusans9.h (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansbold9.c (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansbold9.h (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusanscondensed9.c (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusanscondensed9.h (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansmono8.c (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansmono8.h (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansmonobold8.c (100%) rename drivers/{lcd => displays}/tft/fonts/dejavusansmonobold8.h (100%) rename drivers/{lcd => displays}/tft/fonts/verdana14.c (100%) rename drivers/{lcd => displays}/tft/fonts/verdana14.h (100%) rename drivers/{lcd => displays}/tft/fonts/verdana9.c (100%) rename drivers/{lcd => displays}/tft/fonts/verdana9.h (100%) rename drivers/{lcd => displays}/tft/fonts/verdanabold14.c (100%) rename drivers/{lcd => displays}/tft/fonts/verdanabold14.h (100%) rename drivers/{lcd => displays}/tft/hw/ILI9325.c (99%) rename drivers/{lcd => displays}/tft/hw/ILI9325.h (99%) rename drivers/{lcd => displays}/tft/hw/ILI9328.c (99%) rename drivers/{lcd => displays}/tft/hw/ILI9328.h (99%) rename drivers/{lcd => displays}/tft/hw/hx8340b.c (100%) rename drivers/{lcd => displays}/tft/hw/hx8340b.h (99%) rename drivers/{lcd => displays}/tft/hw/readme.txt (100%) rename drivers/{lcd => displays}/tft/hw/ssd1331.c (100%) rename drivers/{lcd => displays}/tft/hw/ssd1331.h (99%) rename drivers/{lcd => displays}/tft/hw/ssd1351.c (98%) rename drivers/{lcd => displays}/tft/hw/ssd1351.h (98%) rename drivers/{lcd => displays}/tft/hw/st7735.c (100%) rename drivers/{lcd => displays}/tft/hw/st7735.h (99%) rename drivers/{lcd => displays}/tft/hw/st7783.c (99%) rename drivers/{lcd => displays}/tft/hw/st7783.h (99%) rename drivers/{lcd => displays}/tft/hw/template.c (99%) rename drivers/{lcd => displays}/tft/lcd.h (100%) rename drivers/{lcd => displays}/tft/readme.txt (100%) rename drivers/{lcd => displays}/tft/touchscreen.c (99%) rename drivers/{lcd => displays}/tft/touchscreen.h (100%) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5075668..d89d321 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,7 @@ v0.9.8 - Ongoing ================ +- *** Renamed '/drivers/lcd' to '/drivers/display' *** +- Added driver for HX8340-B based LCDs - Added flag to projectconfig.h to disable the default GPIO IRQ Handler functions in code/gpio/gpio.c - Added driver for Samsung VFD displays from Adafruit diff --git a/Makefile b/Makefile index 14e1c26..d8b61f3 100644 --- a/Makefile +++ b/Makefile @@ -63,8 +63,8 @@ VPATH += drivers/rtc/isl12022m OBJS += isl12022m.o # TFT LCD support -VPATH += drivers/lcd/tft drivers/lcd/tft/hw drivers/lcd/tft/fonts -VPATH += drivers/lcd/tft/dialogues +VPATH += drivers/displays/tft drivers/displays/tft/hw drivers/displays/tft/fonts +VPATH += drivers/displays/tft/dialogues OBJS += drawing.o touchscreen.o bmp.o alphanumeric.o OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o OBJS += dejavusansmono8.o dejavusansmonobold8.o @@ -79,9 +79,15 @@ OBJS += ILI9328.o # OBJS += st7783.o # Bitmap/Monochrome LCD support (ST7565, SSD1306, etc.) -VPATH += drivers/lcd drivers/lcd/bitmap/st7565 -VPATH += drivers/lcd/bitmap/ssd1306 -OBJS += smallfonts.o st7565.o ssd1306.o +VPATH += drivers/displays +VPATH += drivers/displays/bitmap/sharpmem +VPATH += drivers/displays/bitmap/st7565 +VPATH += drivers/displays/bitmap/ssd1306 +OBJS += smallfonts.o sharpmem.o st7565.o ssd1306.o + +#Character Displays (VFD text displays, etc.) +VPATH += drivers/displays/character/samsung_20T202DA2JA +OBJS += samsung_20T202DA2JA.o # ChaN FatFS and SD card support VPATH += drivers/fatfs diff --git a/build/codelite/LPC1343 Workspace.workspace.session b/build/codelite/LPC1343 Workspace.workspace.session index 07cea37..5865baa 100644 --- a/build/codelite/LPC1343 Workspace.workspace.session +++ b/build/codelite/LPC1343 Workspace.workspace.session @@ -1,24 +1,24 @@ - + - - + + - - + + - - + + diff --git a/build/codelite/LPC1343_CodeBase.project b/build/codelite/LPC1343_CodeBase.project index 1b12a41..1a37ab1 100644 --- a/build/codelite/LPC1343_CodeBase.project +++ b/build/codelite/LPC1343_CodeBase.project @@ -161,66 +161,89 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + - - diff --git a/build/crossworks/LPC1343_CodeBase.hzp b/build/crossworks/LPC1343_CodeBase.hzp index 365f647..1ebe6dd 100644 --- a/build/crossworks/LPC1343_CodeBase.hzp +++ b/build/crossworks/LPC1343_CodeBase.hzp @@ -192,94 +192,78 @@ - + - + - + - + - - + + - + - + + + + - + - - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + - - + + + + + - - - - - + + + @@ -413,5 +397,5 @@ diff --git a/drivers/lcd/bitmap/readme.txt b/drivers/displays/bitmap/readme.txt similarity index 100% rename from drivers/lcd/bitmap/readme.txt rename to drivers/displays/bitmap/readme.txt diff --git a/drivers/lcd/bitmap/sharpmem/sharpmem.c b/drivers/displays/bitmap/sharpmem/sharpmem.c similarity index 98% rename from drivers/lcd/bitmap/sharpmem/sharpmem.c rename to drivers/displays/bitmap/sharpmem/sharpmem.c index 545e643..43e4821 100644 --- a/drivers/lcd/bitmap/sharpmem/sharpmem.c +++ b/drivers/displays/bitmap/sharpmem/sharpmem.c @@ -75,7 +75,7 @@ #include "core/systick/systick.h" #include "core/gpio/gpio.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" #define TOGGLE_VCOM do { _sharpmem_vcom = _sharpmem_vcom ? 0x00 : SHARPMEM_BIT_VCOM; } while(0); @@ -358,8 +358,8 @@ void sharpmemRefresh(void) @code - #include "drivers/lcd/bitmap/sharpmem/sharpmem.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/sharpmem/sharpmem.h" + #include "drivers/displays/smallfonts.h" // Configure the pins and initialise the LCD screen sharpmemInit(); diff --git a/drivers/lcd/bitmap/sharpmem/sharpmem.h b/drivers/displays/bitmap/sharpmem/sharpmem.h similarity index 99% rename from drivers/lcd/bitmap/sharpmem/sharpmem.h rename to drivers/displays/bitmap/sharpmem/sharpmem.h index 8628d7a..5f446b1 100644 --- a/drivers/lcd/bitmap/sharpmem/sharpmem.h +++ b/drivers/displays/bitmap/sharpmem/sharpmem.h @@ -37,7 +37,7 @@ #define __SHARPMEM_H__ #include "projectconfig.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" /************************************************************************** Sharp Memory Display Connector diff --git a/drivers/lcd/bitmap/ssd1306/ssd1306.c b/drivers/displays/bitmap/ssd1306/ssd1306.c similarity index 98% rename from drivers/lcd/bitmap/ssd1306/ssd1306.c rename to drivers/displays/bitmap/ssd1306/ssd1306.c index 6aa038a..e5bf364 100644 --- a/drivers/lcd/bitmap/ssd1306/ssd1306.c +++ b/drivers/displays/bitmap/ssd1306/ssd1306.c @@ -46,7 +46,7 @@ #include "core/gpio/gpio.h" #include "core/systick/systick.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" void ssd1306SendByte(uint8_t byte); @@ -349,8 +349,8 @@ void ssd1306Refresh(void) @code - #include "drivers/lcd/bitmap/ssd1306/ssd1306.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/ssd1306/ssd1306.h" + #include "drivers/displays/smallfonts.h" // Configure the pins and initialise the LCD screen ssd1306Init(SSD1306_INTERNALVCC); @@ -388,8 +388,8 @@ void ssd1306DrawString(uint16_t x, uint16_t y, char* text, struct FONT_DEF font) @code - #include "drivers/lcd/bitmap/ssd1306/ssd1306.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/ssd1306/ssd1306.h" + #include "drivers/displays/smallfonts.h" // Configure the pins and initialise the LCD screen ssd1306Init(SSD1306_INTERNALVCC); diff --git a/drivers/lcd/bitmap/ssd1306/ssd1306.h b/drivers/displays/bitmap/ssd1306/ssd1306.h similarity index 99% rename from drivers/lcd/bitmap/ssd1306/ssd1306.h rename to drivers/displays/bitmap/ssd1306/ssd1306.h index 4bb1853..7fb7c33 100644 --- a/drivers/lcd/bitmap/ssd1306/ssd1306.h +++ b/drivers/displays/bitmap/ssd1306/ssd1306.h @@ -40,7 +40,7 @@ #include "projectconfig.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" /*========================================================================= SSD1306 Displays diff --git a/drivers/lcd/bitmap/st7565/st7565.c b/drivers/displays/bitmap/st7565/st7565.c similarity index 98% rename from drivers/lcd/bitmap/st7565/st7565.c rename to drivers/displays/bitmap/st7565/st7565.c index 36707cb..d8b125e 100644 --- a/drivers/lcd/bitmap/st7565/st7565.c +++ b/drivers/displays/bitmap/st7565/st7565.c @@ -46,7 +46,7 @@ #include "core/gpio/gpio.h" #include "core/systick/systick.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" void sendByte(uint8_t byte); @@ -343,8 +343,8 @@ uint8_t st7565GetPixel(uint8_t x, uint8_t y) @code - #include "drivers/lcd/bitmap/st7565/st7565.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/st7565/st7565.h" + #include "drivers/displays/smallfonts.h" // Configure the pins and initialise the LCD screen st7565Init(); @@ -386,8 +386,8 @@ void st7565DrawString(uint16_t x, uint16_t y, char* text, struct FONT_DEF font) @code - #include "drivers/lcd/bitmap/st7565/st7565.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/st7565/st7565.h" + #include "drivers/displays/smallfonts.h" // Configure the pins and initialise the LCD screen st7565Init(); diff --git a/drivers/lcd/bitmap/st7565/st7565.h b/drivers/displays/bitmap/st7565/st7565.h similarity index 99% rename from drivers/lcd/bitmap/st7565/st7565.h rename to drivers/displays/bitmap/st7565/st7565.h index c27a06f..4d2ca7b 100644 --- a/drivers/lcd/bitmap/st7565/st7565.h +++ b/drivers/displays/bitmap/st7565/st7565.h @@ -38,7 +38,7 @@ #include "projectconfig.h" -#include "drivers/lcd/smallfonts.h" +#include "drivers/displays/smallfonts.h" // Pin Definitions #define ST7565_A0_PORT (2) // Register Select Pin (A0) diff --git a/drivers/lcd/character/samsung_20T202DA2JA/samsung_20T202DA2JA.c b/drivers/displays/character/samsung_20T202DA2JA/samsung_20T202DA2JA.c similarity index 100% rename from drivers/lcd/character/samsung_20T202DA2JA/samsung_20T202DA2JA.c rename to drivers/displays/character/samsung_20T202DA2JA/samsung_20T202DA2JA.c diff --git a/drivers/lcd/character/samsung_20T202DA2JA/samsung_20T202DA2JA.h b/drivers/displays/character/samsung_20T202DA2JA/samsung_20T202DA2JA.h similarity index 100% rename from drivers/lcd/character/samsung_20T202DA2JA/samsung_20T202DA2JA.h rename to drivers/displays/character/samsung_20T202DA2JA/samsung_20T202DA2JA.h diff --git a/drivers/lcd/icons16.h b/drivers/displays/icons16.h similarity index 100% rename from drivers/lcd/icons16.h rename to drivers/displays/icons16.h diff --git a/drivers/lcd/smallfonts.c b/drivers/displays/smallfonts.c similarity index 100% rename from drivers/lcd/smallfonts.c rename to drivers/displays/smallfonts.c diff --git a/drivers/lcd/smallfonts.h b/drivers/displays/smallfonts.h similarity index 100% rename from drivers/lcd/smallfonts.h rename to drivers/displays/smallfonts.h diff --git a/drivers/lcd/tft/bmp.c b/drivers/displays/tft/bmp.c similarity index 98% rename from drivers/lcd/tft/bmp.c rename to drivers/displays/tft/bmp.c index 60d1ebf..a378a86 100644 --- a/drivers/lcd/tft/bmp.c +++ b/drivers/displays/tft/bmp.c @@ -43,8 +43,8 @@ #include "bmp.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/lcd.h" // Only include read support if CFG_SDCARD is defined #ifdef CFG_SDCARD @@ -144,7 +144,7 @@ bmp_error_t bmpParseBitmap(uint16_t x, uint16_t y, FIL file) @code - #include "drivers/lcd/tft/bmp.h" + #include "drivers/displays/tft/bmp.h" bmp_error_t error; @@ -214,7 +214,7 @@ bmp_error_t bmpDrawBitmap(uint16_t x, uint16_t y, const char* filename) @code - #include "drivers/lcd/tft/bmp.h" + #include "drivers/displays/tft/bmp.h" bmp_error_t error; diff --git a/drivers/lcd/tft/bmp.h b/drivers/displays/tft/bmp.h similarity index 100% rename from drivers/lcd/tft/bmp.h rename to drivers/displays/tft/bmp.h diff --git a/drivers/lcd/tft/colors.h b/drivers/displays/tft/colors.h similarity index 100% rename from drivers/lcd/tft/colors.h rename to drivers/displays/tft/colors.h diff --git a/drivers/lcd/tft/dialogues/alphanumeric.c b/drivers/displays/tft/dialogues/alphanumeric.c similarity index 97% rename from drivers/lcd/tft/dialogues/alphanumeric.c rename to drivers/displays/tft/dialogues/alphanumeric.c index db22c32..f2f5d5c 100644 --- a/drivers/lcd/tft/dialogues/alphanumeric.c +++ b/drivers/displays/tft/dialogues/alphanumeric.c @@ -8,7 +8,7 @@ @section Example @code - #include "drivers/lcd/tft/dialogues/alphanumeric.h" + #include "drivers/displays/tft/dialogues/alphanumeric.h" // Print results from an alpha-numeric dialogue char* results = alphaShowDialogue(); @@ -51,10 +51,10 @@ #include "alphanumeric.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/touchscreen.h" -#include "drivers/lcd/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/touchscreen.h" +#include "drivers/displays/tft/fonts/dejavusans9.h" // Background and text input region colors #define ALPHA_COLOR_BACKGROUND COLOR_GRAY_15 @@ -319,7 +319,7 @@ char alphaHandleTouchEvent(void) @section Example @code - #include "drivers/lcd/tft/dialogues/alphanumeric.h" + #include "drivers/displays/tft/dialogues/alphanumeric.h" // Print results from an alpha-numeric dialogue char* results = alphaShowDialogue(); diff --git a/drivers/lcd/tft/dialogues/alphanumeric.h b/drivers/displays/tft/dialogues/alphanumeric.h similarity index 100% rename from drivers/lcd/tft/dialogues/alphanumeric.h rename to drivers/displays/tft/dialogues/alphanumeric.h diff --git a/drivers/lcd/tft/drawing.c b/drivers/displays/tft/drawing.c similarity index 99% rename from drivers/lcd/tft/drawing.c rename to drivers/displays/tft/drawing.c index cdc8d5a..5e1f0e9 100644 --- a/drivers/lcd/tft/drawing.c +++ b/drivers/displays/tft/drawing.c @@ -263,7 +263,7 @@ void drawTestPattern(void) @code - #include "drivers/lcd/fonts/smallfonts.h" + #include "drivers/displays/fonts/smallfonts.h" drawStringSmall(1, 210, COLOR_WHITE, "5x8 System (Max 40 Characters)", Font_System5x8); drawStringSmall(1, 220, COLOR_WHITE, "7x8 System (Max 30 Characters)", Font_System7x8); @@ -300,7 +300,7 @@ void drawStringSmall(uint16_t x, uint16_t y, uint16_t color, char* text, struct @code - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" drawString(0, 90, COLOR_BLACK, &dejaVuSans9ptFontInfo, "DejaVu Sans 9"); drawString(0, 105, COLOR_BLACK, &dejaVuSans9ptFontInfo, "123456789012345678901234567890"); @@ -1215,7 +1215,7 @@ uint16_t drawBGR2RGB(uint16_t color) @section Example @code - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/drawing.h" // Draw a the progress bar (150x15 pixels large, starting at X:10, Y:195 // with rounded corners on the top and showing 72% progress) @@ -1274,8 +1274,8 @@ void drawProgressBar ( uint16_t x, uint16_t y, uint16_t width, uint16_t height, @code - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" // Draw two buttons using Vera Sans Bold 9 drawButton(20, 195, 200, 35, &dejaVuSans9ptFontInfo, 7, COLOR_GRAY_80, COLOR_GRAY_80, COLOR_WHITE, "System Settings"); @@ -1319,8 +1319,8 @@ void drawButton(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const F @code - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/icons16.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/icons16.h" // Renders the info icon, which has two seperate parts ... the exterior // and a seperate interior mask if you want to fill the contents with a @@ -1365,7 +1365,7 @@ void drawIcon16(uint16_t x, uint16_t y, uint16_t color, uint16_t icon[]) @code - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/drawing.h" // Draw image.bmp (from the root folder) starting at pixel 0,0 bmp_error_t error = drawBitmapImage(0, 0, "/image.bmp"); diff --git a/drivers/lcd/tft/drawing.h b/drivers/displays/tft/drawing.h similarity index 98% rename from drivers/lcd/tft/drawing.h rename to drivers/displays/tft/drawing.h index d443bfd..188686a 100644 --- a/drivers/lcd/tft/drawing.h +++ b/drivers/displays/tft/drawing.h @@ -41,10 +41,10 @@ #include "projectconfig.h" #include "lcd.h" #include "colors.h" -#include "drivers/lcd/tft/fonts/bitmapfonts.h" +#include "drivers/displays/tft/fonts/bitmapfonts.h" #if defined CFG_TFTLCD_INCLUDESMALLFONTS & CFG_TFTLCD_INCLUDESMALLFONTS == 1 - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/smallfonts.h" #endif #ifdef CFG_SDCARD diff --git a/drivers/lcd/tft/fonts/bitmapfonts.h b/drivers/displays/tft/fonts/bitmapfonts.h similarity index 100% rename from drivers/lcd/tft/fonts/bitmapfonts.h rename to drivers/displays/tft/fonts/bitmapfonts.h diff --git a/drivers/lcd/tft/fonts/dejavusans9.c b/drivers/displays/tft/fonts/dejavusans9.c similarity index 100% rename from drivers/lcd/tft/fonts/dejavusans9.c rename to drivers/displays/tft/fonts/dejavusans9.c diff --git a/drivers/lcd/tft/fonts/dejavusans9.h b/drivers/displays/tft/fonts/dejavusans9.h similarity index 100% rename from drivers/lcd/tft/fonts/dejavusans9.h rename to drivers/displays/tft/fonts/dejavusans9.h diff --git a/drivers/lcd/tft/fonts/dejavusansbold9.c b/drivers/displays/tft/fonts/dejavusansbold9.c similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansbold9.c rename to drivers/displays/tft/fonts/dejavusansbold9.c diff --git a/drivers/lcd/tft/fonts/dejavusansbold9.h b/drivers/displays/tft/fonts/dejavusansbold9.h similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansbold9.h rename to drivers/displays/tft/fonts/dejavusansbold9.h diff --git a/drivers/lcd/tft/fonts/dejavusanscondensed9.c b/drivers/displays/tft/fonts/dejavusanscondensed9.c similarity index 100% rename from drivers/lcd/tft/fonts/dejavusanscondensed9.c rename to drivers/displays/tft/fonts/dejavusanscondensed9.c diff --git a/drivers/lcd/tft/fonts/dejavusanscondensed9.h b/drivers/displays/tft/fonts/dejavusanscondensed9.h similarity index 100% rename from drivers/lcd/tft/fonts/dejavusanscondensed9.h rename to drivers/displays/tft/fonts/dejavusanscondensed9.h diff --git a/drivers/lcd/tft/fonts/dejavusansmono8.c b/drivers/displays/tft/fonts/dejavusansmono8.c similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansmono8.c rename to drivers/displays/tft/fonts/dejavusansmono8.c diff --git a/drivers/lcd/tft/fonts/dejavusansmono8.h b/drivers/displays/tft/fonts/dejavusansmono8.h similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansmono8.h rename to drivers/displays/tft/fonts/dejavusansmono8.h diff --git a/drivers/lcd/tft/fonts/dejavusansmonobold8.c b/drivers/displays/tft/fonts/dejavusansmonobold8.c similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansmonobold8.c rename to drivers/displays/tft/fonts/dejavusansmonobold8.c diff --git a/drivers/lcd/tft/fonts/dejavusansmonobold8.h b/drivers/displays/tft/fonts/dejavusansmonobold8.h similarity index 100% rename from drivers/lcd/tft/fonts/dejavusansmonobold8.h rename to drivers/displays/tft/fonts/dejavusansmonobold8.h diff --git a/drivers/lcd/tft/fonts/verdana14.c b/drivers/displays/tft/fonts/verdana14.c similarity index 100% rename from drivers/lcd/tft/fonts/verdana14.c rename to drivers/displays/tft/fonts/verdana14.c diff --git a/drivers/lcd/tft/fonts/verdana14.h b/drivers/displays/tft/fonts/verdana14.h similarity index 100% rename from drivers/lcd/tft/fonts/verdana14.h rename to drivers/displays/tft/fonts/verdana14.h diff --git a/drivers/lcd/tft/fonts/verdana9.c b/drivers/displays/tft/fonts/verdana9.c similarity index 100% rename from drivers/lcd/tft/fonts/verdana9.c rename to drivers/displays/tft/fonts/verdana9.c diff --git a/drivers/lcd/tft/fonts/verdana9.h b/drivers/displays/tft/fonts/verdana9.h similarity index 100% rename from drivers/lcd/tft/fonts/verdana9.h rename to drivers/displays/tft/fonts/verdana9.h diff --git a/drivers/lcd/tft/fonts/verdanabold14.c b/drivers/displays/tft/fonts/verdanabold14.c similarity index 100% rename from drivers/lcd/tft/fonts/verdanabold14.c rename to drivers/displays/tft/fonts/verdanabold14.c diff --git a/drivers/lcd/tft/fonts/verdanabold14.h b/drivers/displays/tft/fonts/verdanabold14.h similarity index 100% rename from drivers/lcd/tft/fonts/verdanabold14.h rename to drivers/displays/tft/fonts/verdanabold14.h diff --git a/drivers/lcd/tft/hw/ILI9325.c b/drivers/displays/tft/hw/ILI9325.c similarity index 99% rename from drivers/lcd/tft/hw/ILI9325.c rename to drivers/displays/tft/hw/ILI9325.c index 1e75eca..7489b85 100644 --- a/drivers/lcd/tft/hw/ILI9325.c +++ b/drivers/displays/tft/hw/ILI9325.c @@ -48,7 +48,7 @@ /**************************************************************************/ #include "ILI9325.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/touchscreen.h" +#include "drivers/displays/tft/touchscreen.h" // Uncomment this to use faster inline methods, but requires more flash // #define ILI9235_USE_INLINE_METHODS (1) diff --git a/drivers/lcd/tft/hw/ILI9325.h b/drivers/displays/tft/hw/ILI9325.h similarity index 99% rename from drivers/lcd/tft/hw/ILI9325.h rename to drivers/displays/tft/hw/ILI9325.h index a589c40..5c62dc3 100644 --- a/drivers/lcd/tft/hw/ILI9325.h +++ b/drivers/displays/tft/hw/ILI9325.h @@ -38,7 +38,7 @@ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #include "core/gpio/gpio.h" // Control pins diff --git a/drivers/lcd/tft/hw/ILI9328.c b/drivers/displays/tft/hw/ILI9328.c similarity index 99% rename from drivers/lcd/tft/hw/ILI9328.c rename to drivers/displays/tft/hw/ILI9328.c index aba75c2..ca7ec20 100644 --- a/drivers/lcd/tft/hw/ILI9328.c +++ b/drivers/displays/tft/hw/ILI9328.c @@ -41,7 +41,7 @@ /**************************************************************************/ #include "ILI9328.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/touchscreen.h" +#include "drivers/displays/tft/touchscreen.h" // Uncomment this to use faster inline methods, but requires more flash #define ILI9238_USE_INLINE_METHODS (1) diff --git a/drivers/lcd/tft/hw/ILI9328.h b/drivers/displays/tft/hw/ILI9328.h similarity index 99% rename from drivers/lcd/tft/hw/ILI9328.h rename to drivers/displays/tft/hw/ILI9328.h index 7a04249..23b98c7 100644 --- a/drivers/lcd/tft/hw/ILI9328.h +++ b/drivers/displays/tft/hw/ILI9328.h @@ -38,7 +38,7 @@ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #include "core/gpio/gpio.h" // Control pins diff --git a/drivers/lcd/tft/hw/hx8340b.c b/drivers/displays/tft/hw/hx8340b.c similarity index 100% rename from drivers/lcd/tft/hw/hx8340b.c rename to drivers/displays/tft/hw/hx8340b.c diff --git a/drivers/lcd/tft/hw/hx8340b.h b/drivers/displays/tft/hw/hx8340b.h similarity index 99% rename from drivers/lcd/tft/hw/hx8340b.h rename to drivers/displays/tft/hw/hx8340b.h index ddb4c6b..d425324 100644 --- a/drivers/lcd/tft/hw/hx8340b.h +++ b/drivers/displays/tft/hw/hx8340b.h @@ -37,7 +37,7 @@ #define __HX8340B_H__ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #define HX8340B_ICVERSION_N // #define HX8340B_ICVERSION_T diff --git a/drivers/lcd/tft/hw/readme.txt b/drivers/displays/tft/hw/readme.txt similarity index 100% rename from drivers/lcd/tft/hw/readme.txt rename to drivers/displays/tft/hw/readme.txt diff --git a/drivers/lcd/tft/hw/ssd1331.c b/drivers/displays/tft/hw/ssd1331.c similarity index 100% rename from drivers/lcd/tft/hw/ssd1331.c rename to drivers/displays/tft/hw/ssd1331.c diff --git a/drivers/lcd/tft/hw/ssd1331.h b/drivers/displays/tft/hw/ssd1331.h similarity index 99% rename from drivers/lcd/tft/hw/ssd1331.h rename to drivers/displays/tft/hw/ssd1331.h index 3dd4bc8..f4eb5a0 100644 --- a/drivers/lcd/tft/hw/ssd1331.h +++ b/drivers/displays/tft/hw/ssd1331.h @@ -38,7 +38,7 @@ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #include "core/gpio/gpio.h" // Select one of these defines to set the pixel color order diff --git a/drivers/lcd/tft/hw/ssd1351.c b/drivers/displays/tft/hw/ssd1351.c similarity index 98% rename from drivers/lcd/tft/hw/ssd1351.c rename to drivers/displays/tft/hw/ssd1351.c index b53d9e3..bd9e6ac 100644 --- a/drivers/lcd/tft/hw/ssd1351.c +++ b/drivers/displays/tft/hw/ssd1351.c @@ -123,6 +123,7 @@ void ssd1351SetCursor(uint8_t x, uint8_t y) if ((x >= ssd1351Properties.width) || (y >= ssd1351Properties.height)) return; + CMD(SSD1351_CMD_WRITERAM); CMD(SSD1351_CMD_SETCOLUMNADDRESS); DATA(x); // Start Address DATA(ssd1351Properties.width-1); // End Address (0x7F) @@ -130,6 +131,7 @@ void ssd1351SetCursor(uint8_t x, uint8_t y) CMD(SSD1351_CMD_SETROWADDRESS); DATA(y); // Start Address DATA(ssd1351Properties.height-1); // End Address (0x7F) + CMD(SSD1351_CMD_WRITERAM); } /*************************************************/ @@ -174,7 +176,7 @@ void lcdInit(void) CMD(SSD1351_CMD_SETMUXRRATIO); DATA(0x7F); CMD(SSD1351_CMD_COLORDEPTH); - DATA(0x74); // 65,536 Colors + DATA(0x74); // Bit 7:6 = 65,536 Colors, Bit 3 = BGR or RGB CMD(SSD1351_CMD_SETCOLUMNADDRESS); DATA(0x00); DATA(0x7F); @@ -188,8 +190,7 @@ void lcdInit(void) CMD(SSD1351_CMD_SETGPIO); DATA(0x00); // Disable GPIO pins CMD(SSD1351_CMD_FUNCTIONSELECTION); - DATA(0x00); // External VDD (0 = Internal, 1 = External???)* - // Which is it ... DS is contradictory here! + DATA(0x01); // External VDD (0 = External, 1 = Internal) CMD(SSD1351_CMD_SETPHASELENGTH); DATA(0x32); CMD(SSD1351_CMD_SETSEGMENTLOWVOLTAGE); @@ -331,11 +332,10 @@ void lcdFillRGB(uint16_t data) { uint16_t i; ssd1351SetCursor(0, 0); - CMD(SSD1351_CMD_WRITERAM); for (i=1; i<=((ssd1351Properties.width)*(ssd1351Properties.height)) * 2;i++) { + DATA(data >> 8); DATA(data); - DATA((data >> 8)); } } diff --git a/drivers/lcd/tft/hw/ssd1351.h b/drivers/displays/tft/hw/ssd1351.h similarity index 98% rename from drivers/lcd/tft/hw/ssd1351.h rename to drivers/displays/tft/hw/ssd1351.h index e4edfd8..56674f9 100644 --- a/drivers/lcd/tft/hw/ssd1351.h +++ b/drivers/displays/tft/hw/ssd1351.h @@ -37,7 +37,7 @@ #define __SSD1351_H__ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #include "core/gpio/gpio.h" /*========================================================================= @@ -113,7 +113,7 @@ enum // A0[2] = Color Remap (0 = ABC, 1 = CBA) - HW RGB/BGR switch // A0[4] = COM Scan Direction (0 = top to bottom, 1 = bottom to top) // A0[5] = Odd/Even Paid Split - // A0[7:6] = Display Color Mode (Bits not documented !?!) + // A0[7:6] = Display Color Mode (00 = 8-bit, 01 = 65K, 10/11 = 262K, 8/16-bit interface only) SSD1351_CMD_SETDISPLAYSTARTLINE = 0xA1, SSD1351_CMD_SETDISPLAYOFFSET = 0xA2, SSD1351_CMD_SETDISPLAYMODE_ALLOFF = 0xA4, // Force entire display area to grayscale GS0 diff --git a/drivers/lcd/tft/hw/st7735.c b/drivers/displays/tft/hw/st7735.c similarity index 100% rename from drivers/lcd/tft/hw/st7735.c rename to drivers/displays/tft/hw/st7735.c diff --git a/drivers/lcd/tft/hw/st7735.h b/drivers/displays/tft/hw/st7735.h similarity index 99% rename from drivers/lcd/tft/hw/st7735.h rename to drivers/displays/tft/hw/st7735.h index 483c2cc..631c548 100644 --- a/drivers/lcd/tft/hw/st7735.h +++ b/drivers/displays/tft/hw/st7735.h @@ -37,7 +37,7 @@ #define __ST7735_H__ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" /************************************************************************** ST7735 CONNECTOR diff --git a/drivers/lcd/tft/hw/st7783.c b/drivers/displays/tft/hw/st7783.c similarity index 99% rename from drivers/lcd/tft/hw/st7783.c rename to drivers/displays/tft/hw/st7783.c index a8a50af..82e9aa2 100644 --- a/drivers/lcd/tft/hw/st7783.c +++ b/drivers/displays/tft/hw/st7783.c @@ -45,7 +45,7 @@ /**************************************************************************/ #include "st7783.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/touchscreen.h" +#include "drivers/displays/tft/touchscreen.h" static lcdOrientation_t lcdOrientation = LCD_ORIENTATION_PORTRAIT; static lcdProperties_t st7783Properties = { 240, 320, TRUE, TRUE, FALSE }; diff --git a/drivers/lcd/tft/hw/st7783.h b/drivers/displays/tft/hw/st7783.h similarity index 99% rename from drivers/lcd/tft/hw/st7783.h rename to drivers/displays/tft/hw/st7783.h index af70910..1ef0d75 100644 --- a/drivers/lcd/tft/hw/st7783.h +++ b/drivers/displays/tft/hw/st7783.h @@ -38,7 +38,7 @@ #include "projectconfig.h" -#include "drivers/lcd/tft/lcd.h" +#include "drivers/displays/tft/lcd.h" #include "core/gpio/gpio.h" // Control pins diff --git a/drivers/lcd/tft/hw/template.c b/drivers/displays/tft/hw/template.c similarity index 99% rename from drivers/lcd/tft/hw/template.c rename to drivers/displays/tft/hw/template.c index db6713c..ed1c271 100644 --- a/drivers/lcd/tft/hw/template.c +++ b/drivers/displays/tft/hw/template.c @@ -38,7 +38,7 @@ */ /**************************************************************************/ #include "core/systick/systick.h" -#include "drivers/lcd/tft/touchscreen.h" +#include "drivers/displays/tft/touchscreen.h" // Screen width, height, has touchscreen, support orientation changes, support hw scrolling static lcdProperties_t templateProperties = { 240, 320, false, false, false }; diff --git a/drivers/lcd/tft/lcd.h b/drivers/displays/tft/lcd.h similarity index 100% rename from drivers/lcd/tft/lcd.h rename to drivers/displays/tft/lcd.h diff --git a/drivers/lcd/tft/readme.txt b/drivers/displays/tft/readme.txt similarity index 100% rename from drivers/lcd/tft/readme.txt rename to drivers/displays/tft/readme.txt diff --git a/drivers/lcd/tft/touchscreen.c b/drivers/displays/tft/touchscreen.c similarity index 99% rename from drivers/lcd/tft/touchscreen.c rename to drivers/displays/tft/touchscreen.c index bb7371a..90af15f 100644 --- a/drivers/lcd/tft/touchscreen.c +++ b/drivers/displays/tft/touchscreen.c @@ -41,9 +41,9 @@ #include "core/gpio/gpio.h" #include "core/systick/systick.h" #include "drivers/eeprom/eeprom.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/fonts/dejavusans9.h" #define TS_LINE1 "Touch the center of" #define TS_LINE2 "the red circle using" @@ -495,7 +495,7 @@ void tsCalibrate(void) @section Example @code - #include "drivers/lcd/tft/touchscreen.h" + #include "drivers/displays/tft/touchscreen.h" ... tsTouchData_t data; tsTouchError_t error; diff --git a/drivers/lcd/tft/touchscreen.h b/drivers/displays/tft/touchscreen.h similarity index 100% rename from drivers/lcd/tft/touchscreen.h rename to drivers/displays/tft/touchscreen.h diff --git a/main.c b/main.c index 8cff6f6..703bf96 100644 --- a/main.c +++ b/main.c @@ -61,6 +61,8 @@ int main(void) uint32_t currentSecond, lastSecond; currentSecond = lastSecond = 0; + lcdTest(); + while (1) { // Toggle LED once per second diff --git a/project/commands/cmd_sysinfo.c b/project/commands/cmd_sysinfo.c index ead3aa8..a742f0e 100644 --- a/project/commands/cmd_sysinfo.c +++ b/project/commands/cmd_sysinfo.c @@ -58,7 +58,7 @@ #endif #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" + #include "drivers/displays/tft/lcd.h" #endif #ifdef CFG_SDCARD diff --git a/project/commands/drawing/cmd_backlight.c b/project/commands/drawing/cmd_backlight.c index 2c3c359..86d2615 100644 --- a/project/commands/drawing/cmd_backlight.c +++ b/project/commands/drawing/cmd_backlight.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_bmp.c b/project/commands/drawing/cmd_bmp.c index 4ae5423..4cb88d7 100644 --- a/project/commands/drawing/cmd_bmp.c +++ b/project/commands/drawing/cmd_bmp.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #if defined CFG_TFTLCD && defined CFG_SDCARD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_button.c b/project/commands/drawing/cmd_button.c index 98d376f..a418e14 100644 --- a/project/commands/drawing/cmd_button.c +++ b/project/commands/drawing/cmd_button.c @@ -44,10 +44,10 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/touchscreen.h" - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/touchscreen.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_calibrate.c b/project/commands/drawing/cmd_calibrate.c index 93316b7..fcfd4d2 100644 --- a/project/commands/drawing/cmd_calibrate.c +++ b/project/commands/drawing/cmd_calibrate.c @@ -43,7 +43,7 @@ #include "project/commands.h" // Generic helper functions #if defined CFG_TFTLCD - #include "drivers/lcd/tft/touchscreen.h" + #include "drivers/displays/tft/touchscreen.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_circle.c b/project/commands/drawing/cmd_circle.c index 9eb1227..1651029 100644 --- a/project/commands/drawing/cmd_circle.c +++ b/project/commands/drawing/cmd_circle.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_clear.c b/project/commands/drawing/cmd_clear.c index 50ef287..6d7bb2e 100644 --- a/project/commands/drawing/cmd_clear.c +++ b/project/commands/drawing/cmd_clear.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_gettext.c b/project/commands/drawing/cmd_gettext.c index 8f41386..3b1843f 100644 --- a/project/commands/drawing/cmd_gettext.c +++ b/project/commands/drawing/cmd_gettext.c @@ -43,10 +43,10 @@ #include "project/commands.h" // Generic helper functions #if defined CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/touchscreen.h" - #include "drivers/lcd/tft/dialogues/alphanumeric.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/touchscreen.h" + #include "drivers/displays/tft/dialogues/alphanumeric.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_line.c b/project/commands/drawing/cmd_line.c index 2f9ed53..804f057 100644 --- a/project/commands/drawing/cmd_line.c +++ b/project/commands/drawing/cmd_line.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_orientation.c b/project/commands/drawing/cmd_orientation.c index 07ac9b3..0bd82bb 100644 --- a/project/commands/drawing/cmd_orientation.c +++ b/project/commands/drawing/cmd_orientation.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_pixel.c b/project/commands/drawing/cmd_pixel.c index 45a7432..cdc118f 100644 --- a/project/commands/drawing/cmd_pixel.c +++ b/project/commands/drawing/cmd_pixel.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_progress.c b/project/commands/drawing/cmd_progress.c index 40c1b27..0168e05 100644 --- a/project/commands/drawing/cmd_progress.c +++ b/project/commands/drawing/cmd_progress.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_rectangle.c b/project/commands/drawing/cmd_rectangle.c index 2750d1d..ff27504 100644 --- a/project/commands/drawing/cmd_rectangle.c +++ b/project/commands/drawing/cmd_rectangle.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_roundedcorner.c b/project/commands/drawing/cmd_roundedcorner.c index fe69969..e98ee1e 100644 --- a/project/commands/drawing/cmd_roundedcorner.c +++ b/project/commands/drawing/cmd_roundedcorner.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_text.c b/project/commands/drawing/cmd_text.c index 871d5e0..a662844 100644 --- a/project/commands/drawing/cmd_text.c +++ b/project/commands/drawing/cmd_text.c @@ -44,14 +44,14 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" // Only include this w/UART since there isn't enough space otherwise! #ifdef CFG_PRINTF_UART - #include "drivers/lcd/tft/fonts/dejavusansmono8.h" - #include "drivers/lcd/tft/fonts/dejavusansbold9.h" + #include "drivers/displays/tft/fonts/dejavusansmono8.h" + #include "drivers/displays/tft/fonts/dejavusansbold9.h" #endif /**************************************************************************/ diff --git a/project/commands/drawing/cmd_textw.c b/project/commands/drawing/cmd_textw.c index d116b77..fa57fd9 100644 --- a/project/commands/drawing/cmd_textw.c +++ b/project/commands/drawing/cmd_textw.c @@ -44,14 +44,14 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" - #include "drivers/lcd/tft/fonts/dejavusans9.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" + #include "drivers/displays/tft/fonts/dejavusans9.h" // Only include this w/UART since there isn't enough space otherwise! #ifdef CFG_PRINTF_UART - #include "drivers/lcd/tft/fonts/dejavusansmono8.h" - #include "drivers/lcd/tft/fonts/dejavusansbold9.h" + #include "drivers/displays/tft/fonts/dejavusansmono8.h" + #include "drivers/displays/tft/fonts/dejavusansbold9.h" #endif /**************************************************************************/ diff --git a/project/commands/drawing/cmd_triangle.c b/project/commands/drawing/cmd_triangle.c index ac82dfb..4d429ee 100644 --- a/project/commands/drawing/cmd_triangle.c +++ b/project/commands/drawing/cmd_triangle.c @@ -43,8 +43,8 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/drawing.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_tsthreshhold.c b/project/commands/drawing/cmd_tsthreshhold.c index 8dab6f8..9e0144e 100644 --- a/project/commands/drawing/cmd_tsthreshhold.c +++ b/project/commands/drawing/cmd_tsthreshhold.c @@ -45,7 +45,7 @@ #ifdef CFG_TFTLCD #include "drivers/eeprom/eeprom.h" - #include "drivers/lcd/tft/touchscreen.h" + #include "drivers/displays/tft/touchscreen.h" /**************************************************************************/ /*! diff --git a/project/commands/drawing/cmd_tswait.c b/project/commands/drawing/cmd_tswait.c index e43e5b4..1c7861f 100644 --- a/project/commands/drawing/cmd_tswait.c +++ b/project/commands/drawing/cmd_tswait.c @@ -45,7 +45,7 @@ #include "project/commands.h" // Generic helper functions #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/touchscreen.h" + #include "drivers/displays/tft/touchscreen.h" /**************************************************************************/ /*! diff --git a/projectconfig.h b/projectconfig.h index 8911fbd..1d69e9c 100644 --- a/projectconfig.h +++ b/projectconfig.h @@ -111,9 +111,9 @@ microBuilder.eu USB stick 802.15.4 868/915MHz RF transceiver -----------------------------------------------------------------------*/ - #define CFG_BRD_LPC1343_REFDESIGN + // #define CFG_BRD_LPC1343_REFDESIGN // #define CFG_BRD_LPC1343_REFDESIGN_MINIMAL - // #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_USB + #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_USB // #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_UART // #define CFG_BRD_LPC1343_802154USBSTICK // #define CFG_BRD_LPC1343_OLIMEX_P @@ -403,9 +403,9 @@ ADC_AVERAGING_ENABLE To get better results, the ADC code can take a number of samples and return the average value. This is slower, but can give more - accurate results caused of single-reading - peaks and dips. - To enable average, set ADC_AVERAGING_ENABLE + accurate results compared to single-reading. + + To enable averaging, set ADC_AVERAGING_ENABLE to a non-zero value. ADC_AVERAGING_SAMPLES The number of ADC samples to read and average if ADC averaging is enabled. @@ -1028,7 +1028,7 @@ a pre-determined LCD screen to be included during build. Only one LCD driver can be included during the build process (for ex. - 'drivers/lcd/hw/ILI9325.c') + 'drivers/displays/hw/ILI9325.c') CFG_TFTLCD_INCLUDESMALLFONTS If set to 1, smallfont support will be included for 3x6, 5x8, 7x8 and 8x8 fonts. This should only be enabled if these small diff --git a/sysinit.c b/sysinit.c index d1f440a..9734d23 100644 --- a/sysinit.c +++ b/sysinit.c @@ -71,19 +71,19 @@ #endif #ifdef CFG_ST7565 - #include "drivers/lcd/bitmap/st7565/st7565.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/st7565/st7565.h" + #include "drivers/displays/smallfonts.h" #endif #ifdef CFG_SSD1306 - #include "drivers/lcd/bitmap/ssd1306/ssd1306.h" - #include "drivers/lcd/smallfonts.h" + #include "drivers/displays/bitmap/ssd1306/ssd1306.h" + #include "drivers/displays/smallfonts.h" #endif #ifdef CFG_TFTLCD - #include "drivers/lcd/tft/lcd.h" - #include "drivers/lcd/tft/touchscreen.h" - #include "drivers/lcd/tft/drawing.h" + #include "drivers/displays/tft/lcd.h" + #include "drivers/displays/tft/touchscreen.h" + #include "drivers/displays/tft/drawing.h" #endif #ifdef CFG_I2CEEPROM diff --git a/tools/examples/lcd/tft/basic_ui/main.c b/tools/examples/lcd/tft/basic_ui/main.c index 9570765..67fb41d 100644 --- a/tools/examples/lcd/tft/basic_ui/main.c +++ b/tools/examples/lcd/tft/basic_ui/main.c @@ -42,15 +42,15 @@ #include "core/adc/adc.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/bmp.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/touchscreen.h" -#include "drivers/lcd/tft/fonts/dejavusans9.h" -#include "drivers/lcd/tft/fonts/dejavusansbold9.h" -#include "drivers/lcd/tft/fonts/dejavusansmono8.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/bmp.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/touchscreen.h" +#include "drivers/displays/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/fonts/dejavusansbold9.h" +#include "drivers/displays/tft/fonts/dejavusansmono8.h" -#include "drivers/lcd/icons16.h" +#include "drivers/displays/icons16.h" // Color scheme #define FONT_REGULAR &dejaVuSans9ptFontInfo @@ -94,7 +94,7 @@ void renderMenuItem(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uin /**************************************************************************/ /*! - Renders the 16x16 icons found in "/drivers/lcd/icons16.h" + Renders the 16x16 icons found in "/drivers/displays/icons16.h" */ /**************************************************************************/ void renderIcons(void) diff --git a/tools/examples/lcd/tft/drawing_basic/main.c b/tools/examples/lcd/tft/drawing_basic/main.c index f3468ab..332a5ca 100644 --- a/tools/examples/lcd/tft/drawing_basic/main.c +++ b/tools/examples/lcd/tft/drawing_basic/main.c @@ -43,14 +43,14 @@ #include "core/gpio/gpio.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/touchscreen.h" -#include "drivers/lcd/tft/dialogues/alphanumeric.h" - -#include "drivers/lcd/tft/fonts/dejavusans9.h" -#include "drivers/lcd/tft/fonts/dejavusansbold9.h" -#include "drivers/lcd/tft/fonts/dejavusansmono8.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/touchscreen.h" +#include "drivers/displays/tft/dialogues/alphanumeric.h" + +#include "drivers/displays/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/fonts/dejavusansbold9.h" +#include "drivers/displays/tft/fonts/dejavusansmono8.h" /**************************************************************************/ /*! diff --git a/tools/examples/lcd/tft/oscilloscope/main.c b/tools/examples/lcd/tft/oscilloscope/main.c index 8c0f37b..188dc1e 100644 --- a/tools/examples/lcd/tft/oscilloscope/main.c +++ b/tools/examples/lcd/tft/oscilloscope/main.c @@ -42,11 +42,11 @@ #include "core/adc/adc.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/touchscreen.h" -#include "drivers/lcd/tft/fonts/dejavusans9.h" -#include "drivers/lcd/tft/fonts/dejavusansbold9.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/touchscreen.h" +#include "drivers/displays/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/fonts/dejavusansbold9.h" static uint8_t adcBuffer[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; static uint8_t digBuffer[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; diff --git a/tools/examples/lcd/tft/touchscreen/main.c b/tools/examples/lcd/tft/touchscreen/main.c index 2c75e78..aa7ee25 100644 --- a/tools/examples/lcd/tft/touchscreen/main.c +++ b/tools/examples/lcd/tft/touchscreen/main.c @@ -42,11 +42,11 @@ #include "core/adc/adc.h" #include "core/systick/systick.h" -#include "drivers/lcd/tft/lcd.h" -#include "drivers/lcd/tft/drawing.h" -#include "drivers/lcd/tft/touchscreen.h" -#include "drivers/lcd/tft/fonts/dejavusans9.h" -#include "drivers/lcd/tft/fonts/dejavusansbold9.h" +#include "drivers/displays/tft/lcd.h" +#include "drivers/displays/tft/drawing.h" +#include "drivers/displays/tft/touchscreen.h" +#include "drivers/displays/tft/fonts/dejavusans9.h" +#include "drivers/displays/tft/fonts/dejavusansbold9.h" /**************************************************************************/ /*! diff --git a/tools/readme.txt b/tools/readme.txt index ee64e80..f06f77e 100644 --- a/tools/readme.txt +++ b/tools/readme.txt @@ -9,7 +9,7 @@ the LPC1343 Reference Board: source files. This application is included here for convenience sake and can be used to convert TTF fonts for use with the TFT LCD display with minor modifications to the generated source files. See the existing fonts - in 'drivers/lcd/tft/fonts' for an example. + in 'drivers/displays/tft/fonts' for an example. =============================================================================== -- 2.20.1