diff --git a/radio/src/storage/conversions/conversions_220_221.cpp b/radio/src/storage/conversions/conversions_220_221.cpp index 4a2693b88..5b02a5cd6 100644 --- a/radio/src/storage/conversions/conversions_220_221.cpp +++ b/radio/src/storage/conversions/conversions_220_221.cpp @@ -119,9 +119,10 @@ const char* convertModelData_220_to_221(const char* path) patchModelData); } -static void patchCurrentModelFilename(uint8_t* data) +static void patchRadioData(uint8_t* data) { auto rd = reinterpret_cast(data); + rd->version = 221; patchFilenameToYaml(rd->currModelFilename); } @@ -130,7 +131,7 @@ const char* convertRadioData_220_to_221(const char* path) constexpr unsigned rd_size = sizeof(bin_storage_220::RadioData); return convertData_220_to_221(path, rd_size, yaml_conv_220::get_radiodata_nodes(), - patchCurrentModelFilename); + patchRadioData); } #else diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp index 530ae81b8..d948a5a78 100644 --- a/radio/src/tests/conversions.cpp +++ b/radio/src/tests/conversions.cpp @@ -287,7 +287,7 @@ TEST(Conversions, ConversionX10From23) convertBinModelData(modelname, 219); loadModel(modelname); - EXPECT_EQ(220, g_eeGeneral.version); // TODO: 221? + EXPECT_EQ(221, g_eeGeneral.version); EXPECT_EQ(100, g_eeGeneral.calib[9].spanNeg); EXPECT_EQ(500, g_eeGeneral.calib[9].mid); @@ -361,7 +361,7 @@ TEST(Conversions, ConversionX12SFrom23) convertBinModelData(modelname, 219); loadModel(modelname); - EXPECT_EQ(220, g_eeGeneral.version); // TODO: 221? + EXPECT_EQ(221, g_eeGeneral.version); EXPECT_EQ(-30, g_eeGeneral.vBatMin); EXPECT_EQ(8, g_eeGeneral.speakerVolume); EXPECT_STRNEQ("en", g_eeGeneral.ttsLanguage); @@ -426,7 +426,7 @@ TEST(Conversions, ConversionTX16SFrom25) convertBinModelData(modelname, 220); loadModel(modelname); - EXPECT_EQ(220, g_eeGeneral.version); // TODO: 221? + EXPECT_EQ(221, g_eeGeneral.version); EXPECT_EQ(-23, g_eeGeneral.vBatMin); EXPECT_EQ(0, g_eeGeneral.speakerVolume); EXPECT_STRNEQ("en", g_eeGeneral.ttsLanguage);