Support of current EEPROM inside Companion. Some more code around

EEPROMS export removed (needed to be fixed, so I preferred to remove in
the same commit).
This commit is contained in:
Bertrand Songis
2014-01-07 17:57:42 +01:00
parent 5d3c827488
commit 3b59d07724
48 changed files with 938 additions and 7439 deletions
+19 -18
View File
@@ -56,11 +56,11 @@
#elif defined(PCBSKY9X)
#define EEPROM_VER 216
#elif defined(CPUM2560) || defined(CPUM2561)
#define EEPROM_VER 215
#define EEPROM_VER 216
#elif defined(CPUM128)
#define EEPROM_VER 216
#else
#define EEPROM_VER 214
#define EEPROM_VER 216
#endif
#ifndef PACK
@@ -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]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
#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 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]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
#define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES];
#define LIMITDATA_EXTRA
#define swstate_t uint8_t
#else
@@ -397,7 +397,7 @@ PACK(typedef struct t_ExpoData {
char name[LEN_EXPOMIX_NAME];
int8_t offset;
CurveRef curve;
uint8_t spare[2];
uint8_t spare;
}) ExpoData;
#define MIN_EXPO_WEIGHT -100
#define EXPO_VALID(ed) ((ed)->srcRaw)
@@ -508,7 +508,7 @@ PACK(typedef struct t_MixData {
uint8_t srcRaw;
int16_t offset;
char name[LEN_EXPOMIX_NAME];
uint8_t spare[2];
uint8_t spare;
}) MixData;
#else
PACK(typedef struct t_MixData {
@@ -988,8 +988,7 @@ PACK(typedef struct t_FrSkyData {
FrSkyRSSIAlarm rssiAlarms[2];
uint16_t mAhPersistent:1;
uint16_t storedMah:15;
int8_t fasOffset:5;
uint8_t spare:3;
int8_t fasOffset;
}) FrSkyData;
#else
#define MAX_FRSKY_SCREENS 2
@@ -1007,8 +1006,7 @@ 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;
int8_t fasOffset;
}) FrSkyData;
#endif
@@ -1412,24 +1410,28 @@ PACK(typedef struct t_ModelHeader {
}) ModelHeader;
#if defined (CPUARM)
#define ARM_OR_AVR(x, y) x
#define ARM_FIELD(x) x;
#define AVR_FIELD(x)
#else
#define ARM_OR_AVR(x, y) y
#define ARM_FIELD(x)
#define AVR_FIELD(x) x;
#endif
PACK(typedef struct t_ModelData {
ModelHeader header;
TimerData timers[MAX_TIMERS];
uint8_t protocol:3;
uint8_t protocol:3; // not used on Taranis
uint8_t thrTrim:1; // Enable Throttle Trim
int8_t ppmNCH:4; /* spare on ARM */
AVR_FIELD(int8_t ppmNCH:4)
ARM_FIELD(int8_t spare2:4)
uint8_t trimInc:3; // Trim Increments
uint8_t disableThrottleWarning:1;
uint8_t ARM_OR_AVR(displayText, pulsePol):1;
ARM_FIELD(uint8_t displayText:1)
AVR_FIELD(uint8_t pulsePol:1)
uint8_t extendedLimits:1;
uint8_t extendedTrims:1;
uint8_t throttleReversed:1;
int8_t ppmDelay; /* spare on ARM */
AVR_FIELD(int8_t ppmDelay)
BeepANACenter beepANACenter; // 1<<0->A1.. 1<<6->A7
MixData mixData[MAX_MIXERS];
LimitData limitData[NUM_CHNOUT];
@@ -1443,11 +1445,10 @@ PACK(typedef struct t_ModelData {
SwashRingData swashR;
PhaseData phaseData[MAX_PHASES];
int8_t ppmFrameLength; // 0=22.5ms (10ms-30ms) 0.5ms increments
AVR_FIELD(int8_t ppmFrameLength) // 0=22.5ms (10ms-30ms) 0.5ms increments
uint8_t thrTraceSrc;
swstate_t switchWarningStates;
uint8_t nSwToWarn;
MODEL_GVARS_DATA