diff options
| author | J Blackman <blckmn@users.noreply.github.com> | 2022-11-04 09:04:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 09:04:44 +0300 |
| commit | 4b3f1dbb6a2717625b5b7a48fd9e3d0716f56a31 (patch) | |
| tree | 232096aba5895b1951463a8b69972e75b44dc5e8 | |
| parent | 45cd8bf175327a1471b39d4232da3fc57af70dcb (diff) | |
| parent | 9975846a46f23a8f3279c8dd4cc35d5a58923f6c (diff) | |
Change 'VTX (MSP)' to 'VTX (MSP + Displayport)' and lose 'OSD (MSP Displayport)' option (#3065)
See also https://github.com/betaflight/betaflight/pull/11950
These two PR's remove the explicit MSP Displayport enablement, and
instead have Displayport on MSP enabled at the same time at MSP VTX
support if MSP is also enabled on the port. No traffic will flow on the
serial port unless `osd_displayport_device = MSP`.
| -rw-r--r-- | locales/en/messages.json | 5 | ||||
| -rw-r--r-- | src/js/msp/MSPHelper.js | 1 | ||||
| -rw-r--r-- | src/js/tabs/ports.js | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/locales/en/messages.json b/locales/en/messages.json index 9b6d4c7b..7c268c65 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -1628,10 +1628,7 @@ "message": "OSD (FrSky Protocol)" }, "portsFunction_VTX_MSP": { - "message": "VTX (MSP)" - }, - "portsFunction_MSP_DISPLAYPORT": { - "message": "OSD (MSP Displayport)" + "message": "VTX (MSP + Displayport)" }, "pidTuningProfileOption": { "message": "Profile $1" diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index 044ff4cb..19387bfa 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -34,7 +34,6 @@ function MspHelper() { 'LIDAR_TF': 15, 'FRSKY_OSD': 16, 'VTX_MSP': 17, - 'MSP_DISPLAYPORT': 18, }; self.REBOOT_TYPES = { diff --git a/src/js/tabs/ports.js b/src/js/tabs/ports.js index 9a8b3753..a4a40588 100644 --- a/src/js/tabs/ports.js +++ b/src/js/tabs/ports.js @@ -60,7 +60,6 @@ ports.initialize = function (callback) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { functionRules.push({ name: 'VTX_MSP', groups: ['peripherals'], sharableWith: ['msp'], maxPorts: 1 }); - functionRules.push({ name: 'MSP_DISPLAYPORT', groups: ['peripherals'], sharableWith: ['msp'], maxPorts: 1 }); } for (const rule of functionRules) { |