From 5a727ed6d1a18faa1505d7fdcf2a3a87f24e5c6d Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Fri, 29 Oct 2021 09:18:20 +0200
Subject: [PATCH] Fix default model index

---
 radio/src/model_init.h              |  8 +++++++-
 radio/src/storage/eeprom_common.cpp |  2 +-
 radio/src/storage/sdcard_common.cpp |  4 +---
 radio/src/tests/gtests.h            |  2 +-
 radio/src/tests/mixer.cpp           | 16 ++++++++--------
 radio/src/tests/switches.cpp        |  4 ++--
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/radio/src/model_init.h b/radio/src/model_init.h
index 097485206..72a2bb7ff 100644
--- a/radio/src/model_init.h
+++ b/radio/src/model_init.h
@@ -24,5 +24,11 @@
 void clearInputs();
 void setDefaultInputs();
 
+#if defined(STORAGE_MODELSLIST)
+  #define DEFAULT_MODEL_IDX 1
+#else
+  #define DEFAULT_MODEL_IDX 0
+#endif
+
 // Reset the global model to full defaults
-void setModelDefaults(uint8_t id);
+void setModelDefaults(uint8_t id = DEFAULT_MODEL_IDX);
diff --git a/radio/src/storage/eeprom_common.cpp b/radio/src/storage/eeprom_common.cpp
index bcadc9dec..f48d37bc4 100644
--- a/radio/src/storage/eeprom_common.cpp
+++ b/radio/src/storage/eeprom_common.cpp
@@ -102,7 +102,7 @@ void storageEraseAll(bool warn)
   TRACE("storageEraseAll");
 
   generalDefault();
-  setModelDefaults(0);
+  setModelDefaults();
 
   if (warn) {
     ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
diff --git a/radio/src/storage/sdcard_common.cpp b/radio/src/storage/sdcard_common.cpp
index 563731d57..74455a71a 100644
--- a/radio/src/storage/sdcard_common.cpp
+++ b/radio/src/storage/sdcard_common.cpp
@@ -69,11 +69,9 @@ void storageFormat()
   sdCheckAndCreateDirectory(RADIO_PATH);
   sdCheckAndCreateDirectory(MODELS_PATH);
   generalDefault();
+  setModelDefaults();
 #if defined(STORAGE_MODELSLIST)
-  setModelDefaults(1);
   storageCreateModelsList();
-#else
-  setModelDefaults(0);
 #endif
 }
 
diff --git a/radio/src/tests/gtests.h b/radio/src/tests/gtests.h
index 178169a6a..794f0b3a5 100644
--- a/radio/src/tests/gtests.h
+++ b/radio/src/tests/gtests.h
@@ -106,7 +106,7 @@ class OpenTxTest : public testing::Test
       SYSTEM_RESET();
       MODEL_RESET();
       MIXER_RESET();
-      setModelDefaults(0);
+      setModelDefaults();
       RADIO_RESET();
     }
 };
diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 765f68aeb..fbb3cd569 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -467,7 +467,7 @@ TEST(Curves, LinearIntpol)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   for (int8_t i=-2; i<=2; i++) {
     g_model.points[2+i] = 50*i;
   }
@@ -673,7 +673,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_eeGeneral.templateSetup = 17;
   applyDefaultTemplate();
   g_model.thrTrim = 1;
@@ -686,7 +686,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_eeGeneral.templateSetup = 0;
   applyDefaultTemplate();
 }
@@ -697,7 +697,7 @@ TEST(Heli, BasicTest)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_model.swashR.collectiveSource = MIXSRC_Thr;
   g_model.swashR.elevatorSource = MIXSRC_Ele;
   g_model.swashR.aileronSource = MIXSRC_Ail;
@@ -729,7 +729,7 @@ TEST(Heli, Mode2Test)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_eeGeneral.templateSetup = 2;
   applyDefaultTemplate();
   g_model.swashR.collectiveSource = MIXSRC_Thr;
@@ -765,7 +765,7 @@ TEST(Trainer, UnpluggedTest)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_model.mixData[0].destCh = 0;
   g_model.mixData[0].mltpx = MLTPX_ADD;
   g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
@@ -782,7 +782,7 @@ TEST_F(MixerTest, flightModeTransition)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
   g_model.flightModeData[0].fadeIn = 100;
   g_model.flightModeData[0].fadeOut = 100;
@@ -808,7 +808,7 @@ TEST_F(MixerTest, flightModeOverflow)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
   g_model.flightModeData[0].fadeIn = 100;
   g_model.flightModeData[0].fadeOut = 100;
diff --git a/radio/src/tests/switches.cpp b/radio/src/tests/switches.cpp
index de0a02946..c8cf0388f 100644
--- a/radio/src/tests/switches.cpp
+++ b/radio/src/tests/switches.cpp
@@ -78,7 +78,7 @@ TEST(getSwitch, nullSW)
 TEST(getSwitch, inputWithTrim)
 {
   MODEL_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   MIXER_RESET();
 
   // g_model.logicalSw[0] = { LS_FUNC_VPOS, MIXSRC_FIRST_INPUT, 0, 0 };
@@ -100,7 +100,7 @@ TEST(evalLogicalSwitches, playFile)
 {
   SYSTEM_RESET();
   MODEL_RESET();
-  setModelDefaults(0);
+  setModelDefaults();
   MIXER_RESET();
 
   extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles;