MenuGeneral split - 2nd part

This commit is contained in:
bsongis
2014-12-15 20:39:06 +01:00
parent 62ca755d5b
commit 4394d18b13
19 changed files with 1132 additions and 864 deletions
+5 -1
View File
@@ -366,7 +366,7 @@ M2561_VARIANT = +16384
EEPROM_VARIANT = 0
GUIMODELSRC = gui/menu_model.cpp gui/menu_model_select.cpp gui/menu_model_setup.cpp gui/menu_model_inputs_mixes.cpp gui/menu_model_limits.cpp gui/menu_model_logical_switches.cpp gui/menu_model_custom_functions.cpp gui/menu_model_telemetry.cpp
GUIGENERALSRC = gui/menu_general.cpp gui/menu_general_setup.cpp
GUIGENERALSRC = gui/menu_general.cpp gui/menu_general_setup.cpp gui/menu_general_trainer.cpp gui/menu_general_version.cpp gui/menu_general_diagkeys.cpp gui/menu_general_diaganas.cpp gui/menu_general_calib.cpp
ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
# 9x/9xr radio
@@ -577,6 +577,7 @@ ifeq ($(PCB), GRUVIN9X)
ifeq ($(SDCARD), YES)
CPPDEFS += -DRTCLOCK
CPPSRC += rtc.cpp targets/gruvin9x/rtc_driver.cpp
GUIGENERALSRC += gui/menu_general_sdmanager.cpp
EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp
endif
@@ -618,6 +619,7 @@ ifeq ($(PCB), MEGA2560)
ifeq ($(SDCARD), YES)
EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp
CPPDEFS += -DRTCLOCK
GUIGENERALSRC += gui/menu_general_sdmanager.cpp
CPPSRC += rtc.cpp targets/gruvin9x/rtc_driver.cpp
endif
@@ -691,6 +693,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
ifeq ($(SDCARD), YES)
CPPDEFS += -DVOICE
INCDIRS += FatFs FatFs/option
GUIGENERALSRC += gui/menu_general_sdmanager.cpp
EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/sky9x/diskio.cpp
endif
ifeq ($(BUZZER), YES)
@@ -846,6 +849,7 @@ ifeq ($(PCB), TARANIS)
endif
ifeq ($(SDCARD), YES)
EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/taranis/diskio.cpp
GUIGENERALSRC += gui/menu_general_sdmanager.cpp
CPPDEFS += -DVOICE
INCDIRS += FatFs FatFs/option
endif