From c615a35e147a6693d9394e2f366bba1a45a91d28 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 22 Jan 2015 07:19:27 +0100 Subject: [PATCH] #define of GUI forgotten in Makefile and Companion --- companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp | 1 + companion/src/firmwares/opentx/opentxM128simulator.cpp | 1 + companion/src/firmwares/opentx/opentxM64simulator.cpp | 1 + companion/src/firmwares/opentx/opentxSky9xsimulator.cpp | 1 + companion/src/firmwares/opentx/opentxTaranisSimulator.cpp | 1 + companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp | 1 + radio/src/Makefile | 1 + 7 files changed, 7 insertions(+) diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp index bdc196ebe..e1cc45fbb 100644 --- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp +++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp @@ -22,6 +22,7 @@ #define SIMU_EXCEPTIONS #define PCBGRUVIN9X #define CPUM2560 +#define GUI #define ROTARY_ENCODERS 2 #define HELI #define TEMPLATES diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp index feff71e20..c7ff8a680 100644 --- a/companion/src/firmwares/opentx/opentxM128simulator.cpp +++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp @@ -22,6 +22,7 @@ #define SIMU_EXCEPTIONS #define PCBSTD #define CPUM128 +#define GUI #define HELI #define TEMPLATES #define SPLASH diff --git a/companion/src/firmwares/opentx/opentxM64simulator.cpp b/companion/src/firmwares/opentx/opentxM64simulator.cpp index 92ed798f5..a37cf3bc0 100644 --- a/companion/src/firmwares/opentx/opentxM64simulator.cpp +++ b/companion/src/firmwares/opentx/opentxM64simulator.cpp @@ -23,6 +23,7 @@ #define SIMU_EXCEPTIONS #define PCBSTD #define CPUM64 +#define GUI #define SPLASH #define FLIGHT_MODES #define PPM_UNIT_PERCENT_PREC1 diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp index 5b588fe51..004ff68f9 100644 --- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp +++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp @@ -22,6 +22,7 @@ #define SIMU_EXCEPTIONS #define PCBSKY9X #define CPUARM +#define GUI #define REVB #define ROTARY_ENCODERS 1 #define HELI diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index b9bd3e670..aaa72c240 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -22,6 +22,7 @@ #define SIMU_EXCEPTIONS #define PCBTARANIS #define CPUARM +#define GUI #define HELI #define SPLASH #define FLIGHT_MODES diff --git a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp index 7e6dd84aa..e41c38c50 100755 --- a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp @@ -22,6 +22,7 @@ #define SIMU_EXCEPTIONS #define PCBTARANIS #define CPUARM +#define GUI #define HELI #define SPLASH #define FLIGHT_MODES diff --git a/radio/src/Makefile b/radio/src/Makefile index da7ae5b4d..f318956e4 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -951,6 +951,7 @@ endif ifeq ($(GUI), YES) GUISRC = gui/$(GUIDIRECTORY)/helpers.cpp gui/$(GUIDIRECTORY)/navigation.cpp gui/$(GUIDIRECTORY)/popups.cpp gui/$(GUIDIRECTORY)/widgets.cpp gui/$(GUIDIRECTORY)/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/$(GUIDIRECTORY)/view_main.cpp gui/$(GUIDIRECTORY)/view_statistics.cpp + CPPDEFS += -DGUI endif CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC)