Skip to content

Commit 05c6f86

Browse files
authored
Refactor vtx device status (#3208)
Refactor vtx device status to use modules
1 parent 4582f4d commit 05c6f86

File tree

9 files changed

+23
-14
lines changed

9 files changed

+23
-14
lines changed

src/js/msp/MSPHelper.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { i18n } from "../localization";
44
import GUI from "../gui";
55
import FC from "../fc";
66
import semver from 'semver';
7+
import vtxDeviceStatusFactory from "../utils/VtxDeviceStatus/VtxDeviceStatusFactory";
78

89
// Used for LED_STRIP
910
const ledDirectionLetters = ['n', 'e', 's', 'w', 'u', 'd']; // in LSB bit order

src/js/tabs/vtx.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import GUI from '../gui';
44
import { tracking } from "../Analytics";
55
import { mspHelper } from "../msp/MSPHelper";
66
import FC from '../fc';
7+
import { VtxDeviceTypes } from '../utils/VtxDeviceStatus/VtxDeviceStatus';
78

89
const vtx = {
910
supported: false,

src/js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
'use strict';
1+
import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
2+
import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
23

34
class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
45
constructor(dataView)
@@ -17,3 +18,5 @@ class VtxDeviceStatusRtc6705 extends VtxDeviceStatus {
1718
}
1819

1920
vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusRtc6705);
21+
22+
export default VtxDeviceStatusRtc6705;

src/js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
'use strict';
1+
import VtxDeviceStatus, { VtxDeviceTypes } from "./VtxDeviceStatus";
2+
import vtxDeviceStatusFactory from "./VtxDeviceStatusFactory";
3+
import { i18n } from "../../localization";
24

35
class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
46
constructor(dataView)
@@ -47,3 +49,5 @@ class VtxDeviceStatusSmartAudio extends VtxDeviceStatus {
4749
}
4850

4951
vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusSmartAudio);
52+
53+
export default VtxDeviceStatusSmartAudio;

src/js/utils/VtxDeviceStatus/TrampDeviceStatus.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
'use strict';
1+
import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
2+
import vtxDeviceStatusFactory from './VtxDeviceStatusFactory';
23

34
class VtxDeviceStatusTramp extends VtxDeviceStatus {
45
constructor(dataView)
@@ -17,3 +18,5 @@ class VtxDeviceStatusTramp extends VtxDeviceStatus {
1718
}
1819

1920
vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusTramp);
21+
22+
export default VtxDeviceStatusTramp;

src/js/utils/VtxDeviceStatus/VtxDeviceStatus.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
'use strict';
2-
3-
const VtxDeviceTypes = {
1+
export const VtxDeviceTypes = {
42
VTXDEV_UNSUPPORTED: 0, // reserved for MSP
53
VTXDEV_RTC6705: 1,
64
// 2 reserved
@@ -78,3 +76,5 @@ class VtxDeviceStatus
7876
return this.constructor.staticDeviceStatusType;
7977
}
8078
}
79+
80+
export default VtxDeviceStatus;

src/js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
'use strict';
2-
31
const vtxDeviceStatusFactory = {
42
_vtxDeviceStatusClasses: [],
53

@@ -38,3 +36,5 @@ const vtxDeviceStatusFactory = {
3836
return result;
3937
},
4038
};
39+
40+
export default vtxDeviceStatusFactory;

src/js/utils/VtxDeviceStatus/VtxMspDeviceStatus.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict';
1+
import VtxDeviceStatus, { VtxDeviceTypes } from './VtxDeviceStatus';
22

33
class VtxDeviceStatusMsp extends VtxDeviceStatus {
44
constructor(dataView)
@@ -17,3 +17,5 @@ class VtxDeviceStatusMsp extends VtxDeviceStatus {
1717
}
1818

1919
vtxDeviceStatusFactory.registerVtxDeviceStatusClass(VtxDeviceStatusMsp);
20+
21+
export default VtxDeviceStatusMsp;

src/main.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@
8080
<script type="text/javascript" src="./node_modules/inflection/lib/inflection.js"></script>
8181
<script type="text/javascript" src="./js/libraries/analytics.js"></script>
8282
<script type="text/javascript" src="./js/utils/window_watchers.js"></script>
83-
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>
84-
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatus.js"></script>
85-
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/TrampDeviceStatus.js"></script>
86-
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/SmartAudioDeviceStatus.js"></script>
87-
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/Rtc6705DeviceStatus.js"></script>
8883
<script type="text/javascript" src="./js/data_storage.js"></script>
8984
<script type="text/javascript" src="./js/port_handler.js"></script>
9085
<script type="text/javascript" src="./js/port_usage.js"></script>

0 commit comments

Comments
 (0)