sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2053 from mikeller/fix_sliders_resetting 

Fixed PID tuning sliders disabling on certain values.
10.7.0-preview
Michael Keller 2020-06-10 01:32:58 +12:00 committed by GitHub
parent 0ee367b841 81c41d331f
commit b8d0481465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/TuningSliders.js
View File

@ -24,6 +24,8 @@ var TuningSliders = {
expertMode: false, expertMode: false,
}; };
const D_MIN_RATIO = 0.85;
TuningSliders.initialize = function() { TuningSliders.initialize = function() {
this.PID_DEFAULT = FC.getPidDefaults(); this.PID_DEFAULT = FC.getPidDefaults();
this.FILTER_DEFAULT = FC.getFilterDefaults(); this.FILTER_DEFAULT = FC.getFilterDefaults();
@ -49,7 +51,7 @@ TuningSliders.setDMinFeatureEnabled = function(dMinFeatureEnabled) {
if (this.dMinFeatureEnabled) { if (this.dMinFeatureEnabled) {
this.defaultPDRatio = this.PID_DEFAULT[2] / this.PID_DEFAULT[0]; this.defaultPDRatio = this.PID_DEFAULT[2] / this.PID_DEFAULT[0];
} else { } else {
this.defaultPDRatio = this.PID_DEFAULT[2] / (this.PID_DEFAULT[0] * 1.18); this.defaultPDRatio = this.PID_DEFAULT[2] / (this.PID_DEFAULT[0] * (1 / D_MIN_RATIO));
} }
}; };
@ -88,7 +90,7 @@ TuningSliders.initPidSlidersPosition = function() {
if (this.dMinFeatureEnabled) { if (this.dMinFeatureEnabled) {
this.PDGainSliderValue = Math.round(ADVANCED_TUNING.dMinRoll / this.PDRatioSliderValue / this.MasterSliderValue / this.PID_DEFAULT[3] * 10) / 10; this.PDGainSliderValue = Math.round(ADVANCED_TUNING.dMinRoll / this.PDRatioSliderValue / this.MasterSliderValue / this.PID_DEFAULT[3] * 10) / 10;
} else { } else {
this.PDGainSliderValue = Math.round(PIDs[0][0] / this.MasterSliderValue / (this.PID_DEFAULT[2] * 1.18) * 10) / 10; this.PDGainSliderValue = Math.round(PIDs[0][0] / this.MasterSliderValue / (this.PID_DEFAULT[2] * (1 / D_MIN_RATIO)) * 10) / 10;
} }
this.ResponseSliderValue = Math.round(ADVANCED_TUNING.feedforwardRoll / this.MasterSliderValue / this.PID_DEFAULT[4] * 10) / 10; this.ResponseSliderValue = Math.round(ADVANCED_TUNING.feedforwardRoll / this.MasterSliderValue / this.PID_DEFAULT[4] * 10) / 10;
@ -258,8 +260,8 @@ TuningSliders.calculateNewPids = function() {
} else { } else {
ADVANCED_TUNING.dMinRoll = 0; ADVANCED_TUNING.dMinRoll = 0;
ADVANCED_TUNING.dMinPitch = 0; ADVANCED_TUNING.dMinPitch = 0;
PIDs[0][2] = Math.round((this.PID_DEFAULT[2] * 0.85) * this.PDGainSliderValue * this.PDRatioSliderValue); PIDs[0][2] = Math.round((this.PID_DEFAULT[2] * D_MIN_RATIO) * this.PDGainSliderValue * this.PDRatioSliderValue);
PIDs[1][2] = Math.round((this.PID_DEFAULT[7] * 0.85) * this.PDGainSliderValue * this.PDRatioSliderValue); PIDs[1][2] = Math.round((this.PID_DEFAULT[7] * D_MIN_RATIO) * this.PDGainSliderValue * this.PDRatioSliderValue);
} }
// p // p
PIDs[0][0] = Math.round(this.PID_DEFAULT[0] * this.PDGainSliderValue); PIDs[0][0] = Math.round(this.PID_DEFAULT[0] * this.PDGainSliderValue);