diff --git a/demos/console/main.c b/demos/console/main.c old mode 100755 new mode 100644 diff --git a/demos/notepad/main.c b/demos/notepad/main.c old mode 100755 new mode 100644 diff --git a/docs/usage.txt b/docs/usage.txt index 961fa2c6..52cd39b1 100644 --- a/docs/usage.txt +++ b/docs/usage.txt @@ -1,15 +1,15 @@ To include any of these functions/drivers in your project... - 1/ Specify the path to the LCDLIB. If none defined, default is $(CHIBIOS)/ext/lcd + 1/ Specify the path to the GFXLIB. If none defined, default is $(CHIBIOS)/ext/lcd 2/ In your project Makefile (amongst similiar lines but after the hal line) add the line... - include $(LCDLIB)/lcd.mk + include $(GFXLIB)/lcd.mk - 3/ Add $(LCDSRC) and $(LCDINC) to your SRCS and INCDIR of your projects Makefile + 3/ Add $(GFXSRC) and $(GFXINC) to your SRCS and INCDIR of your projects Makefile 4/ In your project Makefile add the makefiles for any specific drivers you want e.g - include $(LCDLIB)/halext/drivers/touchpad/XPT2046/touchpad_lld.mk - include $(LCDLIB)/halext/drivers/gdisp/Nokia6610/gdisp_lld.mk + include $(GFXLIB)/halext/drivers/touchpad/XPT2046/touchpad_lld.mk + include $(GFXLIB)/halext/drivers/gdisp/Nokia6610/gdisp_lld.mk 5/ In your project halconf.h turn on the support you want eg. /** diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.mk b/drivers/gdisp/Nokia6610/gdisp_lld.mk index 0f09ec0f..f378c02e 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld.mk +++ b/drivers/gdisp/Nokia6610/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/Nokia6610 +GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610 diff --git a/drivers/gdisp/Nokia6610/readme.txt b/drivers/gdisp/Nokia6610/readme.txt index 95777866..8aa5ee6c 100644 --- a/drivers/gdisp/Nokia6610/readme.txt +++ b/drivers/gdisp/Nokia6610/readme.txt @@ -13,4 +13,4 @@ To use this driver: Olimex SAM7-EX256 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk diff --git a/drivers/gdisp/S6D1121/gdisp_lld.mk b/drivers/gdisp/S6D1121/gdisp_lld.mk index 79f5c2a9..38c23c43 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld.mk +++ b/drivers/gdisp/S6D1121/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/S6D1121/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/S6D1121 +GFXINC += $(GFXLIB)/drivers/gdisp/S6D1121 diff --git a/drivers/gdisp/S6D1121/readme.txt b/drivers/gdisp/S6D1121/readme.txt index 3b46562b..ecb34940 100644 --- a/drivers/gdisp/S6D1121/readme.txt +++ b/drivers/gdisp/S6D1121/readme.txt @@ -12,4 +12,4 @@ To use this driver: #define SCREEN_HEIGHT 240 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/S6D1121/gdisp_lld.mk diff --git a/drivers/gdisp/SSD1289/gdisp_lld.mk b/drivers/gdisp/SSD1289/gdisp_lld.mk index 247f3ef7..e340a7dc 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.mk +++ b/drivers/gdisp/SSD1289/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/SSD1289 +GFXINC += $(GFXLIB)/drivers/gdisp/SSD1289 diff --git a/drivers/gdisp/SSD1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt index 4a70e9e2..b767576d 100644 --- a/drivers/gdisp/SSD1289/readme.txt +++ b/drivers/gdisp/SSD1289/readme.txt @@ -12,4 +12,4 @@ To use this driver: #define SCREEN_HEIGHT 240 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk diff --git a/drivers/gdisp/SSD1963/gdisp_lld.mk b/drivers/gdisp/SSD1963/gdisp_lld.mk index 26d7a57a..7b967502 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld.mk +++ b/drivers/gdisp/SSD1963/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/SSD1963/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1963/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/SSD1963 +GFXINC += $(GFXLIB)/drivers/gdisp/SSD1963 diff --git a/drivers/gdisp/SSD1963/readme.txt b/drivers/gdisp/SSD1963/readme.txt index 960d9a0c..375133a7 100644 --- a/drivers/gdisp/SSD1963/readme.txt +++ b/drivers/gdisp/SSD1963/readme.txt @@ -13,7 +13,7 @@ To use this driver: 2. Edit gdisp_lld_panel.h with your panel properties 3. To your makefile add the following lines: - include $(LCDLIB)/drivers/gdisp/SSD1963/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/SSD1963/gdisp_lld.mk Example FSMC config with DMA: diff --git a/drivers/gdisp/TestStub/gdisp_lld.mk b/drivers/gdisp/TestStub/gdisp_lld.mk index 84c8ba7d..5f35be9d 100644 --- a/drivers/gdisp/TestStub/gdisp_lld.mk +++ b/drivers/gdisp/TestStub/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/TestStub/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/TestStub +GFXINC += $(GFXLIB)/drivers/gdisp/TestStub diff --git a/drivers/gdisp/TestStub/readme.txt b/drivers/gdisp/TestStub/readme.txt index 73120dfa..b51ffe1f 100644 --- a/drivers/gdisp/TestStub/readme.txt +++ b/drivers/gdisp/TestStub/readme.txt @@ -13,4 +13,4 @@ To use this driver: you want to compile test eg: GDISP_NEED_MULTITHREAD 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/TestStub/gdisp_lld.mk diff --git a/drivers/gdisp/VMT/gdisp_lld.mk b/drivers/gdisp/VMT/gdisp_lld.mk index d4cf90be..96918f8a 100644 --- a/drivers/gdisp/VMT/gdisp_lld.mk +++ b/drivers/gdisp/VMT/gdisp_lld.mk @@ -1,7 +1,7 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/VMT/gdisp_lld.c \ - $(LCDLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \ - $(LCDLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c +GFXSRC += $(GFXLIB)/drivers/gdisp/VMT/gdisp_lld.c \ + $(GFXLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \ + $(GFXLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/VMT +GFXINC += $(GFXLIB)/drivers/gdisp/VMT diff --git a/drivers/touchpad/ADS7843/readme.txt b/drivers/touchpad/ADS7843/readme.txt index 6e62bf39..4eb8058f 100644 --- a/drivers/touchpad/ADS7843/readme.txt +++ b/drivers/touchpad/ADS7843/readme.txt @@ -4,5 +4,5 @@ To use this driver: a) #define HAL_USE_TOUCHPAD TRUE 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/touchpadADS7843/touchpad_lld.mk + include $(GFXLIB)/drivers/touchpadADS7843/touchpad_lld.mk diff --git a/drivers/touchpad/ADS7843/touchpad_lld.mk b/drivers/touchpad/ADS7843/touchpad_lld.mk index b17b1726..6aaa44ee 100644 --- a/drivers/touchpad/ADS7843/touchpad_lld.mk +++ b/drivers/touchpad/ADS7843/touchpad_lld.mk @@ -1,6 +1,6 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/touchpad/ADS7843/touchpad_lld.c +GFXSRC += $(GFXLIB)/drivers/touchpad/ADS7843/touchpad_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/touchpad/ADS7843 +GFXINC += $(GFXLIB)/drivers/touchpad/ADS7843 diff --git a/drivers/touchpad/XPT2046/readme.txt b/drivers/touchpad/XPT2046/readme.txt index e24ec768..f59dc893 100644 --- a/drivers/touchpad/XPT2046/readme.txt +++ b/drivers/touchpad/XPT2046/readme.txt @@ -4,5 +4,5 @@ To use this driver: a) #define HAL_USE_TOUCHPAD TRUE 2. To your makefile add the following lines: - include $(LCDLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk + include $(GFXLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk diff --git a/drivers/touchpad/XPT2046/touchpad_lld.mk b/drivers/touchpad/XPT2046/touchpad_lld.mk index 362fb452..8d662a74 100644 --- a/drivers/touchpad/XPT2046/touchpad_lld.mk +++ b/drivers/touchpad/XPT2046/touchpad_lld.mk @@ -1,6 +1,6 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/touchpad/XPT2046/touchpad_lld.c +GFXSRC += $(GFXLIB)/drivers/touchpad/XPT2046/touchpad_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/touchpad/XPT2046 +GFXINC += $(GFXLIB)/drivers/touchpad/XPT2046 diff --git a/lcd.mk b/lcd.mk deleted file mode 100644 index 646fc1da..00000000 --- a/lcd.mk +++ /dev/null @@ -1,11 +0,0 @@ -# don't re-define LCDLIB if it has been set elsewhere, e.g in Makefile -ifeq ($(LCDLIB),) - LCDLIB = $(CHIBIOS)/ext/lcd -endif - -LCDSRC += $(LCDLIB)/src/gdisp.c \ - $(LCDLIB)/src/gdisp_fonts.c \ - $(LCDLIB)/src/touchpad.c \ - $(LCDLIB)/src/console.c \ - -LCDINC += $(LCDLIB)/include diff --git a/old/graph/graph.mk b/old/graph/graph.mk index 849940af..a826cfe0 100644 --- a/old/graph/graph.mk +++ b/old/graph/graph.mk @@ -1,3 +1,3 @@ -GDISP_GRAPH_SRC = $(LCDLIB)/graph/graph.c +GDISP_GRAPH_SRC = $(GFXLIB)/graph/graph.c -GDISP_GRAPH_INC = $(LCDLIB)/graph +GDISP_GRAPH_INC = $(GFXLIB)/graph diff --git a/old/gui/gui.mk b/old/gui/gui.mk index 6d0700aa..6d6d5456 100644 --- a/old/gui/gui.mk +++ b/old/gui/gui.mk @@ -1,3 +1,3 @@ -GDISP_GUI_SRC = $(LCDLIB)/gui/gui.c +GDISP_GUI_SRC = $(GFXLIB)/gui/gui.c -GDISP_GUI_INC = $(LCDLIB)/gui +GDISP_GUI_INC = $(GFXLIB)/gui diff --git a/templates/gdispXXXXX/gdisp_lld.mk b/templates/gdispXXXXX/gdisp_lld.mk index 0d243099..434d5366 100644 --- a/templates/gdispXXXXX/gdisp_lld.mk +++ b/templates/gdispXXXXX/gdisp_lld.mk @@ -1,5 +1,5 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/gdisp/gdispYOURDEVICE/gdisp_lld.c +GFXSRC += $(GFXLIB)/drivers/gdisp/gdispYOURDEVICE/gdisp_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/gdisp/gdispYOURDEVICE +GFXINC += $(GFXLIB)/drivers/gdisp/gdispYOURDEVICE diff --git a/templates/touchpadXXXXX/touchpad_lld.mk b/templates/touchpadXXXXX/touchpad_lld.mk index bbc7b527..524a407b 100644 --- a/templates/touchpadXXXXX/touchpad_lld.mk +++ b/templates/touchpadXXXXX/touchpad_lld.mk @@ -1,6 +1,6 @@ # List the required driver. -LCDSRC += $(LCDLIB)/drivers/touchpad/touchpadYOURDEVICE/touchpad_lld.c +GFXSRC += $(GFXLIB)/drivers/touchpad/touchpadYOURDEVICE/touchpad_lld.c # Required include directories -LCDINC += $(LCDLIB)/drivers/touchpad/touchpadYOURDEVICE +GFXINC += $(GFXLIB)/drivers/touchpad/touchpadYOURDEVICE