Merge pull request #2325 from opentx/jivarofad/M2560

LCD driver for stock and M2560
This commit is contained in:
Bertrand Songis
2015-05-21 19:07:01 +02:00
8 changed files with 190 additions and 130 deletions
+13 -7
View File
@@ -57,6 +57,10 @@ PCB = 9X
# PCB revision
PCBREV =
# LCD
# Values: DEFAULT, ST7565P, ST7565R, ERC12864FSF, ST7920
LCD = DEFAULT
# Enable JETI-Telemetry or FrSky Telemetry reception on UART0
# For this option you need to modify your hardware!
# More information at [insertURLhere]
@@ -696,13 +700,7 @@ ifeq ($(PCB), MEGA2560)
BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp
# LCD driver
# Values: ST7565P(default), ST7565R
LCD = ST7565P
ifeq ($(LCD), ST7565R)
CPPDEFS += -DLCD_ST7565R
endif
EXTRABOARDSRC = targets/common_avr/adc_driver.cpp targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
EXTRABOARDSRC = targets/common_avr/adc_driver.cpp targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
ifeq ($(SDCARD), YES)
EXTRABOARDSRC += $(FATFSDIR)/ff.c $(FATFSDIR)/fattime.c $(FATFSDIR)/option/ccsbcs.c targets/gruvin9x/diskio.cpp
@@ -1087,6 +1085,14 @@ ifeq ($(TURNIGY_TRANSMITTER_FIX), YES)
endif
endif
ifeq ($(LCD), ST7565R)
CPPDEFS += -DLCD_ST7565R
else ifeq ($(LCD), ERC12864FSF)
CPPDEFS += -DLCD_ERC12864FSF
else ifeq ($(LCD), ST7920)
CPPDEFS += -DLCD_ST7920
endif
ifeq ($(AUTOSWITCH), YES)
CPPDEFS += -DAUTOSWITCH
endif