Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

MSVC errors

Browse source
This commit is contained in:
Bertrand Songis 2016-03-05 08:59:28 +01:00
parent 15912854e8
commit 863272bc52
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/datastructs.h
View file

@ -350,6 +350,12 @@ PACK(struct CustomFunctionData {
typedef int16_t gvar_t;
#if MAX_ROTARY_ENCODERS > 0
#define FLIGHT_MODE_ROTARY_ENCODERS_FIELD int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
#else
#define FLIGHT_MODE_ROTARY_ENCODERS_FIELD
#endif
#if defined(CPUARM)
PACK(struct FlightModeData {
trim_t trim[4];
@ -358,7 +364,7 @@ PACK(struct FlightModeData {
int16_t spare:7;
uint8_t fadeIn;
uint8_t fadeOut;
int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
FLIGHT_MODE_ROTARY_ENCODERS_FIELD
gvar_t gvars[MAX_GVARS];
});
#elif !defined(PCBSTD)
@ -368,7 +374,7 @@ PACK(struct FlightModeData {
NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]);
uint8_t fadeIn:4;
uint8_t fadeOut:4;
int16_t rotaryEncoders[MAX_ROTARY_ENCODERS];
FLIGHT_MODE_ROTARY_ENCODERS_FIELD
gvar_t gvars[MAX_GVARS];
});
#else