piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Conversion fixes

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-01 11:34:41 +02:00
parent 5247ab4a16
commit 9ac97ed5b8
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+2 -2
View File
@@ -610,14 +610,14 @@ PACK(struct ModelData {
NOBACKUP(FrSkyTelemetryData frsky);
NOBACKUP(RssiAlarmData rssiAlarms);
NOBACKUP(uint8_t spare:6);
NOBACKUP(uint8_t spare1:6);
NOBACKUP(uint8_t potsWarnMode:2);
ModuleData moduleData[NUM_MODULES];
ReceiverData receiverData[NUM_RECEIVERS];
int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
TrainerModuleData trainerData;
#if defined(PCBHORUS) || defined(PCBTARANIS)
#if defined(PCBHORUS) || defined(PCBTARANIS)
NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]);
#endif
radio/src/storage/conversions/conversions_218_219.cpp
+13 -2
View File
@@ -48,7 +48,12 @@ void convertModelData_218_to_219(ModelData &model)
TRACE("Model %s conversion from v218 to v219", name);
for (int i=0; i<NUM_MODULES; i++) {
memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], sizeof(ModuleData));
memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], 4);
memcpy(&newModel.moduleData[i] + 4, &oldModel.moduleData[i] + 64 + 4, 2);
if (newModel.moduleData[i].type >= MODULE_TYPE_XJT2)
newModel.moduleData[i].type += 1;
if (newModel.moduleData[i].type >= MODULE_TYPE_R9M2)
newModel.moduleData[i].type += 4;
}
for (uint8_t module=0; module<2; module++) {
@@ -66,13 +71,19 @@ void convertModelData_218_to_219(ModelData &model)
newModel.trainerData.delay = oldModel.moduleData[NUM_MODULES].ppm.delay;
newModel.trainerData.pulsePol = oldModel.moduleData[NUM_MODULES].ppm.pulsePol;
#if !defined(PCBSKY9X)
#if defined(PCBHORUS) || defined(PCBTARANIS)
memcpy(newModel.scriptsData, oldModel.scriptsData,
sizeof(newModel.scriptsData) +
sizeof(newModel.inputNames) +
sizeof(newModel.potsWarnEnabled) +
sizeof(newModel.potsWarnPosition) +
sizeof(oldModel.telemetrySensors));
#else
memcpy(newModel.inputNames, oldModel.inputNames,
sizeof(newModel.inputNames) +
sizeof(newModel.potsWarnEnabled) +
sizeof(newModel.potsWarnPosition) +
sizeof(oldModel.telemetrySensors));
#endif
#if defined(PCBX9E)