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

Conversions fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-03-19 14:18:27 +01:00
parent d0c6f6b9b7
commit 9831853050
2 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/conversions/CMakeLists.txt
+22 -2
View File
@@ -1,9 +1,29 @@
if(NOT PCB STREQUAL X3)
add_definitions(-DEEPROM_CONVERSIONS)
if(PCB STREQUAL X9D OR PCB STREQUAL X9DP OR PCB STREQUAL SKY9X)
set(EEPROM_CONVERSIONS 216)
endif()
if(PCB STREQUAL X12S OR PCB STREQUAL X10 OR PCB STREQUAL X7 OR PCB STREQUAL XLITE)
set(EEPROM_CONVERSIONS 218)
endif()
if(EEPROM_CONVERSIONS)
add_definitions(-DEEPROM_CONVERSIONS=${EEPROM_CONVERSIONS})
set(SRC
${SRC}
storage/conversions/conversions.cpp
)
endif()
if(EEPROM_CONVERSIONS GREATER 215)
set(SRC
${SRC}
storage/conversions/conversions_216_218.cpp
)
endif()
if(EEPROM_CONVERSIONS GREATER 217)
set(SRC
${SRC}
storage/conversions/conversions_218_219.cpp
)
endif()
radio/src/storage/conversions/conversions.cpp
+32 -8
View File
@@ -25,20 +25,26 @@ void convertModelData(int id, int version)
{
eeLoadModelData(id);
#if EEPROM_CONVERSIONS >= 216
if (version == 216) {
version = 217;
convertModelData_216_to_217(g_model);
}
#endif
#if EEPROM_CONVERSIONS >= 217
if (version == 217) {
version = 218;
convertModelData_217_to_218(g_model);
}
#endif
#if EEPROM_CONVERSIONS >= 218
if (version == 218) {
version = 219;
convertModelData_218_to_219(g_model);
}
#endif
uint8_t currModel = g_eeGeneral.currModel;
g_eeGeneral.currModel = id;
@@ -51,14 +57,18 @@ bool eeConvert()
{
const char *msg = NULL;
if (g_eeGeneral.version == 216) {
msg = "EEprom Data v216";
}
else if (g_eeGeneral.version == 217) {
msg = "EEprom Data v217";
}
else {
return false;
switch (g_eeGeneral.version) {
case 216:
msg = "EEprom Data v216";
break;
case 217:
msg = "EEprom Data v217";
break;
case 218:
msg = "EEprom Data v218";
break;
default:
return false;
}
int conversionVersionStart = g_eeGeneral.version;
@@ -78,14 +88,28 @@ bool eeConvert()
// General Settings conversion
eeLoadGeneralSettingsData();
int version = conversionVersionStart;
#if EEPROM_CONVERSIONS >= 216
if (version == 216) {
version = 217;
convertRadioData_216_to_217(g_eeGeneral);
}
#endif
#if EEPROM_CONVERSIONS >= 217
if (version == 217) {
version = 218;
convertRadioData_217_to_218(g_eeGeneral);
}
#endif
#if EEPROM_CONVERSIONS >= 218
if (version == 218) {
version = 219;
// no conversion needed for now
}
#endif
storageDirty(EE_GENERAL);
storageCheck(true);