Merge pull request #3 from iNavFlight/master

Merge from inav-configurator master
iNavFlight · Nov 8, 2020 · c837efe · c837efe
2 parents e2537ce + 690644f
commit c837efe
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -1031,11 +1031,8 @@
     "pidTuningFeedForward": {
         "message": "FeedForward"
     },
-    "dtermSetpointWeight": {
-        "message": "Dterm setpoint weight"
-    },
-    "dtermSetpointWeightHelp": {
-        "message": "The lower the value, the more damped all the maneuvers are. 0 mean Dterm is computed from gyro, 1 from error and 2 from setpoint. For gentler feel lower the value. For sharper response, raise it"
+    "pidTuningControlDerivative": {
+        "message": "Constrol Derivative"
     },
     "pidTuningRollPitchRate": {
         "message": "ROLL &amp; PITCH rate"
@@ -2647,6 +2644,12 @@
     "osdalarmSNR_HELP": {
         "message": "SNR is only shown below this value. 0dB (1:1 ratio), indicates that received signal equals noise floor."
     },
+    "osd_link_quality_alarm": {
+        "message": "Crossfire Link Quality Alarm"
+    },
+    "osdalarmLQ_HELP": {
+        "message": "For Crossfire use 70%. For Tracer use 50%."
+    },
     "osdGroupGeneral": {
         "message": "General"
     },
@@ -2873,10 +2876,10 @@
         "message": "RX RSSI in dBm"
     },
     "osdElement_CRSF_LQ": {
-        "message": "RX Link Quality%"
+        "message": "RX Link Quality %"
     },
     "osdElement_CRSF_LQ_HELP": {
-        "message": "STYLE1 shows LQ% as used by TBS. STYLE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and Link Quality % [0..100%]"
+        "message": "STYLE1 shows LQ% as used by TBS hardware. STYLE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 and LQ [0..100%]."
     },
     "osdElement_CRSF_SNR_DB": {
         "message": "RX Uplink SNR in dB"
@@ -3361,12 +3364,6 @@
     "itermRelaxHelp": {
         "message": "Defines Iterm relaxation algorithm activation. PR mean it's active on Roll and Pitch axis. PRY is active also on Yaw."
     },
-    "itermRelaxType": {
-        "message": "Iterm Relax Type"
-    },
-    "itermRelaxTypeHelp": {
-        "message": "GYRO mode is more clinical and complete in suppressing iTerm, SETPOINT mode is a bit smoother with slightly softer landings after flips."
-    },
     "itermRelaxCutoff": {
         "message": "Iterm Relax Cutoff Frequency"
     },

diff --git a/js/fc.js b/js/fc.js
@@ -66,11 +66,14 @@ var FC = {
     MAX_SERVO_RATE: 125,
     MIN_SERVO_RATE: 0,
     isRpyFfComponentUsed: function () {
-        return (MIXER_CONFIG.platformType == PLATFORM_AIRPLANE || MIXER_CONFIG.platformType == PLATFORM_ROVER || MIXER_CONFIG.platformType == PLATFORM_BOAT) || (MIXER_CONFIG.platformType == PLATFORM_MULTIROTOR && semver.gte(CONFIG.flightControllerVersion, "2.6.0"));
+        return (MIXER_CONFIG.platformType == PLATFORM_AIRPLANE || MIXER_CONFIG.platformType == PLATFORM_ROVER || MIXER_CONFIG.platformType == PLATFORM_BOAT) || ((MIXER_CONFIG.platformType == PLATFORM_MULTIROTOR || MIXER_CONFIG.platformType == PLATFORM_TRICOPTER) && semver.gte(CONFIG.flightControllerVersion, "2.6.0"));
     },
     isRpyDComponentUsed: function () {
         return MIXER_CONFIG.platformType == PLATFORM_MULTIROTOR || MIXER_CONFIG.platformType == PLATFORM_TRICOPTER;
     },
+    isCdComponentUsed: function () {
+        return FC.isRpyDComponentUsed();
+    },
     resetState: function () {
         SENSOR_STATUS = {
             isHardwareHealthy: 0,

diff --git a/tabs/osd.html b/tabs/osd.html
@@ -167,6 +167,11 @@ <h1 class="tab_title">
                                 <input id="snr_alarm" data-setting="osd_snr_alarm" data-setting-multiplier="1" type="number" data-step="1" />
                                 <span data-i18n="osd_snr_alarm"></span>
                             </label>
+                            <div class="helpicon cf_tip" data-i18n_title="osdalarmLQ_HELP"></div>
+                            <label for="link_quality_alarm">
+                                <input id="link_quality_alarm" data-setting="osd_link_quality_alarm" data-setting-multiplier="1" type="number" data-step="1" />
+                                <span data-i18n="osd_link_quality_alarm"></span>
+                            </label>
                         </div>
                     </div>
                 </div>

diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
@@ -508,13 +508,6 @@
                                 <div class="helpicon cf_tip" data-i18n_title="itermRelaxCutoffHelp"></div>
                             </td>
                         </tr>
-                        <tr>
-                            <th data-i18n="itermRelaxType"></th>
-                            <td>
-                                <select data-setting="mc_iterm_relax_type" />
-                                <div class="helpicon cf_tip" data-i18n_title="itermRelaxTypeHelp"></div>
-                            </td>
-                        </tr>
                         <tr>
                             <th data-i18n="antigravityGain"></th>
                             <td>
@@ -542,13 +535,6 @@
             <div class="cf_column">
                 <table class="settings-table settings-table--filtering">
                     <tbody>
-                        <tr>
-                            <th data-i18n="dtermSetpointWeight"></th>
-                            <td>
-                                <input type="number" data-setting="dterm_setpoint_weight" class="rate-tpa_input" />
-                                <div class="helpicon cf_tip" data-i18n_title="dtermSetpointWeightHelp"></div>
-                            </td>
-                        </tr>
                         <tr>
                             <th data-i18n="d_boost_factor"></th>
                             <td>

diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
@@ -112,6 +112,11 @@ TABS.pid_tuning.initialize = function (callback) {
         // translate to user-selected language
         localize();
 
+        if (FC.isCdComponentUsed()) {
+            $('th.feedforward').html(chrome.i18n.getMessage('pidTuningControlDerivative'));
+            $('th.feedforward').attr('title', chrome.i18n.getMessage('pidTuningControlDerivative'));
+        }
+
         if (semver.gte(CONFIG.flightControllerVersion, "2.4.0")) {
             $('.requires-v2_4').show();
         } else {