From b7085a5926d15531488f420ebdb401c1a1329d4a Mon Sep 17 00:00:00 2001
From: Asizon <43983086+Asizon@users.noreply.github.com>
Date: Sat, 25 Dec 2021 20:40:21 +0100
Subject: [PATCH] Rpm defaults fix
Change dialog
sonar fixes
sonar fix
fix text
no values change if not dialog shows
typo
---
locales/en/messages.json | 5 +----
src/js/fc.js | 4 +---
src/js/main.js | 13 -------------
src/js/tabs/motors.js | 31 ++++++++++++++++++-------------
src/js/tabs/pid_tuning.js | 29 ++++++++++++++++++++---------
src/main.html | 11 -----------
6 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/locales/en/messages.json b/locales/en/messages.json
index 34ba1797..083ed574 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1512,10 +1512,7 @@
"message": "Dynamic Notch values change"
},
"dialogDynFiltersChangeNote": {
- "message": "WARNING: Some dynamic notch values have been changed to default values because the RPM filtering has been activated/deactivated.
Please, check before flying."
- },
- "dialogDynFiltersConfirm": {
- "message": "OK"
+ "message": "WARNING: This change will enable/disable RPM filtering, increasing/decreasing filter delay/effectiveness.
Reset the dynamic notch filters to recommended values?"
},
"portsIdentifier": {
"message": "Identifier"
diff --git a/src/js/fc.js b/src/js/fc.js
index e04dc325..45d710cc 100644
--- a/src/js/fc.js
+++ b/src/js/fc.js
@@ -642,8 +642,7 @@ const FC = {
dyn_notch_q: 120,
dyn_notch_width_percent: 8,
dyn_notch_count: 3,
- dyn_notch_q_rpm: 250, // default with rpm filtering
- dyn_notch_width_percent_rpm: 0,
+ dyn_notch_q_rpm: 500, // default with rpm filtering
dyn_notch_count_rpm: 1,
dyn_notch_min_hz: 150,
dyn_notch_max_hz: 600,
@@ -858,7 +857,6 @@ const FC = {
versionFilterDefaults.dterm_lowpass2_type = this.FILTER_TYPE_FLAGS.PT1;
}
if (semver.gte(this.CONFIG.apiVersion, API_VERSION_1_44)) {
- versionFilterDefaults.dyn_notch_q_rpm = 500;
versionFilterDefaults.dyn_notch_q = 300;
versionFilterDefaults.gyro_lowpass_hz = 250;
versionFilterDefaults.gyro_lowpass_dyn_min_hz = 250;
diff --git a/src/js/main.js b/src/js/main.js
index 496cc31b..b5c40b76 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -725,21 +725,8 @@ function showErrorDialog(message) {
dialog.showModal();
}
-function showDialogDynFiltersChange() {
- const dialogDynFiltersChange = $('.dialogDynFiltersChange')[0];
-
- if (!dialogDynFiltersChange.hasAttribute('open')) {
- dialogDynFiltersChange.showModal();
-
- $('.dialogDynFiltersChange-confirmbtn').click(function() {
- dialogDynFiltersChange.close();
- });
- }
-}
-
// TODO: all of these are used as globals in other parts.
// once moved to modules extract to own module.
-window.showDialogDynFiltersChange = showDialogDynFiltersChange;
window.googleAnalytics = analytics;
window.analytics = null;
window.showErrorDialog = showErrorDialog;
diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
index e18d451e..15a0c02c 100644
--- a/src/js/tabs/motors.js
+++ b/src/js/tabs/motors.js
@@ -3,7 +3,6 @@
TABS.motors = {
previousDshotBidir: null,
previousFilterDynQ: null,
- previousFilterDynWidth: null,
previousFilterDynCount: null,
analyticsChanges: {},
configHasChanged: false,
@@ -666,41 +665,47 @@ TABS.motors.initialize = function (callback) {
unsyncedPWMSwitchElement.prop('checked', FC.PID_ADVANCED_CONFIG.use_unsyncedPwm !== 0).trigger("change");
$('input[name="unsyncedpwmfreq"]').val(FC.PID_ADVANCED_CONFIG.motor_pwm_rate);
$('input[name="digitalIdlePercent"]').val(FC.PID_ADVANCED_CONFIG.digitalIdlePercent);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
dshotBidirElement.prop('checked', FC.MOTOR_CONFIG.use_dshot_telemetry).trigger("change");
self.previousDshotBidir = FC.MOTOR_CONFIG.use_dshot_telemetry;
self.previousFilterDynQ = FC.FILTER_CONFIG.dyn_notch_q;
- self.previousFilterDynWidth = FC.FILTER_CONFIG.dyn_notch_width_percent;
self.previousFilterDynCount = FC.FILTER_CONFIG.dyn_notch_count;
dshotBidirElement.on("change", function () {
const value = $(this).prop('checked');
const newValue = (value !== FC.MOTOR_CONFIG.use_dshot_telemetry) ? 'On' : 'Off';
+
self.analyticsChanges['BidirectionalDshot'] = newValue;
FC.MOTOR_CONFIG.use_dshot_telemetry = value;
FC.FILTER_CONFIG.dyn_notch_count = self.previousFilterDynCount;
FC.FILTER_CONFIG.dyn_notch_q = self.previousFilterDynQ;
- FC.FILTER_CONFIG.dyn_notch_width_percent = self.previousFilterDynWidth;
- if (FC.FILTER_CONFIG.gyro_rpm_notch_harmonics !== 0) { // if rpm filter is active
+ const dialogSettings = {
+ title: i18n.getMessage("dialogDynFiltersChangeTitle"),
+ text: i18n.getMessage("dialogDynFiltersChangeNote"),
+ buttonYesText: i18n.getMessage("presetsWarningDialogYesButton"),
+ buttonNoText: i18n.getMessage("presetsWarningDialogNoButton"),
+ buttonYesCallback: () => _dynFilterChange(),
+ buttonNoCallback: null,
+ };
+
+ const _dynFilterChange = function() {
if (value && !self.previousDshotBidir) {
FC.FILTER_CONFIG.dyn_notch_count = FILTER_DEFAULT.dyn_notch_count_rpm;
FC.FILTER_CONFIG.dyn_notch_q = FILTER_DEFAULT.dyn_notch_q_rpm;
- FC.FILTER_CONFIG.dyn_notch_width_percent = FILTER_DEFAULT.dyn_notch_width_percent_rpm;
} else if (!value && self.previousDshotBidir) {
FC.FILTER_CONFIG.dyn_notch_count = FILTER_DEFAULT.dyn_notch_count;
FC.FILTER_CONFIG.dyn_notch_q = FILTER_DEFAULT.dyn_notch_q;
- FC.FILTER_CONFIG.dyn_notch_width_percent = FILTER_DEFAULT.dyn_notch_width_percent;
}
- }
+ };
- const dynFilterNeedChange = (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) ? (FC.FILTER_CONFIG.dyn_notch_count !== self.previousFilterDynCount) :
- (FC.FILTER_CONFIG.dyn_notch_width_percent !== self.previousFilterDynWidth);
-
- if (dynFilterNeedChange) {
- showDialogDynFiltersChange();
+ if (FC.MOTOR_CONFIG.use_dshot_telemetry !== self.previousDshotBidir) { // if rpmFilterEnabled is not the same value as saved in the fc
+ GUI.showYesNoDialog(dialogSettings);
+ } else {
+ FC.FILTER_CONFIG.dyn_notch_count = self.previousFilterDynCount;
+ FC.FILTER_CONFIG.dyn_notch_q = self.previousFilterDynQ;
}
});
diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js
index b490bf4b..5a5761fb 100644
--- a/src/js/tabs/pid_tuning.js
+++ b/src/js/tabs/pid_tuning.js
@@ -5,6 +5,8 @@ TABS.pid_tuning = {
showAllPids: false,
updating: true,
dirty: false,
+ previousFilterDynQ: null,
+ previousFilterDynCount: null,
currentProfile: null,
currentRateProfile: null,
currentRatesType: null,
@@ -446,28 +448,37 @@ TABS.pid_tuning.initialize = function (callback) {
rpmFilterHarmonics_e.attr('disabled', !checked);
rpmFilterMinHz_e.attr('disabled', !checked);
+ self.previousFilterDynQ = FC.FILTER_CONFIG.dyn_notch_q;
+ self.previousFilterDynCount = FC.FILTER_CONFIG.dyn_notch_count;
if (harmonics == 0) {
rpmFilterHarmonics_e.val(FILTER_DEFAULT.gyro_rpm_notch_harmonics);
}
- if (checked !== (FC.FILTER_CONFIG.gyro_rpm_notch_harmonics !== 0)) { // if rpmFilterEnabled is not the same value as saved in the fc
+ const dialogSettings = {
+ title: i18n.getMessage("dialogDynFiltersChangeTitle"),
+ text: i18n.getMessage("dialogDynFiltersChangeNote"),
+ buttonYesText: i18n.getMessage("presetsWarningDialogYesButton"),
+ buttonNoText: i18n.getMessage("presetsWarningDialogNoButton"),
+ buttonYesCallback: () => _dynFilterChange(),
+ buttonNoCallback: null,
+ };
+
+ const _dynFilterChange = function() {
if (checked) {
dynamicNotchCount_e.val(FILTER_DEFAULT.dyn_notch_count_rpm);
dynamicNotchQ_e.val(FILTER_DEFAULT.dyn_notch_q_rpm);
- dynamicNotchWidthPercent_e.val(FILTER_DEFAULT.dyn_notch_width_percent_rpm);
} else {
dynamicNotchCount_e.val(FILTER_DEFAULT.dyn_notch_count);
dynamicNotchQ_e.val(FILTER_DEFAULT.dyn_notch_q);
- dynamicNotchWidthPercent_e.val(FILTER_DEFAULT.dyn_notch_width_percent);
}
+ };
- showDialogDynFiltersChange();
-
- } else { // same value, return saved values
- dynamicNotchCount_e.val(FC.FILTER_CONFIG.dyn_notch_count);
- dynamicNotchQ_e.val(FC.FILTER_CONFIG.dyn_notch_q);
- dynamicNotchWidthPercent_e.val(FC.FILTER_CONFIG.dyn_notch_width_percent);
+ if (checked !== (FC.FILTER_CONFIG.gyro_rpm_notch_harmonics !== 0)) { // if rpmFilterEnabled is not the same value as saved in the fc
+ GUI.showYesNoDialog(dialogSettings);
+ } else {
+ dynamicNotchCount_e.val(self.previousFilterDynCount);
+ dynamicNotchQ_e.val(self.previousFilterDynQ);
}
$('.rpmFilter span.suboption').toggle(checked);
diff --git a/src/main.html b/src/main.html
index 3c05dcde..f4b13fcf 100644
--- a/src/main.html
+++ b/src/main.html
@@ -459,17 +459,6 @@
-
-