From 2f5dd1d4e30aa462b3991bf1dda6be99d707b854 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Fri, 9 Apr 2021 15:10:11 +0200
Subject: [PATCH] modelDefault() becomes setModelDefaults()

---
 radio/src/lua/api_model.cpp         |  3 ++-
 radio/src/model_init.cpp            | 23 ++++++++++++-----------
 radio/src/opentx.h                  |  7 -------
 radio/src/storage/eeprom_common.cpp |  5 +++--
 radio/src/storage/sdcard_common.cpp |  3 ++-
 radio/src/tests/gtests.h            |  2 +-
 radio/src/tests/mixer.cpp           | 16 ++++++++--------
 radio/src/tests/switches.cpp        |  4 ++--
 8 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/radio/src/lua/api_model.cpp b/radio/src/lua/api_model.cpp
index 20860a969..76800d842 100644
--- a/radio/src/lua/api_model.cpp
+++ b/radio/src/lua/api_model.cpp
@@ -23,6 +23,7 @@
 #include "opentx.h"
 #include "lua_api.h"
 #include "timers.h"
+#include "model_init.h"
 
 /*luadoc
 @function model.getInfo()
@@ -665,7 +666,7 @@ Set all inputs to defaults
 static int luaModelDefaultInputs(lua_State *L)
 {
   clearInputs();
-  defaultInputs();
+  setDefaultInputs();
   return 0;
 }
 
diff --git a/radio/src/model_init.cpp b/radio/src/model_init.cpp
index 68c585b50..1a4b8ce2e 100644
--- a/radio/src/model_init.cpp
+++ b/radio/src/model_init.cpp
@@ -25,7 +25,7 @@ void clearInputs()
   memset(g_model.expoData, 0, sizeof(g_model.expoData));
 }
 
-void defaultInputs()
+void setDefaultInputs()
 {
   for (int i=0; i<NUM_STICKS; i++) {
     uint8_t stick_index = channelOrder(i+1);
@@ -50,7 +50,7 @@ void clearMixes()
   memset(g_model.mixData, 0, sizeof(g_model.mixData));
 }
 
-void defaultMixes()
+void setDefaultMixes()
 {
   for (int i=0; i<NUM_STICKS; i++) {
     MixData * mix = mixAddress(i);
@@ -61,12 +61,12 @@ void defaultMixes()
   storageDirty(EE_MODEL);
 }
 
-void defaultModelRegistrationID()
+void setDefaultModelRegistrationID()
 {
   memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID);
 }
 
-void defaultGVars()
+void setDefaultGVars()
 {
 #if defined(FLIGHT_MODES) && defined(GVARS)
   for (int fmIdx = 1; fmIdx < MAX_FLIGHT_MODES; fmIdx++) {
@@ -107,11 +107,11 @@ void setVendorSpecificModelDefaults()
 
 void applyDefaultTemplate()
 {
-  defaultInputs();
-  defaultMixes();
-  defaultGVars();
+  setDefaultInputs();
+  setDefaultMixes();
+  setDefaultGVars();
 
-  defaultModelRegistrationID();
+  setDefaultModelRegistrationID();
 
 #if defined(COLORLCD)
   //TODO: not sure yet we need it here
@@ -124,15 +124,16 @@ void applyDefaultTemplate()
 #endif
 
   // TODO: what about switch warnings in non-color LCD radios?
-
-  setVendorSpecificModelDefaults();
 }
 
 
-void modelDefault(uint8_t id)
+void setModelDefaults(uint8_t id)
 {
   memset(&g_model, 0, sizeof(g_model));
   applyDefaultTemplate();
+  
+  setVendorSpecificModelDefaults();
+
   strAppendUnsigned(strAppend(g_model.header.name, STR_MODEL), id + 1, 2);
 
 #if defined(LUA) && defined(PCBTARANIS) // Horus uses menuModelWizard() for wizard
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index caccd0951..dbbd9eec8 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -665,7 +665,6 @@ inline void resumeMixerCalculations()
 
 void setDefaultOwnerId();
 void generalDefault();
-void modelDefault(uint8_t id);
 
 uint32_t hash(const void * ptr, uint32_t size);
 
@@ -781,12 +780,6 @@ inline void getGVarIncDecRange(int16_t & valMin, int16_t & valMax)
 }
 #endif
 
-
-
-
-void clearInputs();
-void defaultInputs();
-
 void applyExpos(int16_t * anas, uint8_t mode, uint8_t ovwrIdx=0, int16_t ovwrValue=0);
 int16_t applyLimits(uint8_t channel, int32_t value);
 
diff --git a/radio/src/storage/eeprom_common.cpp b/radio/src/storage/eeprom_common.cpp
index 7ade6f98a..bd8138b6b 100644
--- a/radio/src/storage/eeprom_common.cpp
+++ b/radio/src/storage/eeprom_common.cpp
@@ -23,6 +23,7 @@
 #include <string.h>
 #include "opentx.h"
 #include "timers.h"
+#include "model_init.h"
 
 void eeLoadModel(uint8_t index)
 {
@@ -45,7 +46,7 @@ void eeLoadModel(uint8_t index)
 
     bool alarms = true;
     if (size < EEPROM_MIN_MODEL_SIZE) { // if not loaded a fair amount
-      modelDefault(index) ;
+      setModelDefaults(index);
       storageCheck(true);
       alarms = false;
     }
@@ -131,7 +132,7 @@ void storageEraseAll(bool warn)
   TRACE("storageEraseAll");
 
   generalDefault();
-  modelDefault(0);
+  setModelDefault(0);
 
   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 7f6de2550..7abdfdded 100644
--- a/radio/src/storage/sdcard_common.cpp
+++ b/radio/src/storage/sdcard_common.cpp
@@ -23,6 +23,7 @@
 #include "sdcard_common.h"
 #include "modelslist.h"
 #include "conversions/conversions.h"
+#include "model_init.h"
 
 // defined either in sdcard_raw.cpp or sdcard_yaml.cpp
 void storageCreateModelsList();
@@ -92,7 +93,7 @@ const char * createModel()
 
   int index = findNextFileIndex(filename, LEN_MODEL_FILENAME, MODELS_PATH);
   if (index > 0) {
-    modelDefault(index);
+    setModelDefaults(index);
     memcpy(g_eeGeneral.currModelFilename, filename, sizeof(g_eeGeneral.currModelFilename));
     storageDirty(EE_GENERAL);
     storageDirty(EE_MODEL);
diff --git a/radio/src/tests/gtests.h b/radio/src/tests/gtests.h
index 55218bbc5..7a95d6688 100644
--- a/radio/src/tests/gtests.h
+++ b/radio/src/tests/gtests.h
@@ -104,7 +104,7 @@ class OpenTxTest : public testing::Test
       SYSTEM_RESET();
       MODEL_RESET();
       MIXER_RESET();
-      modelDefault(0);
+      setModelDefaults(0);
       RADIO_RESET();
     }
 };
diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index 080155d80..5bb972dc9 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -466,7 +466,7 @@ TEST(Curves, LinearIntpol)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   for (int8_t i=-2; i<=2; i++) {
     g_model.points[2+i] = 50*i;
   }
@@ -672,7 +672,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_eeGeneral.templateSetup = 17;
   applyDefaultTemplate();
   g_model.thrTrim = 1;
@@ -685,7 +685,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_eeGeneral.templateSetup = 0;
   applyDefaultTemplate();
 }
@@ -696,7 +696,7 @@ TEST(Heli, BasicTest)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_model.swashR.collectiveSource = MIXSRC_Thr;
   g_model.swashR.elevatorSource = MIXSRC_Ele;
   g_model.swashR.aileronSource = MIXSRC_Ail;
@@ -728,7 +728,7 @@ TEST(Heli, Mode2Test)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_eeGeneral.templateSetup = 2;
   applyDefaultTemplate();
   g_model.swashR.collectiveSource = MIXSRC_Thr;
@@ -764,7 +764,7 @@ TEST(Trainer, UnpluggedTest)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_model.mixData[0].destCh = 0;
   g_model.mixData[0].mltpx = MLTPX_ADD;
   g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
@@ -781,7 +781,7 @@ TEST_F(MixerTest, flightModeTransition)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
   g_model.flightModeData[0].fadeIn = 100;
   g_model.flightModeData[0].fadeOut = 100;
@@ -807,7 +807,7 @@ TEST_F(MixerTest, flightModeOverflow)
   SYSTEM_RESET();
   MODEL_RESET();
   MIXER_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   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 56be91390..fe7779847 100644
--- a/radio/src/tests/switches.cpp
+++ b/radio/src/tests/switches.cpp
@@ -77,7 +77,7 @@ TEST(getSwitch, nullSW)
 TEST(getSwitch, inputWithTrim)
 {
   MODEL_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   MIXER_RESET();
 
   // g_model.logicalSw[0] = { LS_FUNC_VPOS, MIXSRC_FIRST_INPUT, 0, 0 };
@@ -99,7 +99,7 @@ TEST(evalLogicalSwitches, playFile)
 {
   SYSTEM_RESET();
   MODEL_RESET();
-  modelDefault(0);
+  setModelDefaults(0);
   MIXER_RESET();
 
   extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles;