Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-23 08:15:19 +03:00
Code Wiki Activity

Fix Defaults Dialog

Browse source
This commit is contained in:
Andi Kanzler 2023-12-11 17:35:42 -03:00
parent 3a26db0240
commit fd22831c19
3 changed files with 116 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

185
js/defaults_dialog.js
View file

@ -192,6 +192,11 @@ helper.defaultsDialog = (function () {
{ {
key: "failsafe_procedure", key: "failsafe_procedure",
value: "DROP" value: "DROP"
},
// Ez Tune
{
key: "ez_filter_hz",
value: 90
} }
] ]
}, },
@ -397,6 +402,11 @@ helper.defaultsDialog = (function () {
{ {
key: "failsafe_procedure", key: "failsafe_procedure",
value: "DROP" value: "DROP"
},
// Ez Tune
{
key: "ez_filter_hz",
value: 110
} }
] ]
}, },
@ -584,6 +594,11 @@ helper.defaultsDialog = (function () {
{ {
key: "failsafe_procedure", key: "failsafe_procedure",
value: "DROP" value: "DROP"
},
// Ez Tune
{
key: "ez_filter_hz",
value: 90
} }
] ]
}, },
@ -770,10 +785,6 @@ helper.defaultsDialog = (function () {
key: "nav_rth_altitude", key: "nav_rth_altitude",
value: 5000 value: 5000
}, },
{
key: "failsafe_mission",
value: "ON"
},
{ {
key: "nav_wp_radius", key: "nav_wp_radius",
value: 5000 value: 5000
@ -983,10 +994,6 @@ helper.defaultsDialog = (function () {
key: "nav_rth_altitude", key: "nav_rth_altitude",
value: 5000 value: 5000
}, },
{
key: "failsafe_mission",
value: "ON"
},
{ {
key: "nav_wp_radius", key: "nav_wp_radius",
value: 5000 value: 5000
@ -1146,92 +1153,96 @@ helper.defaultsDialog = (function () {
var currentControlProfile = parseInt($("#profilechange").val()); var currentControlProfile = parseInt($("#profilechange").val());
var currentBatteryProfile = parseInt($("#batteryprofilechange").val()); var currentBatteryProfile = parseInt($("#batteryprofilechange").val());
var controlProfileSettings = [];
var batterySettings = [];
var miscSettings = [];
selectedDefaultPreset.settings.forEach(input => {
if (FC.isControlProfileParameter(input.key)) {
controlProfileSettings.push(input);
} else if (FC.isBatteryProfileParameter(input.key)) {
batterySettings.push(input);
} else {
miscSettings.push(input);
}
});
//Save analytics //Save analytics
googleAnalytics.sendEvent('Setting', 'Defaults', selectedDefaultPreset.title); googleAnalytics.sendEvent('Setting', 'Defaults', selectedDefaultPreset.title);
Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
return mspHelper.getSetting(input.key); var settingsChainer = MSPChainerClass();
}).then(function () { var chain = [];
Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
if (FC.isControlProfileParameter(input.key)) {
return privateScope.setSettingForAllControlProfiles(input.key, input.value);
} else if (FC.isBatteryProfileParameter(input.key)) {
return privateScope.setSettingForAllBatteryProfiles(input.key, input.value);
} else {
return mspHelper.setSetting(input.key, input.value);
}
}).then(function () {
// If default preset is associated to a mixer, apply the mixer as well miscSettings.forEach(input => {
if (selectedDefaultPreset.mixerToApply) { chain.push(setSetting);
let currentMixerPreset = helper.mixer.getById(selectedDefaultPreset.mixerToApply); function setSetting(callback) {
mspHelper.setSetting(input.key, input.value, callback);
helper.mixer.loadServoRules(currentMixerPreset); }
helper.mixer.loadMotorRules(currentMixerPreset);
MIXER_CONFIG.platformType = currentMixerPreset.platform;
MIXER_CONFIG.appliedMixerPreset = selectedDefaultPreset.mixerToApply;
MIXER_CONFIG.motorStopOnLow = (currentMixerPreset.motorStopOnLow === true) ? true : false;
MIXER_CONFIG.hasFlaps = (currentMixerPreset.hasFlaps === true) ? true : false;
SERVO_RULES.cleanup();
SERVO_RULES.inflate();
MOTOR_RULES.cleanup();
MOTOR_RULES.inflate();
mspHelper.saveMixerConfig(function() {
mspHelper.sendServoMixer(function () {
mspHelper.sendMotorMixer(function () {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, function() {
privateScope.setOriginalProfile(selectedDefaultPreset, currentBatteryProfile, currentControlProfile)
});
});
});
});
});
} else {
privateScope.setOriginalProfile(selectedDefaultPreset, currentBatteryProfile, currentControlProfile);
}
})
}); });
};
privateScope.setOriginalProfile = function (selectedDefaultPreset, currentBatteryProfile, currentControlProfile) { for (var i = 0; i < 3; i++ ) {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() { chain.push(function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, privateScope.finalize(selectedDefaultPreset)); MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [i], false, callback);
});
};
privateScope.setSettingForAllControlProfiles = function (key, value) {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [0], false, function () {
mspHelper.setSetting(key, value, function() {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [1], false, function () {
mspHelper.setSetting(key, value, function() {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [2], false, function () {
mspHelper.setSetting(key, value);
});
});
});
}); });
}); controlProfileSettings.forEach(input => {
return; chain.push(setSetting);
}; function setSetting(callback) {
mspHelper.setSetting(input.key, input.value, callback);
privateScope.setSettingForAllBatteryProfiles = function (key, value) { }
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [0], false, function () {
mspHelper.setSetting(key, value, function() {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [1], false, function () {
mspHelper.setSetting(key, value, function() {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [2], false, function () {
mspHelper.setSetting(key, value);
});
});
});
}); });
}
for (var i = 0; i < 3; i++ ) {
chain.push(function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [i], false, callback);
});
batterySettings.forEach(input => {
chain.push(setSetting);
function setSetting(callback) {
mspHelper.setSetting(input.key, input.value, callback);
}
});
}
// Set Mixers
if (selectedDefaultPreset.mixerToApply) {
let currentMixerPreset = helper.mixer.getById(selectedDefaultPreset.mixerToApply);
helper.mixer.loadServoRules(currentMixerPreset);
helper.mixer.loadMotorRules(currentMixerPreset);
MIXER_CONFIG.platformType = currentMixerPreset.platform;
MIXER_CONFIG.appliedMixerPreset = selectedDefaultPreset.mixerToApply;
MIXER_CONFIG.motorStopOnLow = (currentMixerPreset.motorStopOnLow === true) ? true : false;
MIXER_CONFIG.hasFlaps = (currentMixerPreset.hasFlaps === true) ? true : false;
SERVO_RULES.cleanup();
SERVO_RULES.inflate();
MOTOR_RULES.cleanup();
MOTOR_RULES.inflate();
chain = chain.concat([
mspHelper.saveMixerConfig,
mspHelper.sendServoMixer,
mspHelper.sendMotorMixer
]);
}
chain.push(function (callback) {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, callback);
}); });
return;
}; chain.push(function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, callback);
});
settingsChainer.setChain(chain);
settingsChainer.setExitPoint(function () {
privateScope.finalize(selectedDefaultPreset);
});
settingsChainer.execute();
}
privateScope.onPresetClick = function (event) { privateScope.onPresetClick = function (event) {
savingDefaultsModal = new jBox('Modal', { savingDefaultsModal = new jBox('Modal', {

15
js/msp/MSPHelper.js
View file

@ -1496,6 +1496,9 @@ var mspHelper = (function (gui) {
case MSPCodes.MSP2_INAV_OSD_SET_PREFERENCES: case MSPCodes.MSP2_INAV_OSD_SET_PREFERENCES:
console.log('OSD preferences saved'); console.log('OSD preferences saved');
break; break;
case MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE:
console.log('Battery profile selected');
break;
case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING: case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING:
OUTPUT_MAPPING.flush(); OUTPUT_MAPPING.flush();
for (i = 0; i < data.byteLength; ++i) for (i = 0; i < data.byteLength; ++i)
@ -3311,6 +3314,12 @@ var mspHelper = (function (gui) {
self.encodeSetting = function (name, value) { self.encodeSetting = function (name, value) {
return this._getSetting(name).then(function (setting) { return this._getSetting(name).then(function (setting) {
if (!setting) {
console.log("Setting invalid: " + name);
return null;
}
if (setting.table && !Number.isInteger(value)) { if (setting.table && !Number.isInteger(value)) {
var found = false; var found = false;
for (var ii = 0; ii < setting.table.values.length; ii++) { for (var ii = 0; ii < setting.table.values.length; ii++) {
@ -3358,7 +3367,11 @@ var mspHelper = (function (gui) {
self.setSetting = function (name, value, callback) { self.setSetting = function (name, value, callback) {
this.encodeSetting(name, value).then(function (data) { this.encodeSetting(name, value).then(function (data) {
return MSP.promise(MSPCodes.MSPV2_SET_SETTING, data).then(callback); if (data) {
return MSP.promise(MSPCodes.MSPV2_SET_SETTING, data).then(callback);
} else {
return Promise.resolve().then(callback);
}
}); });
}; };

5
tabs/setup.js
View file

@ -69,7 +69,10 @@ TABS.setup.initialize = function (callback) {
GUI.log(chrome.i18n.getMessage('initialSetupSettingsRestored')); GUI.log(chrome.i18n.getMessage('initialSetupSettingsRestored'));
GUI.tab_switch_cleanup(function () { GUI.tab_switch_cleanup(function () {
TABS.setup.initialize(); MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false, function() {
GUI.log(chrome.i18n.getMessage('deviceRebooting'));
GUI.handleReconnect($('.tab_setup a'));
});
}); });
}); });
} }