1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-13 19:40:22 +03:00

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

This commit is contained in:
Darren Lines 2024-11-10 10:43:43 +00:00 committed by GitHub
commit d48adcebd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 1022 additions and 982 deletions

View file

@ -49,8 +49,8 @@ const OPERAND_TYPES = {
26: "Stabilized Pitch", 26: "Stabilized Pitch",
27: "Stabilized Yaw", 27: "Stabilized Yaw",
28: "3D home distance [m]", 28: "3D home distance [m]",
29: "CRSF LQ", 29: "Uplink LQ",
30: "CRSF SNR", 30: "SNR",
31: "GPS Valid Fix", 31: "GPS Valid Fix",
32: "Loiter Radius [cm]", 32: "Loiter Radius [cm]",
33: "Active Control Profile", 33: "Active Control Profile",
@ -64,6 +64,8 @@ const OPERAND_TYPES = {
41: "FW Land State", 41: "FW Land State",
42: "Active Battery Profile", 42: "Active Battery Profile",
43: "Flown Loiter Radius [m]", 43: "Flown Loiter Radius [m]",
44: "Downlink LQ",
45: "Uplink RSSI dBm",
} }
}, },
3: { 3: {

View file

@ -3825,19 +3825,19 @@
"message": "Maximum ESC temperature" "message": "Maximum ESC temperature"
}, },
"osd_snr_alarm": { "osd_snr_alarm": {
"message": "CRSF SNR Alarm Level" "message": "SNR Alarm Level"
}, },
"osdalarmSNR_HELP": { "osdalarmSNR_HELP": {
"message": "SNR is only shown below this value. 0dB (1:1 ratio), indicates that received signal equals noise floor." "message": "SNR is only shown below this value. 0dB (1:1 ratio), indicates that received signal equals noise floor."
}, },
"osd_link_quality_alarm": { "osd_link_quality_alarm": {
"message": "CRSF Link Quality Alarm" "message": "Link Quality Alarm"
}, },
"osdalarmLQ_HELP": { "osdalarmLQ_HELP": {
"message": "For Crossfire use 70%. For Tracer use 50%." "message": "For Crossfire use 70%. For Tracer use 50%."
}, },
"osd_rssi_dbm_alarm": { "osd_rssi_dbm_alarm": {
"message": "CRSF RSSI dBm Alarm" "message": "RSSI dBm Alarm"
}, },
"osd_adsb_distance_warning": { "osd_adsb_distance_warning": {
"message": "ADSB distance warning" "message": "ADSB distance warning"
@ -3884,8 +3884,8 @@
"osdGroupVTX": { "osdGroupVTX": {
"message": "VTX" "message": "VTX"
}, },
"osdGroupCRSF": { "osdGroupRx": {
"message": "CRSF RX Statistics" "message": "RX Statistics"
}, },
"osdGroupMapsAndRadars": { "osdGroupMapsAndRadars": {
"message": "Maps & Radars" "message": "Maps & Radars"
@ -4112,24 +4112,30 @@
"osdElement_VTX_CHANNEL_HELP": { "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." "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" "message": "RX RSSI in dBm"
}, },
"osdElement_CRSF_LQ": { "osdElement_LQ_UPLINK": {
"message": "RX Link Quality %" "message": "RX Uplink Quality %"
}, },
"osdElement_CRSF_LQ_HELP": { "osdElement_LQ_UPLINK_HELP": {
"message": "Use Crossfire LQ Format setting to select format type." "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" "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." "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" "message": "TX power in mW"
}, },
"osdElement_OSD_RX_POWER_DOWNLINK": {
"message": "RX power in mW"
},
"osdElement_MAP_NORTH": { "osdElement_MAP_NORTH": {
"message": "Map (Up is north)" "message": "Map (Up is north)"
}, },

View file

@ -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 | | ![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 | | ![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 | | ![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 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 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 | | ![Crosshair 5](/resources/osd/digital/default/24x36/406_408.png) | SYM_AH_CH_TYPE5 | SYM.AH_CROSSHAIRS | Crosshair type 5 | 406 - 408 | 0x196 - 0x198 |

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

View file

@ -23103,124 +23103,124 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 01000100
01010101 00010101
01010101 00101010
01010101 00010010
01010101 10000101
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001010
01010101 10100001
01010101 00100000
01010101 10001000
01010101 00100001
01010101 00101010
01010101 00001000
01010101 00100001
01010101 01000000
01010101 00010000
01010101 00000101
01010101 00100000
01010101 10001010
01010101 10000101
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00101000
01010101 10001000
01010101 00100001
01010101 00100010
01010101 10001000
01010101 00100001
01010101 00100000
01010101 10001010
01010101 10000101
01010101 01000101
01010101 00010000
01010101 00010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010101
01010101 01010100
01010101 01010101
01010101 01010101
01010101 01010010
01010101 00000101
01010101 01010101
01010101 01010010
01010101 00100001
01010101 01010101
01010101 01010010
01010101 00100000
01010101 01010101
01010101 01010010
01010101 00100010
01010101 00010101
01010101 01000000
01010101 00000100
01010101 00000101
01010101 00101000
01010101 10100000
01010101 10100001
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100010
01010101 00100010
01010101 00001000
01010101 00100000
01010101 00100010
01010101 00001000
01010101 00100001
01010101 00100000
01010101 10100001
01010101 01000000
01010101 00000100
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00100001
01010101 00100010
01010101 10100001
01010101 00100000
01010101 00100010
01010101 00000001
01010101 00101010
01010101 10000010
01010101 10101000
01010101 01000000
01010101 00010100
01010101 00000001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

View file

@ -178,18 +178,18 @@
<input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" /> <input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_rssi_alarm"></span> <span data-i18n="osd_rssi_alarm"></span>
</label> </label>
<div for="link_quality_alarm" class="helpicon cf_tip osd_use_crsf" data-i18n_title="osdalarmLQ_HELP"></div> <div for="link_quality_alarm" class="helpicon cf_tip osd_use_rx" data-i18n_title="osdalarmLQ_HELP"></div>
<label for="link_quality_alarm" class="osd_use_crsf"> <label for="link_quality_alarm" class="osd_use_rx">
<input id="link_quality_alarm" data-setting="osd_link_quality_alarm" data-setting-multiplier="1" type="number" data-step="1" /> <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> <span data-i18n="osd_link_quality_alarm"></span>
</label> </label>
<div for="rssi_dbm_alarm" class="helpicon cf_tip osd_use_crsf" data-i18n_title="osd_rssi_dbm_alarm_HELP"></div> <div for="rssi_dbm_alarm" class="helpicon cf_tip osd_use_rx" data-i18n_title="osd_rssi_dbm_alarm_HELP"></div>
<label for="rssi_dbm_alarm" class="osd_use_crsf"> <label for="rssi_dbm_alarm" class="osd_use_rx">
<input id="rssi_dbm_alarm" data-setting="osd_rssi_dbm_alarm" data-setting-multiplier="1" type="number" data-step="1" /> <input id="rssi_dbm_alarm" data-setting="osd_rssi_dbm_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_rssi_dbm_alarm"></span> <span data-i18n="osd_rssi_dbm_alarm"></span>
</label> </label>
<div for="snr_alarm" class="helpicon cf_tip osd_use_crsf" data-i18n_title="osdalarmSNR_HELP"></div> <div for="snr_alarm" class="helpicon cf_tip osd_use_rx" data-i18n_title="osdalarmSNR_HELP"></div>
<label for="snr_alarm" class="osd_use_crsf"> <label for="snr_alarm" class="osd_use_rx">
<input id="snr_alarm" data-setting="osd_snr_alarm" data-setting-multiplier="1" type="number" data-step="1" /> <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> <span data-i18n="osd_snr_alarm"></span>
</label> </label>

View file

@ -33,6 +33,7 @@ SYM.AH_LEFT = 0x12C;
SYM.THR = 0x95; SYM.THR = 0x95;
SYM.VOLT = 0x1F; SYM.VOLT = 0x1F;
SYM.AH_DECORATION_UP = 0x15; SYM.AH_DECORATION_UP = 0x15;
SYM.AH_DECORATION_DOWN = 0x16;
SYM.WIND_SPEED_HORIZONTAL = 0x86; SYM.WIND_SPEED_HORIZONTAL = 0x86;
SYM.WIND_SPEED_VERTICAL = 0x87; SYM.WIND_SPEED_VERTICAL = 0x87;
SYM.FLY_M = 0x9F; SYM.FLY_M = 0x9F;
@ -151,6 +152,8 @@ SYM.AH_AIRCRAFT4 = 0x1A6;
SYM.SYM_HUD_SIGNAL_3 = 0x163; SYM.SYM_HUD_SIGNAL_3 = 0x163;
SYM.SYM_HUD_CARDINAL = 0x1BA; SYM.SYM_HUD_CARDINAL = 0x1BA;
SYM.RX_BAND = 0x169;
SYM.RX_MODE = 0x16A;
SYM.AH_CROSSHAIRS = new Array(0x166, 0x1A4, new Array(0x190, 0x191, 0x192), new Array(0x193, 0x194, 0x195), new Array(0x196, 0x197, 0x198), new Array(0x199, 0x19A, 0x19B), new Array (0x19C, 0x19D, 0x19E), new Array (0x19F, 0x1A0, 0x1A1)); SYM.AH_CROSSHAIRS = new Array(0x166, 0x1A4, new Array(0x190, 0x191, 0x192), new Array(0x193, 0x194, 0x195), new Array(0x196, 0x197, 0x198), new Array(0x199, 0x19A, 0x19B), new Array (0x19C, 0x19D, 0x19E), new Array (0x19F, 0x1A0, 0x1A1));
@ -609,7 +612,7 @@ OSD.DjiElements = {
"GForce", "GForce",
"Timers", "Timers",
"VTX", "VTX",
"CRSF", "RX",
"SwitchIndicators", "SwitchIndicators",
"OSDCustomElements", "OSDCustomElements",
"GVars", "GVars",
@ -1834,45 +1837,69 @@ OSD.constants = {
] ]
}, },
{ {
name: 'osdGroupCRSF', name: 'osdGroupRx',
enabled: function() { enabled: function() {
return HARDWARE.capabilities.useCRSFRx; return HARDWARE.capabilities.useRx;
}, },
items: [ items: [
{ {
name: 'CRSF_RSSI_DBM', name: 'RSSI_DBM',
id: 109, id: 109,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.RSSI) + '-100' + FONT.symbol(SYM.DBM) preview: FONT.symbol(SYM.RSSI) + '-100' + FONT.symbol(SYM.DBM)
}, },
{ {
name: 'CRSF_LQ', name: 'LQ_UPLINK',
id: 110, id: 110,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
var crsflqformat; var lqFormat;
if (Settings.getInputValue('osd_crsf_lq_format') == 0) { if (HARDWARE.capabilities.useCRSF && Settings.getInputValue('osd_crsf_lq_format') == 1){
crsflqformat = FONT.symbol(SYM.LQ) + '100'; lqFormat = FONT.symbol(SYM.LQ) + '2:100';
} else if (Settings.getInputValue('osd_crsf_lq_format') == 1){ } else if (HARDWARE.capabilities.useCRSF && Settings.getInputValue('osd_crsf_lq_format') == 2) {
crsflqformat = FONT.symbol(SYM.LQ) + '2:100'; lqFormat = FONT.symbol(SYM.LQ) + '300';
} else { } else {
crsflqformat = FONT.symbol(SYM.LQ) + '300'; lqFormat = FONT.symbol(SYM.LQ) + '100';
} }
return crsflqformat; return lqFormat;
} }
}, },
{ {
name: 'CRSF_SNR_DB', name: 'LQ_DOWNLINK',
id: 159,
positionable: true,
preview: FONT.symbol(SYM.LQ) + '100' + FONT.symbol(SYM.AH_DECORATION_DOWN)
},
{
name: 'SNR_DB',
id: 111, id: 111,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.SNR) + '-12' + FONT.symbol(SYM.DB) preview: FONT.symbol(SYM.SNR) + '-12' + FONT.symbol(SYM.DB)
}, },
{ {
name: 'CRSF_TX_POWER', name: 'TX_POWER_UPLINK',
id: 112, id: 112,
positionable: true, positionable: true,
preview: ' 10' + FONT.symbol(SYM.MW) preview: ' 10' + FONT.symbol(SYM.MW)
}, },
{
name: 'RX_POWER_DOWNLINK',
id: 160,
positionable: true,
preview: ' 10' + FONT.symbol(SYM.MW) + FONT.symbol(SYM.AH_DECORATION_DOWN)
},
{
name: 'RX_BAND',
id: 161,
positionable: true,
preview: FONT.symbol(SYM.RX_BAND) + '2.4G'
},
{
name: 'RX_MODE',
id: 162,
positionable: true,
preview: FONT.symbol(SYM.RX_MODE) + '150HZ '
},
] ]
}, },
{ {
@ -3015,7 +3042,8 @@ OSD.GUI.updateAlarms = function() {
$(".osd_use_airspeed_alarm").toggle(HARDWARE.capabilities.usePitot); $(".osd_use_airspeed_alarm").toggle(HARDWARE.capabilities.usePitot);
$(".osd_use_baro_temp_alarm").toggle(HARDWARE.capabilities.useBaro); $(".osd_use_baro_temp_alarm").toggle(HARDWARE.capabilities.useBaro);
$(".osd_use_esc_telemetry").toggle(HARDWARE.capabilities.useESCTelemetry); $(".osd_use_esc_telemetry").toggle(HARDWARE.capabilities.useESCTelemetry);
$(".osd_use_crsf").toggle(HARDWARE.capabilities.useCRSFRx); $(".osd_use_rx").toggle(HARDWARE.capabilities.useRx);
$(".osd_use_crsf").toggle(HARDWARE.capabilities.useCRSF);
}; };
OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymbol) { OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymbol) {
@ -3332,7 +3360,8 @@ HARDWARE.init = function() {
isDjiHdFpv: false, isDjiHdFpv: false,
isMspDisplay: false, isMspDisplay: false,
useESCTelemetry: false, useESCTelemetry: false,
useCRSFRx: false, useRx: false,
useCRSF: false,
useBaro: false, useBaro: false,
usePitot: false usePitot: false
}; };
@ -3357,7 +3386,8 @@ HARDWARE.update = function(callback) {
// Update RX data for Crossfire detection // Update RX data for Crossfire detection
mspHelper.loadRxConfig(function() { mspHelper.loadRxConfig(function() {
HARDWARE.capabilities.useCRSFRx = (FC.RX_CONFIG.serialrx_provider == 6); HARDWARE.capabilities.useCRSF = (FC.RX_CONFIG.serialrx_provider == 6); // CRSF
HARDWARE.capabilities.useRx = (FC.RX_CONFIG.serialrx_provider == 6 || FC.RX_CONFIG.receiver_type == 2); // CRSF or MSP
mspHelper.loadSensorConfig(function () { mspHelper.loadSensorConfig(function () {
HARDWARE.capabilities.useBaro = (FC.SENSOR_CONFIG.barometer != 0); HARDWARE.capabilities.useBaro = (FC.SENSOR_CONFIG.barometer != 0);