Fixed timer conversion

radio/src/storage/conversions/conversions_219_220.cpp

@@ -48,6 +48,20 @@
 //    NOBACKUP(char name[LEN_TIMER_NAME]);
 //  });
 //
+//  enum TimerModes {
+// -  TMRMODE_NONE,// ->OFF
+// -  TMRMODE_ABS, // ->ON
+// +  TMRMODE_OFF,
+// +  TMRMODE_ON,
+// +  TMRMODE_START, // 2 -> +1
+//    TMRMODE_THR,
+//    TMRMODE_THR_REL,
+// -  TMRMODE_THR_TRG, // ->START
+// -  TMRMODE_COUNT
+// +  TMRMODE_THR_START,
+// +  TMRMODE_COUNT,
+// +  TMRMODE_MAX = TMRMODE_COUNT - 1
+//  };
 //
 // COLORLCD:
 // =========
@@ -94,6 +108,24 @@ void convertModelData_219_to_220(ModelData &model)
     //TODO: convert to new timers v220
     TimerData& timer = newModel.timers[i];
     convertToStr(timer.name, LEN_TIMER_NAME_219);
+
+    TimerData_v219& timer_219 = *(TimerData_v219*)(&oldModel.timers[i]);
+
+    // Convert mode
+
+    if (timer_219.mode >= TMRMODE_START) {
+      timer_219.mode += 1;
+    }
+    if (timer_219.mode < TMRMODE_COUNT) {
+      timer.mode = timer_219.mode;
+    }
+    else {
+      timer.mode = TMRMODE_START;
+      timer.swtch = timer_219.mode - (TMRMODE_COUNT - 1);
+    }
+
+    timer.start = timer_219.start;
+    
   }
 
   // MixData::name
@@ -117,6 +149,12 @@ void convertModelData_219_to_220(ModelData &model)
   }
 
   // CustomFunctionData::play.name
+  // for (uint8_t i = 0; i < MAX_SPECIAL_FUNCTIONS_219; ++i) {
+  //   CustomFunctionData* cfn = &(model.customFn[i]);
+  //   if (cfn->func == FUNC_PLAY_TRACK || cfn->func == FUNC_BACKGND_MUSIC) {
+  //     convertToStr(cfn->play.name, LEN_FUNCTION_NAME_219);
+  //   }
+  // }
 
   // GVarData::name ?
   for (uint8_t i=0; i<MAX_GVARS_219; ++i) {

radio/src/tests/conversions.cpp

@@ -54,7 +54,8 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_EQ(SWITCH_3POS, SWITCH_CONFIG(0));
 
   EXPECT_STREQ("Test", g_model.header.name); // ZSTREQ
-  EXPECT_EQ(TMRMODE_COUNT - 1 + SWSRC_SA0, g_model.timers[0].mode); // new!
+  EXPECT_EQ(TMRMODE_START, g_model.timers[0].mode); // new!
+  EXPECT_EQ(SWSRC_SA0, g_model.timers[0].swtch); // new!
   EXPECT_EQ(80, g_model.mixData[0].weight);
   EXPECT_EQ(-100, g_model.limitData[0].max); // 90.0
   EXPECT_EQ(80, g_model.expoData[0].weight);