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

VC++ compilation fixes

Browse Source
This commit is contained in:
Bertrand Songis
2014-10-24 20:50:29 +02:00
parent f8ace16258
commit 60fc8c11b6
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_conversions.cpp
+21 -17
View File
@@ -402,6 +402,26 @@ PACK(typedef struct {
}) ModelData_v215;
#if defined(PCBTARANIS)
#define MODELDATA_EXTRA_216 \
uint8_t externalModule; \
uint8_t trainerMode; \
ModuleData moduleData[NUM_MODULES+1]; \
char curveNames[MAX_CURVES][6]; \
ScriptData_v216 scriptsData[MAX_SCRIPTS]; \
char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; \
uint8_t nPotsToWarn; \
int8_t potPosition[NUM_POTS]; \
uint8_t spare[2];
#elif defined(PCBSKY9X)
#define MODELDATA_EXTRA_216 \
uint8_t externalModule; \
ModuleData moduleData[NUM_MODULES+1]; \
uint8_t nPotsToWarn; \
int8_t potPosition[NUM_POTS]; \
uint8_t rxBattAlarms[2];
#endif
PACK(typedef struct {
ModelHeader header;
TimerData_v216 timers[2];
@@ -441,23 +461,7 @@ PACK(typedef struct {
FrSkyData_v216 frsky;
#if defined(PCBTARANIS)
uint8_t externalModule;
uint8_t trainerMode;
ModuleData moduleData[NUM_MODULES+1];
char curveNames[MAX_CURVES][6];
ScriptData_v216 scriptsData[MAX_SCRIPTS];
char inputNames[MAX_INPUTS][LEN_INPUT_NAME];
uint8_t nPotsToWarn;
int8_t potPosition[NUM_POTS];
uint8_t spare[2];
#elif defined(PCBSKY9X)
uint8_t externalModule;
ModuleData moduleData[NUM_MODULES+1];
uint8_t nPotsToWarn;
int8_t potPosition[NUM_POTS];
uint8_t rxBattAlarms[2];
#endif
MODELDATA_EXTRA_216
}) ModelData_v216;