[stock / M128] Issue 193 fixed (PWM_BACKLIGHT option added)

[ARM] No SD support after a Tx reboot on ARM flavors
[all] Issue 194 fixed (negative GVARS - on all boards!)
[all] Vario small change on center high limit
This commit is contained in:
bsongis
2013-02-06 20:27:31 +00:00
parent 46da62bf05
commit 2eed4e35a2
18 changed files with 308 additions and 131 deletions
+21 -3
View File
@@ -103,6 +103,10 @@ HAPTIC = NO
# Values = YES, NO
SP22 = NO
# Fade Backlight using PWM
# Values = YES, NO
PWM_BACKLIGHT = NO
# SPLASH on START
# Values = YES, NO, FIXED
SPLASH = YES
@@ -611,6 +615,13 @@ ifeq ($(PCB), STD128)
CPPDEFS += -DAUDIO
CPPSRC += audio_avr.cpp
else
ifeq ($(PWM_BACKLIGHT), YES)
ifeq ($(VOICE), YES)
$(error Sorry, PWM_BACKLIGHT doesnt work on Mainboards with VOICE mod.)
else
CPPDEFS += -DPWM_BACKLIGHT
endif
endif
CPPSRC += beeper.cpp
endif
@@ -638,19 +649,26 @@ ifeq ($(PCB), STD)
EXTRABOARDSRC += stock/lcd_driver.cpp
EEPROMSRC = eeprom_avr.cpp
PULSESSRC = pulses_avr.cpp
ifeq ($(AUDIO), YES)
CPPDEFS += -DAUDIO
CPPSRC += audio_avr.cpp
else
ifeq ($(PWM_BACKLIGHT), YES)
ifeq ($(VOICE), YES)
$(error Sorry, PWM_BACKLIGHT doesnt work on Mainboards with VOICE mod.)
else
CPPDEFS += -DPWM_BACKLIGHT
endif
endif
CPPSRC += beeper.cpp
endif
ifeq ($(VOICE), YES)
CPPSRC += stock/voice.cpp
CPPDEFS += -DVOICE
endif
ifeq ($(HAPTIC), YES)
CPPDEFS += -DHAPTIC
CPPSRC += haptic.cpp