diff options
| -rwxr-xr-x | _locales/en/messages.json | 12 | ||||
| -rw-r--r-- | js/defaults_dialog.js | 4 | ||||
| -rw-r--r-- | src/css/tabs/pid_tuning.css | 5 | ||||
| -rw-r--r-- | tabs/advanced_tuning.html | 35 | ||||
| -rw-r--r-- | tabs/pid_tuning.html | 9 |
5 files changed, 50 insertions, 15 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json index b075b319..3998a1b0 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2901,6 +2901,12 @@ "pitchToThrottleHelp": { "message": "In navigation modes, each degree of climb will add this many units to the cruise throttle. Conversely, each degree of diving will substract from it." }, + "minThrottleDownPitch": { + "message": "Min Throttle Down Pitch" + }, + "minThrottleDownPitchHelp": { + "message": "Automatic pitch down angle when throttle is at 0 in angle mode. Progressively applied between cruise throttle and zero throttle." + }, "pitchToThrottleSmoothing": { "message": "Throttle smoothing" }, @@ -4344,6 +4350,12 @@ "throttle_scale_help": { "message": "Allow to limit effective power fed to the motors. Throttle Scale 1 mean there is no power limiting. Throttle Scale 0.5 means throttle position will be cut in half before passed to the motors." }, + "pidTuning_MatrixFilterType": { + "message": "Matrix Filter Type" + }, + "pidTuning_MatrixFilterTypeHelp": { + "message": "Defines the type of Matrix Filter. Default 2D filter is recommended for most users. 7-inch and larger quads may benefit from 3D filter." + }, "nmeaWarning": { "message": "NMEA protocol is deprecated and might be removed in the future. Please use UBLOX or UBLOX7 protocol instead." } diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index bba8ba44..abcacdda 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -260,6 +260,10 @@ helper.defaultsDialog = (function () { value: "ON" }, { + key: "dynamic_gyro_notch_mode", + value: "3D" + }, + { key: "dynamic_gyro_notch_q", value: 250 }, diff --git a/src/css/tabs/pid_tuning.css b/src/css/tabs/pid_tuning.css index fb744c92..21cb7e7b 100644 --- a/src/css/tabs/pid_tuning.css +++ b/src/css/tabs/pid_tuning.css @@ -313,6 +313,11 @@ float: left; } +.tab-pid_tuning .pidTuning_select { + clear: left; + padding: 2px 6px 2px 1px; +} + .tab-pid_tuning .number input { width: 50px; padding-left: 3px; diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html index e1a81a4c..158410cd 100644 --- a/tabs/advanced_tuning.html +++ b/tabs/advanced_tuning.html @@ -104,16 +104,19 @@ <div class="spacer_box_title" data-i18n="fixedWingNavigationConfiguration"></div> </div> <div class="spacer_box"> + <div class="number"> + <input id="minThrottle" type="number" data-unit="us" data-setting="nav_fw_min_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> + <label for="minThrottle"><span data-i18n="minThrottle"></span></label> + </div> <div class="number"> - <input id="cruiseThrottle" type="number" data-unit="us" data-setting="nav_fw_cruise_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> - <label for="cruiseThrottle"><span data-i18n="cruiseThrottle"></span></label> + <input id="maxThrottle" type="number" data-unit="us" data-setting="nav_fw_max_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> + <label for="maxThrottle"><span data-i18n="maxThrottle"></span></label> </div> <div class="number"> - <input id="pitchToThrottle" type="number" data-unit="us" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" /> - <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label> - <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div> + <input id="cruiseThrottle" type="number" data-unit="us" data-setting="nav_fw_cruise_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> + <label for="cruiseThrottle"><span data-i18n="cruiseThrottle"></span></label> </div> <div class="checkbox"> @@ -123,13 +126,15 @@ </div> <div class="number"> - <input id="minThrottle" type="number" data-unit="us" data-setting="nav_fw_min_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> - <label for="minThrottle"><span data-i18n="minThrottle"></span></label> + <input id="minThrottleDownPitch" type="number" data-unit="decideg" data-setting="fw_min_throttle_down_pitch" data-setting-multiplier="1" step="1" min="0" max="450" /> + <label for="minThrottleDownPitch"><span data-i18n="minThrottleDownPitch"></span></label> + <div for="minThrottleDownPitch" class="helpicon cf_tip" data-i18n_title="minThrottleDownPitchHelp"></div> </div> <div class="number"> - <input id="maxThrottle" type="number" data-unit="us" data-setting="nav_fw_max_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" /> - <label for="maxThrottle"><span data-i18n="maxThrottle"></span></label> + <input id="pitchToThrottle" type="number" data-unit="us" data-setting="nav_fw_pitch2thr" data-setting-multiplier="1" step="1" min="0" max="100" /> + <label for="pitchToThrottle"><span data-i18n="pitchToThrottle"></span></label> + <div for="pitchToThrottle" class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div> </div> <div class="number"> @@ -145,12 +150,6 @@ </div> <div class="number"> - <input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" /> - <label for="cruiseYawRate"><span data-i18n="cruiseYawRateLabel"></span></label> - <div for="cruiseYawRate" class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div> - </div> - - <div class="number"> <input id="maxBankAngle" type="number" data-unit="deg" data-setting="nav_fw_bank_angle" data-setting-multiplier="1" step="1" min="5" max="80" /> <label for="maxBankAngle"><span data-i18n="maxBankAngle"></span></label> <div for="maxBankAngle" class="helpicon cf_tip" data-i18n_title="maxBankAngleHelp"></div> @@ -169,6 +168,12 @@ </div> <div class="number"> + <input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" /> + <label for="cruiseYawRate"><span data-i18n="cruiseYawRateLabel"></span></label> + <div for="cruiseYawRate" class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div> + </div> + + <div class="number"> <input id="loiterRadius" type="number" data-unit="cm" data-setting="nav_fw_loiter_radius" data-setting-multiplier="1" step="1" min="0" max="30000" /> <label for="loiterRadius"><span data-i18n="loiterRadius"></span></label> </div> diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html index 0f1fafb6..df37100c 100644 --- a/tabs/pid_tuning.html +++ b/tabs/pid_tuning.html @@ -357,6 +357,15 @@ </td> </tr> <tr> + <th data-i18n="pidTuning_MatrixFilterType"></th> + <td> + <div class="pidTuning_select"> + <select id="matrixFilterType" data-setting="dynamic_gyro_notch_mode" /> + <div for="matrixFilterType" class="helpicon cf_tip" data-i18n_title="pidTuning_MatrixFilterTypeHelp"></div> + </div> + </td> + </tr> + <tr> <th data-i18n="pidTuning_MatrixFilterMinFrequency"></th> <td> <div class="pidTuning_number"> |