From f50a91ac709cc9de59aebee9f98b3715f2e59860 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 9 Jun 2021 08:05:36 +0200 Subject: [PATCH 1/2] Fix "wonky timer" --- .../conversions/conversions_219_220.cpp | 8 ++++++-- radio/src/tests/conversions.cpp | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/radio/src/storage/conversions/conversions_219_220.cpp b/radio/src/storage/conversions/conversions_219_220.cpp index 8743b2889..a865c6a8b 100644 --- a/radio/src/storage/conversions/conversions_219_220.cpp +++ b/radio/src/storage/conversions/conversions_219_220.cpp @@ -116,12 +116,16 @@ void convertModelData_219_to_220(ModelData &model) if (timer_219.mode >= TMRMODE_START) { timer_219.mode += 1; } - if (timer_219.mode < TMRMODE_COUNT) { + if (timer_219.mode < TMRMODE_COUNT + && timer_219.mode >=0) { timer.mode = timer_219.mode; } else { timer.mode = TMRMODE_START; - timer.swtch = timer_219.mode - (TMRMODE_COUNT - 1); + if (timer_219.mode > 0) + timer.swtch = timer_219.mode - (TMRMODE_COUNT - 1); + else + timer.swtch = timer_219.mode; } timer.start = timer_219.start; diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp index 6b5ff0dbc..87c8c5cc5 100644 --- a/radio/src/tests/conversions.cpp +++ b/radio/src/tests/conversions.cpp @@ -81,6 +81,24 @@ TEST(Conversions, ConversionX9DPFrom23) EXPECT_STRNEQ("abc.wav", g_model.customFn[1].play.name); } + +TEST(Conversions, ConversionX9DPFrom23_2) +{ + loadEEPROMFile(TESTS_PATH "/eeprom_23_x9d+2.bin"); + + eepromOpen(); + eeLoadGeneralSettingsData(); + convertRadioData_219_to_220(g_eeGeneral); + eeConvertModel(6, 219); + eeLoadModel(6); + + EXPECT_EQ(710, g_eeGeneral.calib[0].spanNeg); + EXPECT_EQ(944, g_eeGeneral.calib[0].mid); + EXPECT_EQ(770, g_eeGeneral.calib[0].spanPos); + + EXPECT_EQ(TMRMODE_START, g_model.timers[0].mode); // new! + EXPECT_EQ(-SWSRC_SA0, g_model.timers[0].swtch); // new! +} #endif // #if defined(PCBXLITE) && !defined(PCBXLITES) From 105e90b8d0c62c41809299f0ff9872af2e912293 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 9 Jun 2021 14:40:27 +0200 Subject: [PATCH 2/2] Added missing file for unit tests --- radio/src/tests/eeprom_23_x9d+2.bin | Bin 0 -> 32768 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 radio/src/tests/eeprom_23_x9d+2.bin diff --git a/radio/src/tests/eeprom_23_x9d+2.bin b/radio/src/tests/eeprom_23_x9d+2.bin new file mode 100644 index 0000000000000000000000000000000000000000..de18f24739f119f68c8156e8051594af84a87ad9 GIT binary patch literal 32768 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