piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation error fixed

Browse Source
This commit is contained in:
bsongis
2015-01-04 15:58:33 +01:00
parent 1d7740ef4c
commit fb0df7d058
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+1 -2
View File
@@ -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"
companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
+1 -2
View File
@@ -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"
radio/src/gui/Taranis/menu_model_logical_switches.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
*
*/
#include "../opentx.h"
#include "../../opentx.h"
enum LogicalSwitchFields {
LS_FIELD_FUNCTION,
radio/src/myeeprom.h
+4 -4
View File
@@ -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