Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

Issue #193 fixed (curves names shifted)

Browse source
This commit is contained in:
Bertrand Songis 2014-01-10 15:57:25 +01:00
parent 7880d144f6
commit 96e1dcbcd8
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
radio/src/eeprom_conversions.cpp
View file

@ -131,6 +131,22 @@ PACK(typedef struct {
gvar_t gvars[5];
}) PhaseData_v215;
PACK(typedef struct {
FrSkyChannelData channels[2];
uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
uint8_t voltsSource;
uint8_t blades; // How many blades for RPMs, 0=2 blades, 1=3 blades
uint8_t currentSource;
uint8_t screensType;
FrSkyScreenData screens[MAX_FRSKY_SCREENS];
uint8_t varioSource;
int8_t varioCenterMax;
int8_t varioCenterMin;
int8_t varioMin;
int8_t varioMax;
FrSkyRSSIAlarm rssiAlarms[2];
}) FrSkyData_v215;
PACK(typedef struct {
ModelHeader header;
TimerData_v215 timers[MAX_TIMERS];
@ -164,7 +180,7 @@ PACK(typedef struct {
char gvar_names[5][LEN_GVAR_NAME];
TELEMETRY_DATA
FrSkyData_v215 frsky;
ROTARY_ENCODER_ARRAY_EXTRA
@ -427,7 +443,8 @@ void ConvertModel_215_to_216(ModelData &model)
for (uint8_t i=0; i<5; i++) {
memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
}
g_model.frsky = oldModel.frsky;
memcpy(&g_model.frsky, &oldModel.frsky, sizeof(oldModel.frsky));
#if defined(PCBTARANIS)
g_model.externalModule = oldModel.externalModule;