Fix default model index

This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:03 +01:00
parent 2537c7a004
commit 5a727ed6d1
6 changed files with 20 additions and 16 deletions
+7 -1
View File
@@ -24,5 +24,11 @@
void clearInputs(); void clearInputs();
void setDefaultInputs(); 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 // Reset the global model to full defaults
void setModelDefaults(uint8_t id); void setModelDefaults(uint8_t id = DEFAULT_MODEL_IDX);
+1 -1
View File
@@ -102,7 +102,7 @@ void storageEraseAll(bool warn)
TRACE("storageEraseAll"); TRACE("storageEraseAll");
generalDefault(); generalDefault();
setModelDefaults(0); setModelDefaults();
if (warn) { if (warn) {
ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA); ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
+1 -3
View File
@@ -69,11 +69,9 @@ void storageFormat()
sdCheckAndCreateDirectory(RADIO_PATH); sdCheckAndCreateDirectory(RADIO_PATH);
sdCheckAndCreateDirectory(MODELS_PATH); sdCheckAndCreateDirectory(MODELS_PATH);
generalDefault(); generalDefault();
setModelDefaults();
#if defined(STORAGE_MODELSLIST) #if defined(STORAGE_MODELSLIST)
setModelDefaults(1);
storageCreateModelsList(); storageCreateModelsList();
#else
setModelDefaults(0);
#endif #endif
} }
+1 -1
View File
@@ -106,7 +106,7 @@ class OpenTxTest : public testing::Test
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
RADIO_RESET(); RADIO_RESET();
} }
}; };
+8 -8
View File
@@ -467,7 +467,7 @@ TEST(Curves, LinearIntpol)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
for (int8_t i=-2; i<=2; i++) { for (int8_t i=-2; i<=2; i++) {
g_model.points[2+i] = 50*i; g_model.points[2+i] = 50*i;
} }
@@ -673,7 +673,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_eeGeneral.templateSetup = 17; g_eeGeneral.templateSetup = 17;
applyDefaultTemplate(); applyDefaultTemplate();
g_model.thrTrim = 1; g_model.thrTrim = 1;
@@ -686,7 +686,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_eeGeneral.templateSetup = 0; g_eeGeneral.templateSetup = 0;
applyDefaultTemplate(); applyDefaultTemplate();
} }
@@ -697,7 +697,7 @@ TEST(Heli, BasicTest)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_model.swashR.collectiveSource = MIXSRC_Thr; g_model.swashR.collectiveSource = MIXSRC_Thr;
g_model.swashR.elevatorSource = MIXSRC_Ele; g_model.swashR.elevatorSource = MIXSRC_Ele;
g_model.swashR.aileronSource = MIXSRC_Ail; g_model.swashR.aileronSource = MIXSRC_Ail;
@@ -729,7 +729,7 @@ TEST(Heli, Mode2Test)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_eeGeneral.templateSetup = 2; g_eeGeneral.templateSetup = 2;
applyDefaultTemplate(); applyDefaultTemplate();
g_model.swashR.collectiveSource = MIXSRC_Thr; g_model.swashR.collectiveSource = MIXSRC_Thr;
@@ -765,7 +765,7 @@ TEST(Trainer, UnpluggedTest)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_model.mixData[0].destCh = 0; g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD; g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER; g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
@@ -782,7 +782,7 @@ TEST_F(MixerTest, flightModeTransition)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2); g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
g_model.flightModeData[0].fadeIn = 100; g_model.flightModeData[0].fadeIn = 100;
g_model.flightModeData[0].fadeOut = 100; g_model.flightModeData[0].fadeOut = 100;
@@ -808,7 +808,7 @@ TEST_F(MixerTest, flightModeOverflow)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
setModelDefaults(0); setModelDefaults();
g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2); g_model.flightModeData[1].swtch = TR(SWSRC_ID2, SWSRC_SA2);
g_model.flightModeData[0].fadeIn = 100; g_model.flightModeData[0].fadeIn = 100;
g_model.flightModeData[0].fadeOut = 100; g_model.flightModeData[0].fadeOut = 100;
+2 -2
View File
@@ -78,7 +78,7 @@ TEST(getSwitch, nullSW)
TEST(getSwitch, inputWithTrim) TEST(getSwitch, inputWithTrim)
{ {
MODEL_RESET(); MODEL_RESET();
setModelDefaults(0); setModelDefaults();
MIXER_RESET(); MIXER_RESET();
// g_model.logicalSw[0] = { LS_FUNC_VPOS, MIXSRC_FIRST_INPUT, 0, 0 }; // g_model.logicalSw[0] = { LS_FUNC_VPOS, MIXSRC_FIRST_INPUT, 0, 0 };
@@ -100,7 +100,7 @@ TEST(evalLogicalSwitches, playFile)
{ {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
setModelDefaults(0); setModelDefaults();
MIXER_RESET(); MIXER_RESET();
extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles; extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles;