Remove fake vtx feature

betaflight · Jul 8, 2023 · 78fb0fa · 78fb0fa
1 parent b70fdc2
commit 78fb0fa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/src/js/Features.js b/src/js/Features.js
@@ -26,7 +26,6 @@ const Features = function (config) {
         {bit: 20, group: 'other', name: 'CHANNEL_FORWARDING', dependsOn: 'SERVOS'},
         {bit: 21, group: 'other', name: 'TRANSPONDER', haveTip: true, dependsOn: 'TRANSPONDER'},
         {bit: 22, group: 'other', name: 'AIRMODE'},
-        {bit: 24, group: 'vtx', name: 'VTX', dependsOn: 'VTX'},
         {bit: 25, group: 'rxMode', mode: 'select', name: 'RX_SPI'},
         {bit: 27, group: 'escSensor', name: 'ESC_SENSOR'},
         {bit: 28, group: 'antiGravity', name: 'ANTI_GRAVITY', haveTip: true, hideName: true},

diff --git a/src/js/gui.js b/src/js/gui.js
@@ -34,7 +34,7 @@ class GuiControl {
             'help',
         ];
 
-        this.defaultAllowedTabsCloudBuild = [
+        this.defaultAllowedTabs = [
             'setup',
             'failsafe',
             'power',
@@ -51,6 +51,7 @@ class GuiControl {
             'ports',
             'receiver',
             'sensors',
+            // 'vtx',
         ];
 
         this.defaultCloudBuildTabOptions = [
@@ -59,10 +60,9 @@ class GuiControl {
             'osd',
             'servos',
             'transponder',
-            'vtx',
         ];
 
-        this.defaultAllowedFCTabsWhenConnected = [ ...this.defaultAllowedTabsCloudBuild, ...this.defaultCloudBuildTabOptions];
+        this.defaultAllowedFCTabsWhenConnected = [ ...this.defaultAllowedTabs, ...this.defaultCloudBuildTabOptions];
 
         this.allowedTabs = this.defaultAllowedTabsWhenDisconnected;
 

diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
@@ -10,7 +10,7 @@ import MSP from "./msp";
 import MSPCodes from "./msp/MSPCodes";
 import PortUsage from "./port_usage";
 import PortHandler from "./port_handler";
-import CONFIGURATOR, { API_VERSION_1_45, API_VERSION_1_46 } from "./data_storage";
+import CONFIGURATOR, { API_VERSION_1_42, API_VERSION_1_45, API_VERSION_1_46 } from "./data_storage";
 import serial from "./serial";
 import UI_PHONES from "./phones_ui";
 import { bit_check } from './bit.js';
@@ -536,9 +536,14 @@ function setRtc() {
 
 function finishOpen() {
     CONFIGURATOR.connectionValid = true;
+
+    if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
+        GUI.defaultAllowedTabs.push('vtx');
+    }
+
     if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.CONFIG.buildOptions.length) {
 
-        GUI.allowedTabs = GUI.defaultAllowedTabsCloudBuild;
+        GUI.allowedTabs = Array.from(GUI.defaultAllowedTabs);
 
         for (const tab of GUI.defaultCloudBuildTabOptions) {
             if (FC.CONFIG.buildOptions.some(opt => opt.toLowerCase().includes(tab))) {
@@ -547,7 +552,7 @@ function finishOpen() {
         }
 
     } else {
-        GUI.allowedTabs = GUI.defaultAllowedFCTabsWhenConnected.slice();
+        GUI.allowedTabs = Array.from(GUI.defaultAllowedFCTabsWhenConnected);
     }
 
     if (GUI.isCordova()) {

diff --git a/src/js/tabs/ports.js b/src/js/tabs/ports.js
@@ -414,7 +414,6 @@ ports.initialize = function (callback) {
         let enableBlackbox = false;
         let enableEsc = false;
         let enableGps = false;
-        let enableVtx = false;
 
         for (const port of FC.SERIAL_CONFIG.ports) {
             const func = port.functions;
@@ -438,10 +437,6 @@ ports.initialize = function (callback) {
             if (func.includes('GPS')) {
                 enableGps = true;
             }
-
-            if (func.includes('IRC_TRAMP') || func.includes('TBS_SMARTAUDIO') || func.includes('VTX_MSP')) {
-                enableVtx = true;
-            }
         }
 
         const featureConfig = FC.FEATURE_CONFIG.features;
@@ -474,12 +469,6 @@ ports.initialize = function (callback) {
             featureConfig.disable('GPS');
         }
 
-        if (enableVtx) {
-            featureConfig.enable('VTX');
-        } else {
-            featureConfig.disable('VTX');
-        }
-
         mspHelper.sendSerialConfig(save_features);
 
         function save_features() {

diff --git a/src/js/utils/updateTabList.js b/src/js/utils/updateTabList.js
@@ -11,5 +11,4 @@ export function updateTabList(features) {
     $('#tabs ul.mode-connected li.tab_led_strip').toggle(features.isEnabled('LED_STRIP'));
     $('#tabs ul.mode-connected li.tab_transponder').toggle(features.isEnabled('TRANSPONDER'));
     $('#tabs ul.mode-connected li.tab_osd').toggle(features.isEnabled('OSD'));
-    $('#tabs ul.mode-connected li.tab_vtx').toggle(features.isEnabled('VTX'));
 }