Serial backend modules (#3192)

Author: chmelevskij

src/components/MotorOutputReordering/MotorOutputReorderingComponent.js

@@ -1,5 +1,6 @@
 import MotorOutputReorderConfig from "./MotorOutputReorderingConfig";
 import MotorOutputReorderCanvas from "./MotorOutputReorderingCanvas";
+import { mspHelper } from "../../js/msp/MSPHelper";
 
 export default class MotorOutputReorderComponent
 {

src/components/init.js

@@ -11,6 +11,7 @@ import BatteryLegend from "./quad-status/BatteryLegend.vue";
 import BetaflightLogo from "./betaflight-logo/BetaflightLogo.vue";
 import StatusBar from "./status-bar/StatusBar.vue";
 import BatteryIcon from "./quad-status/BatteryIcon.vue";
+import FC from '../js/fc.js';
 
 // Most of the global objects can go here at first.
 // It's a bit of overkill for simple components,

src/js/Beepers.js

@@ -1,4 +1,4 @@
-'use strict';
+import { bit_check, bit_clear, bit_set } from './serial_backend';
 
 class Beepers {
     constructor(config, supportedConditions) {
@@ -105,3 +105,5 @@ class Beepers {
         }
     }
 }
+
+export default Beepers;

src/js/Features.js

@@ -1,4 +1,4 @@
-'use strict';
+import { bit_check, bit_set, bit_clear } from "./serial_backend";
 
 const Features = function (config) {
     const self = this;
@@ -198,3 +198,5 @@ Features.prototype.updateData = function (featureElement) {
         }
     }
 };
+
+export default Features;

src/js/VirtualFC.js

@@ -1,4 +1,6 @@
-'use strict';
+import Features from "./Features";
+import Beepers from "./Beepers";
+import FC from "./fc";
 
 const VirtualFC = {
     // these values are manufactured to unlock all the functionality of the configurator, they dont represent actual hardware
@@ -215,3 +217,5 @@ const VirtualFC = {
         };
     },
 };
+
+export default VirtualFC;

src/js/backup_restore.js

@@ -1,8 +1,14 @@
-'use strict';
+import { sensor_status, update_dataflash_global, reinitializeConnection } from "./serial_backend";
+import GUI from "./gui";
+import Features from "./Features";
+import { i18n } from "./localization";
+import Beepers from "./Beepers";
+import FC from "./fc";
+import { mspHelper } from "./msp/MSPHelper";
 
 // code below is highly experimental, although it runs fine on latest firmware
 // the data inside nested objects needs to be verified if deep copy works properly
-function configuration_backup(callback) {
+export function configuration_backup(callback) {
     let activeProfile = null;
 
     let version = CONFIGURATOR.version;
@@ -245,7 +251,7 @@ function configuration_backup(callback) {
 
 }
 
-function configuration_restore(callback) {
+export function configuration_restore(callback) {
     let chosenFileEntry = null;
 
     const accepts = [{

src/js/fc.js

@@ -1,4 +1,4 @@
-'use strict';
+import { bit_check } from "./serial_backend";
 
 const INITIAL_CONFIG = {
     apiVersion:                       "0.0.0",
@@ -901,3 +901,7 @@ const FC = {
         QUICKRATES: 4,
     },
 };
+
+// temp binding to global scope
+window.FC = FC;
+export default FC;

src/js/main.js

@@ -4,6 +4,11 @@ import GUI from './gui.js';
 import { get as getConfig, set as setConfig } from './ConfigStorage.js';
 import ReleaseChecker from './release_checker.js';
 import { tracking, createAnalytics } from './Analytics.js';
+import { initializeSerialBackend } from './serial_backend.js';
+// Currently fc is everywhere, so we need to import it here
+// till all is in modules
+import './fc.js';
+import './msp/MSPHelper.js';
 
 $(document).ready(function () {
 

src/js/msp/MSPConnector.js

@@ -1,4 +1,5 @@
-'use strict';
+import MspHelper from "./MSPHelper";
+import { read_serial } from "../serial_backend";
 
 const MSPConnectorImpl = function () {
     this.baud = undefined;
@@ -74,3 +75,5 @@ MSPConnectorImpl.prototype.disconnect = function(onDisconnectCallback) {
 
     MSP.disconnect_cleanup();
 };
+
+export default MSPConnectorImpl;

src/js/msp/MSPHelper.js

@@ -1,8 +1,12 @@
-'use strict';
+// NOTE: this is a circular dependency, needs investigating
+import { bit_check, sensor_status, bit_set, update_dataflash_global } from "../serial_backend";
+import { i18n } from "../localization";
+import GUI from "../gui";
+import FC from "../fc";
+import semver from 'semver';
 
 // Used for LED_STRIP
 const ledDirectionLetters    = ['n', 'e', 's', 'w', 'u', 'd'];      // in LSB bit order
-const ledFunctionLetters     = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l']; // in LSB bit order
 const ledBaseFunctionLetters = ['c', 'f', 'a', 'l', 's', 'g', 'r']; // in LSB bit
 let ledOverlayLetters        = ['t', 'o', 'b', 'v', 'i', 'w']; // in LSB bit
 
@@ -2641,3 +2645,11 @@ MSP.SDCARD_STATE_FATAL       = 1;
 MSP.SDCARD_STATE_CARD_INIT   = 2;
 MSP.SDCARD_STATE_FS_INIT     = 3;
 MSP.SDCARD_STATE_READY       = 4;
+
+let mspHelper;
+// This is temporary, till things are moved
+// to modules and every usage of this can create own
+// instance or re-use existing where needed.
+window.mspHelper = mspHelper = new MspHelper();
+export { mspHelper };
+export default MspHelper;