modelDefault() becomes setModelDefaults()

This commit is contained in:
Raphael Coeffic
2021-04-09 15:10:11 +02:00
parent 188a9bcb77
commit 2f5dd1d4e3
8 changed files with 30 additions and 33 deletions
+2 -1
View File
@@ -23,6 +23,7 @@
#include "opentx.h" #include "opentx.h"
#include "lua_api.h" #include "lua_api.h"
#include "timers.h" #include "timers.h"
#include "model_init.h"
/*luadoc /*luadoc
@function model.getInfo() @function model.getInfo()
@@ -665,7 +666,7 @@ Set all inputs to defaults
static int luaModelDefaultInputs(lua_State *L) static int luaModelDefaultInputs(lua_State *L)
{ {
clearInputs(); clearInputs();
defaultInputs(); setDefaultInputs();
return 0; return 0;
} }
+12 -11
View File
@@ -25,7 +25,7 @@ void clearInputs()
memset(g_model.expoData, 0, sizeof(g_model.expoData)); memset(g_model.expoData, 0, sizeof(g_model.expoData));
} }
void defaultInputs() void setDefaultInputs()
{ {
for (int i=0; i<NUM_STICKS; i++) { for (int i=0; i<NUM_STICKS; i++) {
uint8_t stick_index = channelOrder(i+1); uint8_t stick_index = channelOrder(i+1);
@@ -50,7 +50,7 @@ void clearMixes()
memset(g_model.mixData, 0, sizeof(g_model.mixData)); memset(g_model.mixData, 0, sizeof(g_model.mixData));
} }
void defaultMixes() void setDefaultMixes()
{ {
for (int i=0; i<NUM_STICKS; i++) { for (int i=0; i<NUM_STICKS; i++) {
MixData * mix = mixAddress(i); MixData * mix = mixAddress(i);
@@ -61,12 +61,12 @@ void defaultMixes()
storageDirty(EE_MODEL); storageDirty(EE_MODEL);
} }
void defaultModelRegistrationID() void setDefaultModelRegistrationID()
{ {
memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID); memcpy(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID);
} }
void defaultGVars() void setDefaultGVars()
{ {
#if defined(FLIGHT_MODES) && defined(GVARS) #if defined(FLIGHT_MODES) && defined(GVARS)
for (int fmIdx = 1; fmIdx < MAX_FLIGHT_MODES; fmIdx++) { for (int fmIdx = 1; fmIdx < MAX_FLIGHT_MODES; fmIdx++) {
@@ -107,11 +107,11 @@ void setVendorSpecificModelDefaults()
void applyDefaultTemplate() void applyDefaultTemplate()
{ {
defaultInputs(); setDefaultInputs();
defaultMixes(); setDefaultMixes();
defaultGVars(); setDefaultGVars();
defaultModelRegistrationID(); setDefaultModelRegistrationID();
#if defined(COLORLCD) #if defined(COLORLCD)
//TODO: not sure yet we need it here //TODO: not sure yet we need it here
@@ -124,15 +124,16 @@ void applyDefaultTemplate()
#endif #endif
// TODO: what about switch warnings in non-color LCD radios? // 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)); memset(&g_model, 0, sizeof(g_model));
applyDefaultTemplate(); applyDefaultTemplate();
setVendorSpecificModelDefaults();
strAppendUnsigned(strAppend(g_model.header.name, STR_MODEL), id + 1, 2); strAppendUnsigned(strAppend(g_model.header.name, STR_MODEL), id + 1, 2);
#if defined(LUA) && defined(PCBTARANIS) // Horus uses menuModelWizard() for wizard #if defined(LUA) && defined(PCBTARANIS) // Horus uses menuModelWizard() for wizard
-7
View File
@@ -665,7 +665,6 @@ inline void resumeMixerCalculations()
void setDefaultOwnerId(); void setDefaultOwnerId();
void generalDefault(); void generalDefault();
void modelDefault(uint8_t id);
uint32_t hash(const void * ptr, uint32_t size); uint32_t hash(const void * ptr, uint32_t size);
@@ -781,12 +780,6 @@ inline void getGVarIncDecRange(int16_t & valMin, int16_t & valMax)
} }
#endif #endif
void clearInputs();
void defaultInputs();
void applyExpos(int16_t * anas, uint8_t mode, uint8_t ovwrIdx=0, int16_t ovwrValue=0); 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); int16_t applyLimits(uint8_t channel, int32_t value);
+3 -2
View File
@@ -23,6 +23,7 @@
#include <string.h> #include <string.h>
#include "opentx.h" #include "opentx.h"
#include "timers.h" #include "timers.h"
#include "model_init.h"
void eeLoadModel(uint8_t index) void eeLoadModel(uint8_t index)
{ {
@@ -45,7 +46,7 @@ void eeLoadModel(uint8_t index)
bool alarms = true; bool alarms = true;
if (size < EEPROM_MIN_MODEL_SIZE) { // if not loaded a fair amount if (size < EEPROM_MIN_MODEL_SIZE) { // if not loaded a fair amount
modelDefault(index) ; setModelDefaults(index);
storageCheck(true); storageCheck(true);
alarms = false; alarms = false;
} }
@@ -131,7 +132,7 @@ void storageEraseAll(bool warn)
TRACE("storageEraseAll"); TRACE("storageEraseAll");
generalDefault(); generalDefault();
modelDefault(0); setModelDefault(0);
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);
+2 -1
View File
@@ -23,6 +23,7 @@
#include "sdcard_common.h" #include "sdcard_common.h"
#include "modelslist.h" #include "modelslist.h"
#include "conversions/conversions.h" #include "conversions/conversions.h"
#include "model_init.h"
// defined either in sdcard_raw.cpp or sdcard_yaml.cpp // defined either in sdcard_raw.cpp or sdcard_yaml.cpp
void storageCreateModelsList(); void storageCreateModelsList();
@@ -92,7 +93,7 @@ const char * createModel()
int index = findNextFileIndex(filename, LEN_MODEL_FILENAME, MODELS_PATH); int index = findNextFileIndex(filename, LEN_MODEL_FILENAME, MODELS_PATH);
if (index > 0) { if (index > 0) {
modelDefault(index); setModelDefaults(index);
memcpy(g_eeGeneral.currModelFilename, filename, sizeof(g_eeGeneral.currModelFilename)); memcpy(g_eeGeneral.currModelFilename, filename, sizeof(g_eeGeneral.currModelFilename));
storageDirty(EE_GENERAL); storageDirty(EE_GENERAL);
storageDirty(EE_MODEL); storageDirty(EE_MODEL);
+1 -1
View File
@@ -104,7 +104,7 @@ class OpenTxTest : public testing::Test
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
RADIO_RESET(); RADIO_RESET();
} }
}; };
+8 -8
View File
@@ -466,7 +466,7 @@ TEST(Curves, LinearIntpol)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
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;
} }
@@ -672,7 +672,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
g_eeGeneral.templateSetup = 17; g_eeGeneral.templateSetup = 17;
applyDefaultTemplate(); applyDefaultTemplate();
g_model.thrTrim = 1; g_model.thrTrim = 1;
@@ -685,7 +685,7 @@ TEST_F(TrimsTest, throttleTrimEle) {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
g_eeGeneral.templateSetup = 0; g_eeGeneral.templateSetup = 0;
applyDefaultTemplate(); applyDefaultTemplate();
} }
@@ -696,7 +696,7 @@ TEST(Heli, BasicTest)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
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;
@@ -728,7 +728,7 @@ TEST(Heli, Mode2Test)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
g_eeGeneral.templateSetup = 2; g_eeGeneral.templateSetup = 2;
applyDefaultTemplate(); applyDefaultTemplate();
g_model.swashR.collectiveSource = MIXSRC_Thr; g_model.swashR.collectiveSource = MIXSRC_Thr;
@@ -764,7 +764,7 @@ TEST(Trainer, UnpluggedTest)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
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;
@@ -781,7 +781,7 @@ TEST_F(MixerTest, flightModeTransition)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
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;
@@ -807,7 +807,7 @@ TEST_F(MixerTest, flightModeOverflow)
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
MIXER_RESET(); MIXER_RESET();
modelDefault(0); setModelDefaults(0);
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
@@ -77,7 +77,7 @@ TEST(getSwitch, nullSW)
TEST(getSwitch, inputWithTrim) TEST(getSwitch, inputWithTrim)
{ {
MODEL_RESET(); MODEL_RESET();
modelDefault(0); setModelDefaults(0);
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 };
@@ -99,7 +99,7 @@ TEST(evalLogicalSwitches, playFile)
{ {
SYSTEM_RESET(); SYSTEM_RESET();
MODEL_RESET(); MODEL_RESET();
modelDefault(0); setModelDefaults(0);
MIXER_RESET(); MIXER_RESET();
extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles; extern BitField<(MAX_LOGICAL_SWITCHES * 2/*on, off*/)> sdAvailableLogicalSwitchAudioFiles;