Refactor vtx device status (#3208)

Refactor vtx device status to use modules
betaflight · Jan 8, 2023 · 05c6f86 · 05c6f86
1 parent 4582f4d
commit 05c6f86
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js
@@ -4,6 +4,7 @@ import { i18n } from "../localization";
 import GUI from "../gui";
 import FC from "../fc";
 import semver from 'semver';
+import vtxDeviceStatusFactory from "../utils/VtxDeviceStatus/VtxDeviceStatusFactory";
 
 // Used for LED_STRIP
 const ledDirectionLetters    = ['n', 'e', 's', 'w', 'u', 'd'];      // in LSB bit order

diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js
@@ -4,6 +4,7 @@ import GUI from '../gui';
 import { tracking } from "../Analytics";
 import { mspHelper } from "../msp/MSPHelper";
 import FC from '../fc';
+import { VtxDeviceTypes } from '../utils/VtxDeviceStatus/VtxDeviceStatus';
 
 const vtx = {
     supported: false,

diff --git a/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js b/src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js
@@ -1,4 +1,5 @@
-'use strict';
+import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
+import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
 
 class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
     constructor(dataView)
@@ -17,3 +18,5 @@ class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
 }
 
 vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusRtc6705);
+
+export default VtxDeviceStatusRtc6705;
diff --git a/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js b/src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js
@@ -1,4 +1,6 @@
-'use strict';
+import VtxDeviceStatus, { VtxDeviceTypes } from "./VtxDeviceStatus";
+import vtxDeviceStatusFactory from "./VtxDeviceStatusFactory";
+import { i18n } from "../../localization";
 
 class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
     constructor(dataView)
@@ -47,3 +49,5 @@ class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
 }
 
 vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusSmartAudio);
+
+export default VtxDeviceStatusSmartAudio;
diff --git a/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js b/src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js
@@ -1,4 +1,5 @@
-'use strict';
+import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
+import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
 
 class VtxDeviceStatusTramp extends VtxDeviceStatus {
     constructor(dataView)
@@ -17,3 +18,5 @@ class VtxDeviceStatusTramp extends VtxDeviceStatus {
 }
 
 vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusTramp);
+
+export default VtxDeviceStatusTramp;
diff --git a/src/js/utils/VtxDeviceStatus/VtxDeviceStatus.js b/src/js/utils/VtxDeviceStatus/VtxDeviceStatus.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const VtxDeviceTypes = {
+export const VtxDeviceTypes = {
     VTXDEV_UNSUPPORTED: 0, // reserved for MSP
     VTXDEV_RTC6705: 1,
     // 2 reserved
@@ -78,3 +76,5 @@ class VtxDeviceStatus
         return this.constructor.staticDeviceStatusType;
     }
 }
+
+export default VtxDeviceStatus;
diff --git a/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js b/src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const vtxDeviceStatusFactory = {
     _vtxDeviceStatusClasses: [],
 
@@ -38,3 +36,5 @@ const vtxDeviceStatusFactory = {
         return result;
     },
 };
+
+export default vtxDeviceStatusFactory;
diff --git a/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js b/src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js
@@ -1,4 +1,4 @@
-'use strict';
+import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
 
 class VtxDeviceStatusMsp extends VtxDeviceStatus {
     constructor(dataView)
@@ -17,3 +17,5 @@ class VtxDeviceStatusMsp extends VtxDeviceStatus {
 }
 
 vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusMsp);
+
+export default VtxDeviceStatusMsp;
diff --git a/src/main.html b/src/main.html
@@ -80,11 +80,6 @@
     <script type="text/javascript" src="./node_modules/inflection/lib/inflection.js"></script>
     <script type="text/javascript" src="./js/libraries/analytics.js"></script>
     <script type="text/javascript" src="./js/utils/window_watchers.js"></script>
-    <script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>
-    <script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatus.js"></script>
-    <script type="text/javascript" src="./js/utils/VtxDeviceStatus/TrampDeviceStatus.js"></script>
-    <script type="text/javascript" src="./js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js"></script>
-    <script type="text/javascript" src="./js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js"></script>
     <script type="text/javascript" src="./js/data_storage.js"></script>
     <script type="text/javascript" src="./js/port_handler.js"></script>
     <script type="text/javascript" src="./js/port_usage.js"></script>