diff --git a/locales/en/messages.json b/locales/en/messages.json index 00c1796a..9cf0cdb5 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -1258,6 +1258,9 @@ "pidTuningDtermSetpointHelp": { "message": "This parameter determines the stick accelerating effect within derivative component.
Value of 0 equals to old Measuemenent method where D only tracks gyro, while value of 1 equals to old Error method with equal gyro and stick tracking ratio.
Lower value equals to slower/smoother stick response, while higher value provides more stick acceleration response.
Note that RC interpolation is recommended to be enabled with higher values to prevent control kicks making noise." }, + "pidTuningDtermSetpointTransitionWarning": { + "message": "Warning:<\/strong> The use of a D Setpoint transition between 0 and 0.1 is highly discouraged. Doing so will lead to a 'jump' around the midpoint of the sticks.<\/span>" + }, "pidTuningProportional": { "message": "Proportional" }, diff --git a/src/css/main.css b/src/css/main.css index eb1f0d4c..8d4f3805 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -111,11 +111,11 @@ input[type="number"]::-webkit-inner-spin-button { } .message-positive { - color: #ffbb00; + color: #ffbb00 !important; } .message-negative { - color: red; + color: red !important; } .headerbar { diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js index ca2ee5f5..743040f3 100755 --- a/src/js/tabs/pid_tuning.js +++ b/src/js/tabs/pid_tuning.js @@ -685,10 +685,23 @@ TABS.pid_tuning.initialize = function (callback) { var dtermTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]'); var dtermTransitionRangeElement = $('input[name="dtermSetpointTransition-range"]'); + var dtermTransitionWarningElement = $('#pid-tuning .dtermSetpointTransitionWarning'); + + function checkUpdateDtermTransitionWarning(value) { + if (value > 0 && value < 0.1) { + dtermTransitionWarningElement.show(); + } else { + dtermTransitionWarningElement.hide(); + } + } + checkUpdateDtermTransitionWarning(dtermTransitionNumberElement.val()); + dtermTransitionNumberElement.change(function () { + checkUpdateDtermTransitionWarning($(this).val()); dtermTransitionRangeElement.val($(this).val()); }); dtermTransitionRangeElement.change(function () { + checkUpdateDtermTransitionWarning($(this).val()); dtermTransitionNumberElement.val($(this).val()); }); diff --git a/src/tabs/pid_tuning.html b/src/tabs/pid_tuning.html index 965057cc..267aa287 100755 --- a/src/tabs/pid_tuning.html +++ b/src/tabs/pid_tuning.html @@ -314,10 +314,16 @@
- - + + - + + + + + + +
+