Enable video transmitter tab

betaflight · Jul 8, 2023 · 1a6912c · 1a6912c
1 parent 9b9e5bf
commit 1a6912c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/src/js/Features.js b/src/js/Features.js
@@ -1,5 +1,5 @@
 import { bit_check, bit_set, bit_clear } from "./bit";
-import { API_VERSION_1_44, API_VERSION_1_45 } from './data_storage';
+import { API_VERSION_1_44, API_VERSION_1_45, API_VERSION_1_46 } from './data_storage';
 import semver from "semver";
 import { tracking } from "./Analytics";
 
@@ -40,6 +40,7 @@ const Features = function (config) {
 
     self._features = features;
 
+    // Filter features based on build options
     if (semver.gte(config.apiVersion, API_VERSION_1_45) && config.buildOptions.length) {
         self._features = [];
 
@@ -50,6 +51,11 @@ const Features = function (config) {
         }
     }
 
+    // Enable vtx feature if not already enabled in firmware. This is needed for the vtx tab to show up.
+    if (semver.gte(config.apiVersion, API_VERSION_1_46) && config.buildOptions.some(opt => opt.includes('VTX'))) {
+        self.enable('VTX');
+    }
+
     self._features.sort((a, b) => a.name.localeCompare(b.name, window.navigator.language, { ignorePunctuation: true }));
     self._featureMask = 0;
 

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',
@@ -62,7 +62,7 @@ class GuiControl {
             '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
@@ -536,9 +536,10 @@ function setRtc() {
 
 function finishOpen() {
     CONFIGURATOR.connectionValid = true;
+
     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 +548,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')) {
-                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
@@ -1,3 +1,7 @@
+import semver from "semver";
+import { API_VERSION_1_42, API_VERSION_1_46 } from "../data_storage";
+import FC from "../fc";
+
 export function updateTabList(features) {
     const isExpertModeEnabled = $('input[name="expertModeCheckbox"]').is(':checked');
 
@@ -11,5 +15,10 @@ 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'));
+
+    if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
+        $('#tabs ul.mode-connected li.tab_vtx').toggle(features.isEnabled('VTX'));
+    } else {
+        $('#tabs ul.mode-connected li.tab_vtx').toggle(semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42));
+    }
 }