From fb0df7d058df535948b427c03144289cd0302216 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 4 Jan 2015 15:58:33 +0100 Subject: [PATCH] Compilation error fixed --- companion/src/firmwares/opentx/opentxTaranisSimulator.cpp | 3 +-- .../src/firmwares/opentx/opentxTaranisX9ESimulator.cpp | 3 +-- radio/src/gui/Taranis/menu_model_logical_switches.cpp | 2 +- radio/src/myeeprom.h | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index ac52dd795..226ee53ba 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -55,7 +55,6 @@ #define HAPTIC #define REVPLUS #define OVERRIDE_CHANNEL_FUNCTION -#define NUM_POTS 5 #define FLAVOUR "taranis-plus" #undef min @@ -102,7 +101,7 @@ inline int geteepromsize() { #include "radio/src/gui/menu_model_flightmodes.cpp" #include "radio/src/gui/menu_model_inputs_mixes.cpp" #include "radio/src/gui/menu_model_curves.cpp" -#include "radio/src/gui/menu_model_logical_switches.cpp" +#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp" #include "radio/src/gui/menu_model_custom_functions.cpp" #include "radio/src/gui/menu_model_custom_scripts.cpp" #include "radio/src/gui/menu_model_gvars.cpp" diff --git a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp index 2b13260fe..505260ccc 100755 --- a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp @@ -56,7 +56,6 @@ #define REVPLUS #define REV9E #define OVERRIDE_CHANNEL_FUNCTION -#define NUM_POTS 5 #define FLAVOUR "taranis-x9e" #undef min @@ -105,7 +104,7 @@ inline int geteepromsize() { #include "radio/src/gui/menu_model_inputs_mixes.cpp" #include "radio/src/gui/menu_model_limits.cpp" #include "radio/src/gui/menu_model_curves.cpp" -#include "radio/src/gui/menu_model_logical_switches.cpp" +#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp" #include "radio/src/gui/menu_model_custom_functions.cpp" #include "radio/src/gui/menu_model_custom_scripts.cpp" #include "radio/src/gui/menu_model_gvars.cpp" diff --git a/radio/src/gui/Taranis/menu_model_logical_switches.cpp b/radio/src/gui/Taranis/menu_model_logical_switches.cpp index ff5ce1c3a..38124c3dc 100755 --- a/radio/src/gui/Taranis/menu_model_logical_switches.cpp +++ b/radio/src/gui/Taranis/menu_model_logical_switches.cpp @@ -33,7 +33,7 @@ * */ -#include "../opentx.h" +#include "../../opentx.h" enum LogicalSwitchFields { LS_FIELD_FUNCTION, diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 576d0355d..b78ab5803 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -118,11 +118,11 @@ #define MAX_INPUTS 32 #define NUM_TRAINER 16 #if defined(REV9E) - #define NUM_POTS 8 - #define NUM_XPOTS 4 + #define NUM_POTS 8 + #define NUM_XPOTS 4 #else - #define NUM_POTS 5 - #define NUM_XPOTS 3 + #define NUM_POTS 5 + #define NUM_XPOTS 3 #endif #elif defined(CPUARM) #define MAX_MODELS 60