update virtualFC version and accompanying modes for modes-tab (#4332)

* update virtualFC modes-tab

* 1.47=4.6

* Update src/js/VirtualFC.js -- splice for 1.47

Co-authored-by: Mark Haslinghuis <[email protected]>

* fixup semver and padding

Co-authored-by: Mark Haslinghuis <[email protected]>

* add 1.47 to drop-down

* set virtual fc version to 4.6.0

* set virtual fc port_handler.js virtualMspVersion 1.47

* fixup import

Co-authored-by: Mark Haslinghuis <[email protected]>

* remove unsupported versions

Co-authored-by: Mark Haslinghuis <[email protected]>

---------

Co-authored-by: Mark Haslinghuis <[email protected]>

Author: nerdCopter

src/components/port-picker/FirmwareVirtualOption.vue

@@ -21,12 +21,10 @@ export default {
     data() {
         return {
             firmwareVersions: [
+                { value: "1.47.0", label: "MSP: 1.47 | Firmware: 4.6.*" },
                 { value: "1.46.0", label: "MSP: 1.46 | Firmware: 4.5.*" },
                 { value: "1.45.0", label: "MSP: 1.45 | Firmware: 4.4.*" },
                 { value: "1.44.0", label: "MSP: 1.44 | Firmware: 4.3.*" },
-                { value: "1.43.0", label: "MSP: 1.43 | Firmware: 4.2.*" },
-                { value: "1.42.0", label: "MSP: 1.42 | Firmware: 4.1.*" },
-                { value: "1.41.0", label: "MSP: 1.41 | Firmware: 4.0.*" },
             ],
         };
     },

src/js/VirtualFC.js

@@ -2,8 +2,9 @@ import Features from "./Features";
 import { i18n } from "./localization";
 import Beepers from "./Beepers";
 import FC from "./fc";
-import CONFIGURATOR from "./data_storage";
+import CONFIGURATOR, { API_VERSION_1_47 } from "./data_storage";
 import { OSD } from "./tabs/osd";
+import semver from "semver";
 
 const VirtualFC = {
     // these values are manufactured to unlock all the functionality of the configurator, they dont represent actual hardware
@@ -13,7 +14,7 @@ const VirtualFC = {
         virtualFC.resetState();
         virtualFC.CONFIG.deviceIdentifier = 0;
 
-        virtualFC.CONFIG.flightControllerVersion = "4.5.0";
+        virtualFC.CONFIG.flightControllerVersion = "4.6.0";
         virtualFC.CONFIG.apiVersion = CONFIGURATOR.virtualApiVersion;
 
         virtualFC.CONFIG.cpuTemp = 48;
@@ -221,9 +222,16 @@ const VirtualFC = {
             "READY",
             "LAP TIMER RESET",
         ];
+
+        if (semver.gte(virtualFC.CONFIG.apiVersion, API_VERSION_1_47)) {
+            virtualFC.AUX_CONFIG.splice(virtualFC.AUX_CONFIG.indexOf("HORIZON") + 1, 0, "ALT_HOLD");
+            virtualFC.AUX_CONFIG.splice(virtualFC.AUX_CONFIG.indexOf("CAMSTAB") + 1, 0, "POS_HOLD");
+            virtualFC.AUX_CONFIG.push("CHIRP");
+        }
+
         FC.AUX_CONFIG_IDS = [
-            0, 1, 2, 4, 5, 6, 7, 8, 12, 13, 15, 17, 19, 20, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-            39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 15, 17, 19, 20, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+            36, 37, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
         ];
 
         for (let i = 0; i < 16; i++) {

src/js/port_handler.js

@@ -16,7 +16,7 @@ const PortHandler = new (function () {
         selectedPort: DEFAULT_PORT,
         selectedBauds: DEFAULT_BAUDS,
         portOverride: getConfig("portOverride", "/dev/rfcomm0").portOverride,
-        virtualMspVersion: "1.46.0",
+        virtualMspVersion: "1.47.0",
         autoConnect: getConfig("autoConnect", false).autoConnect,
     };
 

src/js/utils/common.js

@@ -48,12 +48,10 @@ export function checkChromeRuntimeError() {
 }
 
 const majorFirmwareVersions = {
+    1.47: "4.6.*",
     1.46: "4.5.*",
     1.45: "4.4.*",
     1.44: "4.3.*",
-    1.43: "4.2.*",
-    1.42: "4.1.*",
-    1.41: "4.0.*",
 };
 
 export function generateVirtualApiVersions() {