Patch radio data version properly (just in case)

This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:04 +01:00
parent 4a5a0be38c
commit a7ee5f593d
2 changed files with 6 additions and 5 deletions
@@ -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<bin_storage_220::RadioData*>(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
+3 -3
View File
@@ -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);