Merge pull request #2230 from iNavFlight/MrD_Changes-for-MSP-RC-(mLRS)

iNavFlight · Nov 10, 2024 · d48adce · d48adce
2 parents 1c75285 + 915900f
commit d48adce
Show file tree

Hide file tree

Showing 29 changed files with 862 additions and 822 deletions.
diff --git a/js/logicConditionOperantTypes.js b/js/logicConditionOperantTypes.js
@@ -49,8 +49,8 @@ const OPERAND_TYPES = {
             26: "Stabilized Pitch",
             27: "Stabilized Yaw",
             28: "3D home distance [m]",
-            29: "CRSF LQ",
-            30: "CRSF SNR",
+            29: "Uplink LQ",
+            30: "SNR",
             31: "GPS Valid Fix",
             32: "Loiter Radius [cm]",
             33: "Active Control Profile",
@@ -64,6 +64,8 @@ const OPERAND_TYPES = {
             41: "FW Land State",
             42: "Active Battery Profile",
             43: "Flown Loiter Radius [m]",
+            44: "Downlink LQ",
+            45: "Uplink RSSI dBm",
         }
     },
     3: {

diff --git a/locale/en/messages.json b/locale/en/messages.json
@@ -3825,19 +3825,19 @@
         "message": "Maximum ESC temperature"
     },
     "osd_snr_alarm": {
-        "message": "CRSF SNR Alarm Level"
+        "message": "SNR Alarm Level"
     },
     "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": "CRSF Link Quality Alarm"
+        "message": "Link Quality Alarm"
     },
     "osdalarmLQ_HELP": {
         "message": "For Crossfire use 70%. For Tracer use 50%."
     },
     "osd_rssi_dbm_alarm": {
-        "message": "CRSF RSSI dBm Alarm"
+        "message": "RSSI dBm Alarm"
     },
     "osd_adsb_distance_warning": {
         "message": "ADSB distance warning"
@@ -3884,8 +3884,8 @@
     "osdGroupVTX": {
         "message": "VTX"
     },
-    "osdGroupCRSF": {
-        "message": "CRSF RX Statistics"
+    "osdGroupRx": {
+        "message": "RX Statistics"
     },
     "osdGroupMapsAndRadars": {
         "message": "Maps & Radars"
@@ -4112,24 +4112,30 @@
     "osdElement_VTX_CHANNEL_HELP": {
         "message": "Shows the current band and channel of the VTX. Requires either a VTX with SmartAudio or Tramp or either a VTX integrated in the flight controller."
     },
-    "osdElement_CRSF_RSSI_DBM": {
+    "osdElement_RSSI_DBM": {
         "message": "RX RSSI in dBm"
     },
-    "osdElement_CRSF_LQ": {
-        "message": "RX Link Quality %"
+    "osdElement_LQ_UPLINK": {
+        "message": "RX Uplink Quality %"
     },
-    "osdElement_CRSF_LQ_HELP": {
-        "message": "Use Crossfire LQ Format setting to select format type."
+    "osdElement_LQ_UPLINK_HELP": {
+        "message": "If using CRSF, use Crossfire LQ Format setting to select format type."
     },
-    "osdElement_CRSF_SNR_DB": {
+    "osdElement_LQ_DOWNLINK": {
+        "message": "RX Downlink Quality %"
+    },
+    "osdElement_SNR_DB": {
         "message": "RX Uplink SNR in dB"
     },
-    "osdElement_CRSF_SNR_DB_HELP": {
+    "osdElement_SNR_DB_HELP": {
         "message": "Shown only when SNR goes below alarm level. At 0dB, received signal level equals noise floor level."
     },
-    "osdElement_CRSF_TX_POWER": {
+    "osdElement_TX_POWER_UPLINK": {
         "message": "TX power in mW"
     },
+    "osdElement_OSD_RX_POWER_DOWNLINK": {
+        "message": "RX power in mW"
+    },
     "osdElement_MAP_NORTH": {
         "message": "Map (Up is north)"
     },

diff --git a/resources/osd/INAV Character Map.md b/resources/osd/INAV Character Map.md
@@ -286,6 +286,8 @@
 | ![Crosshair centre](/resources/osd/digital/default/24x36/358.png) | SYM_AH_CH_CENTER           | SYM.AH_CROSSHAIRS            | Default crosshair centre              | 358        | 0x166         |
 | ![Flight dist rem](/resources/osd/digital/default/24x36/359.png)  | SYM_FLIGHT_DIST_REMAINING  | SYM.FLIGHT_DIST_REMAINING    | Flight distance remaining             | 359        | 0x167         |
 | ![Odometer](/resources/osd/digital/default/24x36/360.png)         | SYM_ODOMETER               | SYM.ODOMETER                 | Odometer (total aircraft distance)    | 360        | 0x168         |
+| ![RX Band](/resources/osd/digital/default/24x36/361.png)          | SYM_RX_BAND                | SYM.RX_BAND                  | Frequency band used by RX             | 361        | 0x169         |
+| ![RX Mode](/resources/osd/digital/default/24x36/362.png)          | SYM_RX_MODE                | SYM.RX_MODE                  | Mode used by RX (150HZ for example)   | 362        | 0x16A         |
 | ![Crosshair 3](/resources/osd/digital/default/24x36/400_402.png)  | SYM_AH_CH_TYPE3            | SYM.AH_CROSSHAIRS            | Crosshair type 3                      | 400 - 402  | 0x190 - 0x192 |
 | ![Crosshair 4](/resources/osd/digital/default/24x36/403_405.png)  | SYM_AH_CH_TYPE4            | SYM.AH_CROSSHAIRS            | Crosshair type 4                      | 403 - 405  | 0x193 - 0x195 |
 | ![Crosshair 5](/resources/osd/digital/default/24x36/406_408.png)  | SYM_AH_CH_TYPE5            | SYM.AH_CROSSHAIRS            | Crosshair type 5                      | 406 - 408  | 0x196 - 0x198 |

diff --git a/resources/osd/analogue/bold.mcm b/resources/osd/analogue/bold.mcm
@@ -23103,11 +23103,60 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
 01010101
 01010101
+01010010
+00000101
 01010101
+01010010
+00100001
 01010101
+01010010
+00100000
 01010101
+01010010
+00100010
+00010101
+01000000
+01000100
+00010101
+00101010
+00010010
+10000101
+00100000
+10001000
+00100001
+00101010
+00001010
+10100001
+00100000
+10001000
+00100001
+00101010
+00001000
+00100001
+01000000
+00010000
+00000101
+00100000
+10001010
+10000101
+00101000
+10001000
+00100001
+00101000
+10001000
+00100001
+00100010
+10001000
+00100001
+00100000
+10001010
+10000101
+01000101
+00010000
+00010101
 01010101
 01010101
 01010101
@@ -23118,109 +23167,60 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
 01010101
 01010101
+01010010
+00000101
 01010101
+01010010
+00100001
 01010101
+01010010
+00100000
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+00100010
+00010101
+01000000
+00000100
+00000101
+00101000
+10100000
+10100001
+00100010
+00100010
+00001000
+00100010
+00100010
+00001000
+00100000
+00100010
+00001000
+00100001
+00100000
+10100001
+01000000
+00000100
+00000001
+00101010
+10000010
+10101000
+00100000
+00100010
+00000001
+00100001
+00100010
+10100001
+00100000
+00100010
+00000001
+00101010
+10000010
+10101000
+01000000
+00010100
+00000001
 01010101
 01010101
 01010101

diff --git a/resources/osd/analogue/bold.png b/resources/osd/analogue/bold.png