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

[Taranis] EEPROM Conversions fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-04-28 18:59:36 +02:00
parent 9106ee581d
commit fe57faef74
1 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
radio/src/storage/eeprom_conversions.cpp
View file

@ -680,6 +680,16 @@ int ConvertSource_216_to_217(int source)
return source; return source;
} }
int ConvertSource_217_to_218(int source)
{
#if defined(PCBTARANIS)
if (source >= MIXSRC_FIRST_LOGICAL_SWITCH + 32)
source += 32;
#endif
return source;
}
int ConvertGVar_216_to_217(int value) int ConvertGVar_216_to_217(int value)
{ {
if (value < -4096 + 9) if (value < -4096 + 9)
@ -814,6 +824,7 @@ void ConvertRadioData_217_to_218(RadioData & settings)
settings.varioRepeat = settings_v217->varioRepeat; settings.varioRepeat = settings_v217->varioRepeat;
for (int i=0; i<NUM_CFN; i++) { for (int i=0; i<NUM_CFN; i++) {
CustomFunctionData_v216 & cf = settings_v217->customFn[i]; CustomFunctionData_v216 & cf = settings_v217->customFn[i];
settings.customFn[i].func = cf.func;
settings.customFn[i].swtch = ConvertSwitch_217_to_218(cf.swtch); settings.customFn[i].swtch = ConvertSwitch_217_to_218(cf.swtch);
memcpy(settings.customFn[i].play.name, settings_v217->customFn[i].play.name, sizeof(settings.customFn[i].play.name)); memcpy(settings.customFn[i].play.name, settings_v217->customFn[i].play.name, sizeof(settings.customFn[i].play.name));
settings.customFn[i].active = cf.active; settings.customFn[i].active = cf.active;
@ -958,7 +969,6 @@ void ConvertModel_216_to_217(ModelData & model)
sw.v3 = oldModel.logicalSw[i].v3; sw.v3 = oldModel.logicalSw[i].v3;
sw.delay = oldModel.logicalSw[i].delay; sw.delay = oldModel.logicalSw[i].delay;
sw.duration = oldModel.logicalSw[i].duration; sw.duration = oldModel.logicalSw[i].duration;
sw.andsw = oldModel.logicalSw[i].andsw;
uint8_t cstate = lswFamily(sw.func); uint8_t cstate = lswFamily(sw.func);
if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_COMP || cstate == LS_FAMILY_DIFF) { if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_COMP || cstate == LS_FAMILY_DIFF) {
sw.v1 = ConvertSource_216_to_217((uint8_t)sw.v1); sw.v1 = ConvertSource_216_to_217((uint8_t)sw.v1);
@ -1128,16 +1138,30 @@ void ConvertModel_217_to_218(ModelData & model)
newModel.curves[i] = oldModel.curves[i]; newModel.curves[i] = oldModel.curves[i];
#endif #endif
} }
memcpy(newModel.curves, oldModel.curves, sizeof(newModel.curves));
memcpy(newModel.points, oldModel.points, sizeof(newModel.points)); memcpy(newModel.points, oldModel.points, sizeof(newModel.points));
for (int i=0; i<32; i++) { for (int i=0; i<32; i++) {
newModel.logicalSw[i].func = oldModel.logicalSw[i].func; LogicalSwitchData & sw = newModel.logicalSw[i];
newModel.logicalSw[i].v1 = oldModel.logicalSw[i].v1; sw.func = oldModel.logicalSw[i].func;
newModel.logicalSw[i].v3 = oldModel.logicalSw[i].v3; sw.v1 = oldModel.logicalSw[i].v1;
sw.v2 = oldModel.logicalSw[i].v2;
sw.v3 = oldModel.logicalSw[i].v3;
newModel.logicalSw[i].andsw = ConvertSwitch_217_to_218(oldModel.logicalSw[i].andsw); newModel.logicalSw[i].andsw = ConvertSwitch_217_to_218(oldModel.logicalSw[i].andsw);
newModel.logicalSw[i].v2 = oldModel.logicalSw[i].v2; sw.delay = oldModel.logicalSw[i].delay;
newModel.logicalSw[i].delay = oldModel.logicalSw[i].delay; sw.duration = oldModel.logicalSw[i].duration;
newModel.logicalSw[i].duration = oldModel.logicalSw[i].duration; uint8_t cstate = lswFamily(sw.func);
if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_COMP || cstate == LS_FAMILY_DIFF) {
sw.v1 = ConvertSource_217_to_218((uint8_t)sw.v1);
if (cstate == LS_FAMILY_COMP) {
sw.v2 = ConvertSource_217_to_218((uint8_t)sw.v2);
}
}
else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
sw.v1 = ConvertSwitch_217_to_218(sw.v1);
sw.v2 = ConvertSwitch_217_to_218(sw.v2);
}
else if (cstate == LS_FAMILY_EDGE) {
sw.v1 = ConvertSwitch_217_to_218(sw.v1);
}
} }
for (int i=0; i<NUM_CFN; i++) { for (int i=0; i<NUM_CFN; i++) {
memcpy(&newModel.customFn[i], &oldModel.customFn[i], sizeof(CustomFunctionData)); memcpy(&newModel.customFn[i], &oldModel.customFn[i], sizeof(CustomFunctionData));