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

New UI merged

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/conversions/conversions_216_218.cpp
+4 -4
View File
@@ -919,8 +919,8 @@ void convertModelData_216_to_217(ModelData &model)
for (uint8_t i=0; i<2; i++) {
TimerData_v217 & timer = newModel.timers[i];
if (oldModel.timers[i].mode >= TMRMODE_COUNT)
timer.mode = TMRMODE_COUNT + convertSwitch_216_to_217(oldModel.timers[i].mode - TMRMODE_COUNT + 1) - 1;
if (oldModel.timers[i].mode >= 5)
timer.mode = 5 + convertSwitch_216_to_217(oldModel.timers[i].mode - 5 + 1) - 1;
else
timer.mode = convertSwitch_216_to_217(oldModel.timers[i].mode);
timer.start = oldModel.timers[i].start;
@@ -1088,8 +1088,8 @@ void convertModelData_217_to_218(ModelData &model)
newModel.header = oldModel.header;
for (uint8_t i=0; i<MAX_TIMERS; i++) {
if (oldModel.timers[i].mode >= TMRMODE_COUNT)
newModel.timers[i].mode = TMRMODE_COUNT + convertSwitch_217_to_218(oldModel.timers[i].mode - TMRMODE_COUNT + 1) - 1;
if (oldModel.timers[i].mode >= 5)
newModel.timers[i].mode = 5 + convertSwitch_217_to_218(oldModel.timers[i].mode - 5 + 1) - 1;
else
newModel.timers[i].mode = convertSwitch_217_to_218(oldModel.timers[i].mode);
if (oldModel.timers[i].mode)