Restore backwards compatibility

betaflight · Jul 8, 2023 · 04c5a1f · 04c5a1f
1 parent ca17f19
commit 04c5a1f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 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";
 
@@ -37,8 +37,15 @@ const Features = function (config) {
         );
     }
 
+    if (semver.gte(config.apiVersion, API_VERSION_1_46)) {
+        features.push(
+            {bit: 24, group: 'vtx', name: 'VTX', dependsOn: 'VTX'},
+        );
+    }
+
     self._features = features;
 
+    // Filter features based on build options
     if (semver.gte(config.apiVersion, API_VERSION_1_45) && config.buildOptions.length) {
         self._features = [];
 
@@ -49,6 +56,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
@@ -51,7 +51,6 @@ class GuiControl {
             'ports',
             'receiver',
             'sensors',
-            'vtx',
         ];
 
         this.defaultCloudBuildTabOptions = [
@@ -60,6 +59,7 @@ class GuiControl {
             'osd',
             'servos',
             'transponder',
+            'vtx',
         ];
 
         this.defaultAllowedFCTabsWhenConnected = [ ...this.defaultAllowedTabs, ...this.defaultCloudBuildTabOptions];

diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
@@ -538,13 +538,15 @@ function finishOpen() {
     CONFIGURATOR.connectionValid = true;
 
     if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.CONFIG.buildOptions.length) {
+
         GUI.allowedTabs = Array.from(GUI.defaultAllowedTabs);
 
         for (const tab of GUI.defaultCloudBuildTabOptions) {
             if (FC.CONFIG.buildOptions.some(opt => opt.toLowerCase().includes(tab))) {
                 GUI.allowedTabs.push(tab);
             }
         }
+
     } else {
         GUI.allowedTabs = Array.from(GUI.defaultAllowedFCTabsWhenConnected);
     }

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,4 +15,11 @@ 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));
+    }
 }