Merge pull request #2249 from Scavanger/Gyro-Lpf-Slider-Fix

Dynamic Gyro LPF Fix
iNavFlight · Nov 16, 2024 · ffdf110 · ffdf110
2 parents 1a291dc + 1c38aef
commit ffdf110
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 38 deletions.
diff --git a/js/defaults_dialog_entries.js b/js/defaults_dialog_entries.js
@@ -192,10 +192,6 @@ var defaultsDialogData = [
             /*
             Dynamic gyro LPF
             */
-            {
-                key: "gyro_use_dyn_lpf",
-                value: "ON"
-            },
             {
                 key: "gyro_dyn_lpf_min_hz",
                 value: 85

diff --git a/locale/en/messages.json b/locale/en/messages.json
@@ -1683,12 +1683,6 @@
     "pidTuning_Manual_Yaw": {
         "message": "Yaw (%)"
     },
-    "pidTuning_gyro_use_dyn_lpf": {
-        "message": "Dynamic gyro LPF"
-    },
-    "pidTuning_gyro_use_dyn_lpf_help": {
-        "message": "When enabled, main gyro LPF frequency is automatically adjusted based on the current throttle position. When disabled, static LPF cutoff frequency is used."
-    },
     "pidTuning_gyro_dyn_lpf_min_hz": {
         "message": "Dynamic gyro LPF min. cutoff"
     },

diff --git a/locale/uk/messages.json b/locale/uk/messages.json
@@ -1670,12 +1670,6 @@
     "pidTuning_Manual_Yaw": {
         "message": "Рискання (%)"
     },
-    "pidTuning_gyro_use_dyn_lpf": {
-        "message": "Динамічний НЧФ гіроскопа"
-    },
-    "pidTuning_gyro_use_dyn_lpf_help": {
-        "message": "Коли увімкнено, основна частота LPF гіроскопа автоматично коригується на основі поточного положення тяги. Коли вимкнено, використовується статична частота зрізу LPF."
-    },
     "pidTuning_gyro_dyn_lpf_min_hz": {
         "message": "Динамічний ФНЧ гіроскопа, мін. частота зрізу"
     },

diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
@@ -647,15 +647,6 @@ <h3 data-i18n="pidTuning_RateDynamics_Weight"></h3>
             <div class="cf_column not-for-ez-tune">
                 <table class="settings-table settings-table--filtering not-for-ez-tune">
                     <tbody>
-                        <tr>
-                            <th data-i18n="pidTuning_gyro_use_dyn_lpf" style="height: 24px;"></th>
-                            <td>
-                                <div class="pidTuning_select">
-                                    <input id="gyro_use_dyn_lpf" type="checkbox" class="toggle update_preview" data-setting="gyro_use_dyn_lpf"/>
-                                    <div for="gyro_use_dyn_lpf" class="helpicon cf_tip" data-i18n_title="pidTuning_gyro_use_dyn_lpf_help"></div>
-                                </div>
-                            </td>
-                        </tr>
                         <tr class="for_static_gyro_lpf">
                             <th data-i18n="pidTuning_gyro_main_lpf_hz"></th>
                             <td>
@@ -706,7 +697,7 @@ <h3 data-i18n="pidTuning_RateDynamics_Weight"></h3>
                             <th data-i18n="pidTuning_MatrixFilterType"></th>
                             <td>
                                 <div class="pidTuning_select">
-                                    <select id="matrixFilterType" data-setting="dynamic_gyro_notch_mode" />
+                                    <select id="matrixFilterType" data-setting="dynamic_gyro_notch_mode">
                                     <div for="matrixFilterType" class="helpicon cf_tip" data-i18n_title="pidTuning_MatrixFilterTypeHelp"></div>
                                 </div>
                             </td>

diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
@@ -450,18 +450,6 @@ TABS.pid_tuning.initialize = function (callback) {
             mspHelper.savePidData(send_rc_tuning_changes); 
         });
 
-        $('#gyro_use_dyn_lpf').on('change', function () {
-
-            if ($(this).is(':checked')) {
-                $('.for_dynamic_gyro_lpf').show();
-                $('.for_static_gyro_lpf').hide();
-            } else {
-                $('.for_dynamic_gyro_lpf').hide();
-                $('.for_static_gyro_lpf').show();
-            }
-
-        }).trigger('change');
-
         GUI.content_ready(callback);
     }
 };