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

Makefile LCD replaced with GFX

Browse source
This commit is contained in:
Joel Bodenmann 2012-10-04 09:09:03 +02:00
parent b47ad0b71a
commit 27276101ee
23 changed files with 38 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
demos/console/main.c Executable file → Normal file
View file

0
demos/notepad/main.c Executable file → Normal file
View file

10
docs/usage.txt
View file

@ -1,15 +1,15 @@
To include any of these functions/drivers in your project... 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... 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 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 $(GFXLIB)/halext/drivers/touchpad/XPT2046/touchpad_lld.mk
include $(LCDLIB)/halext/drivers/gdisp/Nokia6610/gdisp_lld.mk include $(GFXLIB)/halext/drivers/gdisp/Nokia6610/gdisp_lld.mk
5/ In your project halconf.h turn on the support you want eg. 5/ In your project halconf.h turn on the support you want eg.
/** /**

4
drivers/gdisp/Nokia6610/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/Nokia6610 GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610

2
drivers/gdisp/Nokia6610/readme.txt
View file

@ -13,4 +13,4 @@ To use this driver:
Olimex SAM7-EX256 Olimex SAM7-EX256
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk include $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk

4
drivers/gdisp/S6D1121/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/S6D1121/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/S6D1121 GFXINC += $(GFXLIB)/drivers/gdisp/S6D1121

2
drivers/gdisp/S6D1121/readme.txt
View file

@ -12,4 +12,4 @@ To use this driver:
#define SCREEN_HEIGHT 240 #define SCREEN_HEIGHT 240
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.mk include $(GFXLIB)/drivers/gdisp/S6D1121/gdisp_lld.mk

4
drivers/gdisp/SSD1289/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/SSD1289 GFXINC += $(GFXLIB)/drivers/gdisp/SSD1289

2
drivers/gdisp/SSD1289/readme.txt
View file

@ -12,4 +12,4 @@ To use this driver:
#define SCREEN_HEIGHT 240 #define SCREEN_HEIGHT 240
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk

4
drivers/gdisp/SSD1963/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/SSD1963/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/SSD1963/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/SSD1963 GFXINC += $(GFXLIB)/drivers/gdisp/SSD1963

2
drivers/gdisp/SSD1963/readme.txt
View file

@ -13,7 +13,7 @@ To use this driver:
2. Edit gdisp_lld_panel.h with your panel properties 2. Edit gdisp_lld_panel.h with your panel properties
3. To your makefile add the following lines: 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: Example FSMC config with DMA:

4
drivers/gdisp/TestStub/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/TestStub/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/TestStub GFXINC += $(GFXLIB)/drivers/gdisp/TestStub

2
drivers/gdisp/TestStub/readme.txt
View file

@ -13,4 +13,4 @@ To use this driver:
you want to compile test eg: GDISP_NEED_MULTITHREAD you want to compile test eg: GDISP_NEED_MULTITHREAD
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.mk include $(GFXLIB)/drivers/gdisp/TestStub/gdisp_lld.mk

8
drivers/gdisp/VMT/gdisp_lld.mk
View file

@ -1,7 +1,7 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/VMT/gdisp_lld.c \ GFXSRC += $(GFXLIB)/drivers/gdisp/VMT/gdisp_lld.c \
$(LCDLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \ $(GFXLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \
$(LCDLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c $(GFXLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/VMT GFXINC += $(GFXLIB)/drivers/gdisp/VMT

2
drivers/touchpad/ADS7843/readme.txt
View file

@ -4,5 +4,5 @@ To use this driver:
a) #define HAL_USE_TOUCHPAD TRUE a) #define HAL_USE_TOUCHPAD TRUE
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/touchpadADS7843/touchpad_lld.mk include $(GFXLIB)/drivers/touchpadADS7843/touchpad_lld.mk

4
drivers/touchpad/ADS7843/touchpad_lld.mk
View file

@ -1,6 +1,6 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/touchpad/ADS7843/touchpad_lld.c GFXSRC += $(GFXLIB)/drivers/touchpad/ADS7843/touchpad_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/touchpad/ADS7843 GFXINC += $(GFXLIB)/drivers/touchpad/ADS7843

2
drivers/touchpad/XPT2046/readme.txt
View file

@ -4,5 +4,5 @@ To use this driver:
a) #define HAL_USE_TOUCHPAD TRUE a) #define HAL_USE_TOUCHPAD TRUE
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(LCDLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk include $(GFXLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk

4
drivers/touchpad/XPT2046/touchpad_lld.mk
View file

@ -1,6 +1,6 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/touchpad/XPT2046/touchpad_lld.c GFXSRC += $(GFXLIB)/drivers/touchpad/XPT2046/touchpad_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/touchpad/XPT2046 GFXINC += $(GFXLIB)/drivers/touchpad/XPT2046

11
lcd.mk
View file

@ -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

4
old/graph/graph.mk
View file

@ -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

4
old/gui/gui.mk
View file

@ -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

4
templates/gdispXXXXX/gdisp_lld.mk
View file

@ -1,5 +1,5 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/gdisp/gdispYOURDEVICE/gdisp_lld.c GFXSRC += $(GFXLIB)/drivers/gdisp/gdispYOURDEVICE/gdisp_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/gdisp/gdispYOURDEVICE GFXINC += $(GFXLIB)/drivers/gdisp/gdispYOURDEVICE

4
templates/touchpadXXXXX/touchpad_lld.mk
View file

@ -1,6 +1,6 @@
# List the required driver. # List the required driver.
LCDSRC += $(LCDLIB)/drivers/touchpad/touchpadYOURDEVICE/touchpad_lld.c GFXSRC += $(GFXLIB)/drivers/touchpad/touchpadYOURDEVICE/touchpad_lld.c
# Required include directories # Required include directories
LCDINC += $(LCDLIB)/drivers/touchpad/touchpadYOURDEVICE GFXINC += $(GFXLIB)/drivers/touchpad/touchpadYOURDEVICE