Merge pull request #2048 from opentx/projectkk2glider/issue_2009_timers_refactoring_for_next

Fixes #2009: Timer Voice minute call not working for persistent timers
This commit is contained in:
Bertrand Songis
2015-01-29 21:40:49 +01:00
25 changed files with 610 additions and 172 deletions
+1 -1
View File
@@ -954,7 +954,7 @@ ifeq ($(GUI), YES)
CPPDEFS += -DGUI
endif
CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC)
CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) timers.cpp
ifeq ($(GUI), YES)
GUISRC += gui/$(GUIDIRECTORY)/lcd.cpp gui/$(GUIDIRECTORY)/splash.cpp gui/$(GUIDIRECTORY)/fonts.cpp