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

Fix defaults dialog when mixer configuration is available

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2023-12-06 15:02:32 +01:00
parent 42f7a7f0bd
commit 1dd24abfd8
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
js/defaults_dialog.js
View file

@ -1145,19 +1145,20 @@ helper.defaultsDialog = (function () {
privateScope.setSettings = function (selectedDefaultPreset) { privateScope.setSettings = function (selectedDefaultPreset) {
var currentControlProfile = parseInt($("#profilechange").val()); var currentControlProfile = parseInt($("#profilechange").val());
var currentBatteryProfile = parseInt($("#batteryprofilechange").val()); var currentBatteryProfile = parseInt($("#batteryprofilechange").val());
//Save analytics //Save analytics
googleAnalytics.sendEvent('Setting', 'Defaults', selectedDefaultPreset.title); googleAnalytics.sendEvent('Setting', 'Defaults', selectedDefaultPreset.title);
Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) { Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
return mspHelper.getSetting(input.key); return mspHelper.getSetting(input.key);
}).then(function () { }).then(function () {
Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) { Promise.mapSeries(selectedDefaultPreset.settings, function (input, ii) {
if (FC.isControlProfileParameter(input.key)) { // if (FC.isControlProfileParameter(input.key)) {
return privateScope.setSettingForAllControlProfiles(input.key, input.value); // return privateScope.setSettingForAllControlProfiles(input.key, input.value);
} else if (FC.isBatteryProfileParameter(input.key)) { // } else if (FC.isBatteryProfileParameter(input.key)) {
return privateScope.setSettingForAllBatteryProfiles(input.key, input.value); // return privateScope.setSettingForAllBatteryProfiles(input.key, input.value);
} else { // } else {
return mspHelper.setSetting(input.key, input.value); return mspHelper.setSetting(input.key, input.value);
} // }
}).then(function () { }).then(function () {
// If default preset is associated to a mixer, apply the mixer as well // If default preset is associated to a mixer, apply the mixer as well
@ -1181,21 +1182,27 @@ helper.defaultsDialog = (function () {
mspHelper.sendServoMixer(function () { mspHelper.sendServoMixer(function () {
mspHelper.sendMotorMixer(function () { mspHelper.sendMotorMixer(function () {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() { MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, privateScope.finalize(selectedDefaultPreset)); MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, function() {
privateScope.setOriginalProfile(selectedDefaultPreset, currentBatteryProfile, currentControlProfile)
});
}); });
}); });
}); });
}); });
} else { } else {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() { privateScope.setOriginalProfile(selectedDefaultPreset, currentBatteryProfile, currentControlProfile);
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, privateScope.finalize(selectedDefaultPreset));
});
} }
}) })
}); });
}; };
privateScope.setOriginalProfile = function (selectedDefaultPreset, currentBatteryProfile, currentControlProfile) {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [currentControlProfile], false, function() {
MSP.send_message(MSPCodes.MSP2_INAV_SELECT_BATTERY_PROFILE, [currentBatteryProfile], false, privateScope.finalize(selectedDefaultPreset));
});
};
privateScope.setSettingForAllControlProfiles = function (key, value) { privateScope.setSettingForAllControlProfiles = function (key, value) {
MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [0], false, function () { MSP.send_message(MSPCodes.MSP_SELECT_SETTING, [0], false, function () {
mspHelper.setSetting(key, value, function() { mspHelper.setSetting(key, value, function() {