From afe7c13b8b81a2f26f4fa17f2502d5aa207356c7 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 19 Jun 2021 16:25:20 +0200
Subject: [PATCH] Fix conversion of input line name, curve names, and write
 radio.bin to disk early

Resolves #264
Resolves #255
---
 radio/src/storage/conversions/conversions.cpp         | 2 ++
 radio/src/storage/conversions/conversions_219_220.cpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/radio/src/storage/conversions/conversions.cpp b/radio/src/storage/conversions/conversions.cpp
index 34430cce6..0e474d1c4 100644
--- a/radio/src/storage/conversions/conversions.cpp
+++ b/radio/src/storage/conversions/conversions.cpp
@@ -71,6 +71,8 @@ void convertRadioData(int version)
 #if STORAGE_CONVERSIONS < 220
   if (version == 219) {
     convertRadioData_219_to_220(g_eeGeneral);
+    storageDirty(EE_GENERAL);
+    storageCheck(true);
   }
 #endif
   converted++;
diff --git a/radio/src/storage/conversions/conversions_219_220.cpp b/radio/src/storage/conversions/conversions_219_220.cpp
index 8c6d841f1..9fb21e390 100644
--- a/radio/src/storage/conversions/conversions_219_220.cpp
+++ b/radio/src/storage/conversions/conversions_219_220.cpp
@@ -109,7 +109,7 @@ void convertModelData_219_to_220(ModelData &model)
   convertToStr(model.header.name, LEN_MODEL_NAME_219);
 
   for (uint8_t i=0; i<MAX_TIMERS_219; i++) {
-    //TODO: convert to new timers v220
+    // convert to new timers v220
     TimerData& timer = newModel.timers[i];
     convertToStr(timer.name, LEN_TIMER_NAME_219);
 
@@ -153,7 +153,7 @@ void convertModelData_219_to_220(ModelData &model)
 
   // CurveHeader.name
   for (uint8_t i=0; i<MAX_CURVES_219; ++i) {
-    convertToStr(model.expoData[i].name, LEN_CURVE_NAME_219);
+    convertToStr(model.curves[i].name, LEN_CURVE_NAME_219);
   }
 
   // CustomFunctionData::play.name