1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-18 05:45:25 +03:00

Fixed range for Dterm tetpoint transition, fixed outdated naming of Dterm setpoint transition.

This commit is contained in:
mikeller 2018-01-14 12:58:41 +13:00
parent f728e441d8
commit 2dd786bd08
5 changed files with 22 additions and 22 deletions

View file

@ -1065,13 +1065,13 @@
"receiverRcInterpolationInterval": { "receiverRcInterpolationInterval": {
"message": "RC Interpolation Interval [ms]" "message": "RC Interpolation Interval [ms]"
}, },
"pidTuningPtermSetpoint": { "pidTuningDtermSetpointTransition": {
"message": "D Setpoint transition" "message": "D Setpoint transition"
}, },
"pidTuningDtermSetpoint": { "pidTuningDtermSetpoint": {
"message": "D Setpoint Weight" "message": "D Setpoint Weight"
}, },
"pidTuningPtermSetpointHelp": { "pidTuningDtermSetpointTransitionHelp": {
"message": "With this parameter, D Setpoint Weight can be reduced near the center of the sticks, which results in smoother end of flips and rolls.<br> The value represents a point of stick deflection: 0 - stick centered, 1 - full deflection. When the stick is above that point, Setpoint Weight is kept constant at its configured value. When the stick is positioned below that point, Setpoint Weight is reduced proportionally, reaching 0 at the stick center position.<br> Value of 1 gives maximum smoothing effect, while value of 0 keeps the Setpoint Weight fixed at its configured value over the whole stick range." "message": "With this parameter, D Setpoint Weight can be reduced near the center of the sticks, which results in smoother end of flips and rolls.<br> The value represents a point of stick deflection: 0 - stick centered, 1 - full deflection. When the stick is above that point, Setpoint Weight is kept constant at its configured value. When the stick is positioned below that point, Setpoint Weight is reduced proportionally, reaching 0 at the stick center position.<br> Value of 1 gives maximum smoothing effect, while value of 0 keeps the Setpoint Weight fixed at its configured value over the whole stick range."
}, },
"pidTuningDtermSetpointHelp": { "pidTuningDtermSetpointHelp": {

View file

@ -348,7 +348,7 @@ var FC = {
yaw_p_limit: 0, yaw_p_limit: 0,
deltaMethod: 0, deltaMethod: 0,
vbatPidCompensation: 0, vbatPidCompensation: 0,
ptermSetpointWeight: 0, dtermSetpointTransition: 0,
dtermSetpointWeight: 0, dtermSetpointWeight: 0,
toleranceBand: 0, toleranceBand: 0,
toleranceBandReduction: 0, toleranceBandReduction: 0,

View file

@ -845,7 +845,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
ADVANCED_TUNING.deltaMethod = data.readU8(); ADVANCED_TUNING.deltaMethod = data.readU8();
ADVANCED_TUNING.vbatPidCompensation = data.readU8(); ADVANCED_TUNING.vbatPidCompensation = data.readU8();
if (semver.gte(CONFIG.apiVersion, "1.20.0")) { if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
ADVANCED_TUNING.ptermSetpointWeight = data.readU8(); ADVANCED_TUNING.dtermSetpointTransition = data.readU8();
ADVANCED_TUNING.dtermSetpointWeight = data.readU8(); ADVANCED_TUNING.dtermSetpointWeight = data.readU8();
ADVANCED_TUNING.toleranceBand = data.readU8(); ADVANCED_TUNING.toleranceBand = data.readU8();
ADVANCED_TUNING.toleranceBandReduction = data.readU8(); ADVANCED_TUNING.toleranceBandReduction = data.readU8();
@ -1471,7 +1471,7 @@ MspHelper.prototype.crunch = function(code) {
.push16(ADVANCED_TUNING.yaw_p_limit) .push16(ADVANCED_TUNING.yaw_p_limit)
.push8(ADVANCED_TUNING.deltaMethod) .push8(ADVANCED_TUNING.deltaMethod)
.push8(ADVANCED_TUNING.vbatPidCompensation) .push8(ADVANCED_TUNING.vbatPidCompensation)
.push8(ADVANCED_TUNING.ptermSetpointWeight) .push8(ADVANCED_TUNING.dtermSetpointTransition)
.push8(ADVANCED_TUNING.dtermSetpointWeight) .push8(ADVANCED_TUNING.dtermSetpointWeight)
.push8(ADVANCED_TUNING.toleranceBand) .push8(ADVANCED_TUNING.toleranceBand)
.push8(ADVANCED_TUNING.toleranceBandReduction) .push8(ADVANCED_TUNING.toleranceBandReduction)

View file

@ -309,15 +309,15 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="ptermSetpoint"> <tr class="dtermSetpointTransition">
<td><input type="number" name="ptermSetpoint-number" step="0.01" min="0.00" max="1.00"/></td> <td><input type="number" name="dtermSetpointTransition-number" step="0.01" min="0.01" max="1.00"/></td>
<td class="slider"><input type="range" name="ptermSetpoint-range" step="0.01" min="0.0" max="1.00"/></td> <td class="slider"><input type="range" name="dtermSetpointTransition-range" step="0.01" min="0.01" max="1.00"/></td>
<td colspan="2"> <td colspan="2">
<div> <div>
<label> <label>
<span i18n="pidTuningPtermSetpoint"></span> <span i18n="pidTuningDtermSetpointTransition"></span>
</label> </label>
<div class="helpicon cf_tip" i18n_title="pidTuningPtermSetpointHelp"></div> <div class="helpicon cf_tip" i18n_title="pidTuningDtermSetpointTransitionHelp"></div>
</div> </div>
</td> </td>
</tr> </tr>

View file

@ -236,8 +236,8 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_filter input[name="dTermNotchFrequency"]').val(FILTER_CONFIG.dterm_notch_hz); $('.pid_filter input[name="dTermNotchFrequency"]').val(FILTER_CONFIG.dterm_notch_hz);
$('.pid_filter input[name="dTermNotchCutoff"]').val(FILTER_CONFIG.dterm_notch_cutoff); $('.pid_filter input[name="dTermNotchCutoff"]').val(FILTER_CONFIG.dterm_notch_cutoff);
$('input[name="ptermSetpoint-number"]').val(ADVANCED_TUNING.ptermSetpointWeight / 100); $('input[name="dtermSetpointTransition-number"]').val(ADVANCED_TUNING.dtermSetpointTransition / 100);
$('input[name="ptermSetpoint-range"]').val(ADVANCED_TUNING.ptermSetpointWeight / 100); $('input[name="dtermSetpointTransition-range"]').val(ADVANCED_TUNING.dtermSetpointTransition / 100);
$('input[name="dtermSetpoint-number"]').val(ADVANCED_TUNING.dtermSetpointWeight / 100); $('input[name="dtermSetpoint-number"]').val(ADVANCED_TUNING.dtermSetpointWeight / 100);
$('input[name="dtermSetpoint-range"]').val(ADVANCED_TUNING.dtermSetpointWeight / 100); $('input[name="dtermSetpoint-range"]').val(ADVANCED_TUNING.dtermSetpointWeight / 100);
@ -388,7 +388,7 @@ TABS.pid_tuning.initialize = function (callback) {
} }
if (semver.gte(CONFIG.apiVersion, "1.20.0")) { if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
ADVANCED_TUNING.ptermSetpointWeight = parseInt($('input[name="ptermSetpoint-number"]').val() * 100); ADVANCED_TUNING.dtermSetpointTransition = parseInt($('input[name="dtermSetpointTransition-number"]').val() * 100);
ADVANCED_TUNING.dtermSetpointWeight = parseInt($('input[name="dtermSetpoint-number"]').val() * 100); ADVANCED_TUNING.dtermSetpointWeight = parseInt($('input[name="dtermSetpoint-number"]').val() * 100);
FILTER_CONFIG.gyro_soft_notch_hz_1 = parseInt($('.pid_filter input[name="gyroNotch1Frequency"]').val()); FILTER_CONFIG.gyro_soft_notch_hz_1 = parseInt($('.pid_filter input[name="gyroNotch1Frequency"]').val());
@ -623,13 +623,13 @@ TABS.pid_tuning.initialize = function (callback) {
}); });
}); });
var ptermNumberElement = $('input[name="ptermSetpoint-number"]'); var dtermTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]');
var ptermRangeElement = $('input[name="ptermSetpoint-range"]'); var dtermTransitionRangeElement = $('input[name="dtermSetpointTransition-range"]');
ptermNumberElement.change(function () { dtermTransitionNumberElement.change(function () {
ptermRangeElement.val($(this).val()); dtermTransitionRangeElement.val($(this).val());
}); });
ptermRangeElement.change(function () { dtermTransitionRangeElement.change(function () {
ptermNumberElement.val($(this).val()); dtermTransitionNumberElement.val($(this).val());
}); });
var dtermNumberElement = $('input[name="dtermSetpoint-number"]'); var dtermNumberElement = $('input[name="dtermSetpoint-number"]');
@ -643,7 +643,7 @@ TABS.pid_tuning.initialize = function (callback) {
} else { } else {
$('.tab-pid_tuning .rate_profile').hide(); $('.tab-pid_tuning .rate_profile').hide();
$('#pid-tuning .ptermSetpoint').hide(); $('#pid-tuning .dtermSetpointTransition').hide();
$('#pid-tuning .dtermSetpoint').hide(); $('#pid-tuning .dtermSetpoint').hide();
} }
@ -1153,12 +1153,12 @@ TABS.pid_tuning.updatePidControllerParameters = function () {
$('#pid-tuning .delta').show(); $('#pid-tuning .delta').show();
$('#pid-tuning .ptermSetpoint').hide(); $('#pid-tuning .dtermSetpointTransition').hide();
$('#pid-tuning .dtermSetpoint').hide(); $('#pid-tuning .dtermSetpoint').hide();
} else { } else {
$('.pid_tuning .YAW_JUMP_PREVENTION').hide(); $('.pid_tuning .YAW_JUMP_PREVENTION').hide();
$('#pid-tuning .ptermSetpoint').show(); $('#pid-tuning .dtermSetpointTransition').show();
$('#pid-tuning .dtermSetpoint').show(); $('#pid-tuning .dtermSetpoint').show();
$('#pid-tuning .delta').hide(); $('#pid-tuning .delta').hide();