From a9c2184976b73c7f4a2c7d17085ae8e7de9b0fda Mon Sep 17 00:00:00 2001 From: Asizon <43983086+Asizon@users.noreply.github.com> Date: Fri, 3 Apr 2020 12:56:47 +0200 Subject: [PATCH 1/3] Fix D values when Dmin disabled --- src/js/TuningSliders.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/TuningSliders.js b/src/js/TuningSliders.js index fb30b877..fb330818 100644 --- a/src/js/TuningSliders.js +++ b/src/js/TuningSliders.js @@ -49,7 +49,7 @@ TuningSliders.setDMinFeatureEnabled = function(dMinFeatureEnabled) { if (this.dMinFeatureEnabled) { this.defaultPDRatio = this.PID_DEFAULT[0] / this.PID_DEFAULT[2]; } else { - this.defaultPDRatio = this.PID_DEFAULT[0] / this.PID_DEFAULT[3]; + this.defaultPDRatio = this.PID_DEFAULT[0] / (this.PID_DEFAULT[2] * 0.85); } }; @@ -88,7 +88,7 @@ TuningSliders.initPidSlidersPosition = function() { if (this.dMinFeatureEnabled) { this.PDGainSliderValue = Math.round(ADVANCED_TUNING.dMinRoll / this.MasterSliderValue / this.PID_DEFAULT[3] * 10) / 10; } else { - this.PDGainSliderValue = Math.round(PIDs[0][2] / this.MasterSliderValue / this.PID_DEFAULT[3] * 10) / 10; + this.PDGainSliderValue = Math.round(PIDs[0][2] / this.MasterSliderValue / (this.PID_DEFAULT[2] * 0.85) * 10) / 10; } this.ResponseSliderValue = Math.round(ADVANCED_TUNING.feedforwardRoll / this.MasterSliderValue / this.PID_DEFAULT[4] * 10) / 10; @@ -258,8 +258,8 @@ TuningSliders.calculateNewPids = function() { } else { ADVANCED_TUNING.dMinRoll = 0; ADVANCED_TUNING.dMinPitch = 0; - PIDs[0][2] = Math.round(this.PID_DEFAULT[3] * this.PDGainSliderValue); - PIDs[1][2] = Math.round(this.PID_DEFAULT[8] * this.PDGainSliderValue); + PIDs[0][2] = Math.round((this.PID_DEFAULT[2] * 0.85) * this.PDGainSliderValue); + PIDs[1][2] = Math.round((this.PID_DEFAULT[7] * 0.85) * this.PDGainSliderValue); } PIDs[2][0] = Math.round(this.PID_DEFAULT[10] * this.PDGainSliderValue); From 19d4db4346dd85e98f675a1b7dc7c773d89d307f Mon Sep 17 00:00:00 2001 From: Asizon <43983086+Asizon@users.noreply.github.com> Date: Mon, 6 Apr 2020 14:38:34 +0200 Subject: [PATCH 2/3] Coordinated with new Dmin values Move Default_pids down --- src/js/fc.js | 9 ++++++++- src/js/tabs/pid_tuning.js | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/js/fc.js b/src/js/fc.js index c0a92e2f..a8d2d8c7 100644 --- a/src/js/fc.js +++ b/src/js/fc.js @@ -690,8 +690,15 @@ var FC = { }, getPidDefaults: function() { - var versionPidDefaults = DEFAULT_PIDS; // if defaults change they should go here + if (semver.gte(CONFIG.apiVersion, "1.43.0")) { + DEFAULT_PIDS = [ + 42, 85, 35, 23, 90, + 46, 90, 38, 25, 95, + 30, 90, 0, 0, 90, + ]; + } + var versionPidDefaults = DEFAULT_PIDS; return versionPidDefaults; }, }; diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js index c8ac1c3c..98112994 100644 --- a/src/js/tabs/pid_tuning.js +++ b/src/js/tabs/pid_tuning.js @@ -479,6 +479,11 @@ TABS.pid_tuning.initialize = function (callback) { $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.57), 100)); $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.57), 100)); $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.57), 100)); + if (semver.gte(CONFIG.apiVersion, "1.43.0")) { + $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.65), 100)); + $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.65), 100)); + $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.65), 100)); + } } else { $('.pid_tuning input[name="dMinRoll"]').val(ADVANCED_TUNING.dMinRoll); $('.pid_tuning input[name="dMinPitch"]').val(ADVANCED_TUNING.dMinPitch); From 064f7ba5d8e1aba4b39e4d9ee7a9f197a79a96d7 Mon Sep 17 00:00:00 2001 From: Asizon <43983086+Asizon@users.noreply.github.com> Date: Tue, 7 Apr 2020 07:26:28 +0200 Subject: [PATCH 3/3] Better defaults read --- src/js/TuningSliders.js | 4 ++++ src/js/fc.js | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/js/TuningSliders.js b/src/js/TuningSliders.js index fb330818..66c3d1b5 100644 --- a/src/js/TuningSliders.js +++ b/src/js/TuningSliders.js @@ -26,6 +26,10 @@ var TuningSliders = { TuningSliders.initialize = function() { this.PID_DEFAULT = FC.getPidDefaults(); + if (semver.gte(CONFIG.apiVersion, "1.43.0")) { + this.PID_DEFAULT[3] = 23; + this.PID_DEFAULT[8] = 25; + } this.FILTER_DEFAULT = FC.getFilterDefaults(); this.setDMinFeatureEnabled($('#dMinSwitch').is(':checked')); diff --git a/src/js/fc.js b/src/js/fc.js index a8d2d8c7..c0a92e2f 100644 --- a/src/js/fc.js +++ b/src/js/fc.js @@ -690,15 +690,8 @@ var FC = { }, getPidDefaults: function() { - // if defaults change they should go here - if (semver.gte(CONFIG.apiVersion, "1.43.0")) { - DEFAULT_PIDS = [ - 42, 85, 35, 23, 90, - 46, 90, 38, 25, 95, - 30, 90, 0, 0, 90, - ]; - } var versionPidDefaults = DEFAULT_PIDS; + // if defaults change they should go here return versionPidDefaults; }, };