diff --git a/src/myeeprom.h b/src/myeeprom.h index 60238e09d..34347e299 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -274,12 +274,12 @@ PACK(typedef struct t_ScriptData { TRAINER_MODULE }; #define MODELDATA_BITMAP char bitmap[LEN_BITMAP_NAME]; - #define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; + #define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; #define LIMITDATA_EXTRA char name[LEN_CHANNEL_NAME]; int8_t curve; #define swstate_t uint16_t #elif defined(PCBSKY9X) #define MODELDATA_BITMAP - #define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; + #define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; #define LIMITDATA_EXTRA #define swstate_t uint8_t #else @@ -988,6 +988,8 @@ PACK(typedef struct t_FrSkyData { FrSkyRSSIAlarm rssiAlarms[2]; uint16_t mAhPersistent:1; uint16_t storedMah:15; + int8_t fasOffset:5; + uint8_t spare:3; }) FrSkyData; #else #define MAX_FRSKY_SCREENS 2 @@ -1005,6 +1007,8 @@ PACK(typedef struct t_FrSkyData { int8_t varioCenterMin:5; uint8_t currentSource:3; int8_t varioCenterMax:5; + int8_t fasOffset:5; + uint8_t spare:3; }) FrSkyData; #endif @@ -1415,7 +1419,11 @@ PACK(typedef struct t_ModelData { int8_t ppmNCH:4; /* spare on ARM */ uint8_t trimInc:3; // Trim Increments uint8_t disableThrottleWarning:1; - uint8_t pulsePol:1; /* spare on ARM */ +#if defined (CPUARM) + uint8_t displayText:1; +#else + uint8_t pulsePol:1; /* unused on ARM */ +#endif uint8_t extendedLimits:1; uint8_t extendedTrims:1; uint8_t throttleReversed:1; @@ -1437,6 +1445,7 @@ PACK(typedef struct t_ModelData { uint8_t thrTraceSrc; swstate_t switchWarningStates; + uint8_t nSwToWarn; MODEL_GVARS_DATA