1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 16:55:22 +03:00

Merge branch 'master' into release_4.1.0

This commit is contained in:
Pawel Spychalski (DzikuVx) 2022-01-25 09:12:19 +01:00
commit 9d89797bd4
19 changed files with 446 additions and 340 deletions

View file

@ -13,6 +13,7 @@ helper.defaultsDialog = (function () {
let data = [{
"title": 'Mini Quad with 3"-7" propellers',
"id": 2,
"notRecommended": false,
"reboot": true,
"settings": [
@ -582,6 +583,7 @@ helper.defaultsDialog = (function () {
},
{
"title": 'Rovers & Boats',
"id": 1,
"notRecommended": false,
"reboot": true,
"settings": [
@ -645,6 +647,7 @@ helper.defaultsDialog = (function () {
},
{
"title": 'Keep current settings (Not recommended)',
"id": 0,
"notRecommended": true,
"reboot": false,
"settings": [
@ -725,6 +728,11 @@ helper.defaultsDialog = (function () {
let selectedDefaultPreset = data[$(event.currentTarget).data("index")];
if (selectedDefaultPreset && selectedDefaultPreset.settings) {
if (selectedDefaultPreset.id == 0) {
// Close applying preset dialog if keeping current settings.
savingDefaultsModal.close();
}
mspHelper.loadBfConfig(function () {
privateScope.setFeaturesBits(selectedDefaultPreset)
});