Convert to CommonJS Modules

iNavFlight · Feb 26, 2024 · 91f1699 · 91f1699
1 parent 7df8253
commit 91f1699
Show file tree

Hide file tree

Showing 100 changed files with 9,646 additions and 3,696 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,8 @@
         },
         "args": ["--inspect"],
         "env": {
-          "NODE_ENV": "development"
+          "NODE_ENV": "development",
+          "NODE_PATH": "${workspaceFolder}/js/"
         },
         "cwd": "${workspaceFolder}",
         "console": "integratedTerminal"
@@ -25,7 +26,7 @@
         "windows": {
           "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
         },
-        "args" : ["."],
+        "args" : [".", "--trace-warnings"],
         "outputCapture": "std"
       }
     ]

diff --git a/forge.config.js b/forge.config.js
@@ -1,32 +1,37 @@
 module.exports = {
   packagerConfig: {
-    asar: true,
+    asar: false,
+    icon: 'images/inav'
   },
   rebuildConfig: {},
   makers: [
-    /*
     {
       name: '@electron-forge/maker-squirrel',
-      config: {},
+      config: {
+        iconUrl: "https://raw.githubusercontent.com/iNavFlight/inav-configurator/master/images/inav.ico",
+        loadingGif: "images/inav-installing.gif"
+      },
     },
-    */
+
     {
       name: '@electron-forge/maker-zip',
       platforms: ['win32', 'darwin'],
     },
     {
       name: '@electron-forge/maker-deb',
-      config: {},
+      config: {
+        options: {
+          icon: "images/inav_icon_128.png"
+        }
+      },
     },
     {
       name: '@electron-forge/maker-rpm',
-      config: {},
-    },
-  ],
-  plugins: [
-    {
-      name: '@electron-forge/plugin-auto-unpack-natives',
-      config: {},
+      config: {
+        options: {
+          icon: "images/inav_icon_128.png"
+        }
+      },
     },
   ],
 };
diff --git a/images/inav-installing.gif b/images/inav-installing.gif
diff --git a/index.html b/index.html
@@ -3,110 +3,10 @@
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link type="text/css" rel="stylesheet" href="./src/css/styles.css" media="all" />
-
-    <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
-    <script type="text/javascript" src="./js/main.js"></script>
-    <script type="text/javascript" src="./js/sitl.js"></script>
-    <script type="text/javascript" src="./js/CliAutoComplete.js"></script>
-    <script type="text/javascript" src="./js/libraries/d3.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="./src/css/styles.css" media="all" />    
+    <script type="text/javascript">require('./js/configurator_main.js');</script>
     <script type="text/javascript" src="./js/libraries/three/three.min.js"></script>
     <script type="text/javascript" src="./js/libraries/three/GLTFLoader.js"></script>
-    <script type="text/javascript" src="./js/libraries/three/OrbitControls.js"></script>
-    <script type="text/javascript" src="./js/libraries/bundle_xml2js.js"></script>
-    <script type="text/javascript" src="./js/libraries/Projector.js"></script>
-    <script type="text/javascript" src="./js/libraries/CanvasRenderer.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery.flightindicators.js"></script>
-    <script type="text/javascript" src="./js/libraries/semver.js"></script>
-    <script type="text/javascript" src="./js/libraries/jbox/jBox.min.js"></script>
-    <script type="text/javascript" src="./js/libraries/switchery/switchery.js"></script>
-    <script type="text/javascript" src="./js/libraries/jquery.ba-throttle-debounce.js"></script>
-    <script type="text/javascript" src="./js/helpers.js"></script>
-    <script type="text/javascript" src="./js/injected_methods.js"></script>
-    <script type="text/javascript" src="./js/intervals.js"></script>
-    <script type="text/javascript" src="./js/timeouts.js"></script>
-    <script type="text/javascript" src="./js/pid_controller.js"></script>
-    <script type="text/javascript" src="./js/simple_smooth_filter.js"></script>
-    <script type="text/javascript" src="./js/walking_average_filter.js"></script>
-    <script type="text/javascript" src="./js/gui.js"></script>
-    <script type="text/javascript" src="./js/msp/MSPCodes.js"></script>
-    <script type="text/javascript" src="./js/msp/MSPHelper.js"></script>
-    <script type="text/javascript" src="./js/msp/MSPchainer.js"></script>
-    <script type="text/javascript" src="./js/port_handler.js"></script>
-    <script type="text/javascript" src="./js/connection/connection.js"></script>
-    <script type="text/javascript" src="./js/connection/connectionBle.js"></script>
-    <script type="text/javascript" src="./js/connection/connectionSerial.js"></script>
-    <script type="text/javascript" src="./js/connection/connectionTcp.js"></script>
-    <script type="text/javascript" src="./js/connection/connectionUdp.js"></script>
-    <script type="text/javascript" src="./js/servoMixRule.js"></script>
-    <script type="text/javascript" src="./js/motorMixRule.js"></script>
-    <script type="text/javascript" src="./js/logicCondition.js"></script>
-    <script type="text/javascript" src="./js/settings.js"></script>
-    <script type="text/javascript" src="./js/outputMapping.js"></script>
-    <script type="text/javascript" src="./js/model.js"></script>
-    <script type="text/javascript" src="./js/serial_backend.js"></script>
-    <script type="text/javascript" src="./js/data_storage.js"></script>
-    <script type="text/javascript" src="./js/fc.js"></script>
-    <script type="text/javascript" src="./js/msp.js"></script>
-    <script type="text/javascript" src="./js/protocols/stm32.js"></script>
-    <script type="text/javascript" src="./js/protocols/stm32usbdfu.js"></script>
-    <script type="text/javascript" src="./js/localization.js"></script>
-    <script type="text/javascript" src="./js/boards.js"></script>
-    <script type="text/javascript" src="./js/servoMixerRuleCollection.js"></script>
-    <script type="text/javascript" src="./js/motorMixerRuleCollection.js"></script>
-    <script type="text/javascript" src="./js/logicConditionsCollection.js"></script>
-    <script type="text/javascript" src="./js/logicConditionsStatus.js"></script>
-    <script type="text/javascript" src="./js/globalVariablesStatus.js"></script>
-    <script type="text/javascript" src="./js/programmingPid.js"></script>
-    <script type="text/javascript" src="./js/programmingPidCollection.js"></script>
-    <script type="text/javascript" src="./js/programmingPidStatus.js"></script>
-    <script type="text/javascript" src="./js/vtx.js"></script>
-    <script type="text/javascript" src="./js/tabs.js"></script>
-    <script type="text/javascript" src="./js/eventFrequencyAnalyzer.js"></script>
-    <script type="text/javascript" src="./js/periodicStatusUpdater.js"></script>
-    <script type="text/javascript" src="./js/serial_queue.js"></script>
-    <script type="text/javascript" src="./js/msp_balanced_interval.js"></script>gt
-    <script type="text/javascript" src="./js/peripherals.js"></script>
-    <script type="text/javascript" src="./js/appUpdater.js"></script>
-    <script type="text/javascript" src="./js/feature_framework.js"></script>
-    <script type="text/javascript" src="./js/defaults_dialog.js"></script>
-    <script type="text/javascript" src="./js/safehomeCollection.js"></script>
-    <script type="text/javascript" src="./js/safehome.js"></script>
-    <script type="text/javascript" src="./js/waypointCollection.js"></script>
-    <script type="text/javascript" src="./js/waypoint.js"></script>
-    <script type="text/javascript" src="./js/libraries/plotly-latest.min.js"></script>
-
-    <script type="text/javascript" src="./tabs/adjustments.js"></script>
-    <script type="text/javascript" src="./tabs/advanced_tuning.js"></script>
-    <script type="text/javascript" src="./tabs/auxiliary.js"></script>
-    <script type="text/javascript" src="./tabs/calibration.js"></script>
-    <script type="text/javascript" src="./tabs/cli.js"></script>
-    <script type="text/javascript" src="./tabs/configuration.js"></script>
-    <script type="text/javascript" src="./tabs/ez_tune.js"></script>
-    <script type="text/javascript" src="./tabs/failsafe.js"></script>
-    <script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
-    <script type="text/javascript" src="./tabs/gps.js"></script>
-    <script type="text/javascript" src="./tabs/landing.js"></script>
-    <script type="text/javascript" src="./tabs/led_strip.js"></script>
-    <script type="text/javascript" src="./tabs/logging.js"></script>
-    <script type="text/javascript" src="./tabs/magnetometer.js"></script>
-    <script type="text/javascript" src="./tabs/mission_control.js"></script>
-    <script type="text/javascript" src="./tabs/mixer.js"></script>
-    <script type="text/javascript" src="./tabs/modes.js"></script>
-    <script type="text/javascript" src="./tabs/onboard_logging.js"></script>
-    <script type="text/javascript" src="./tabs/osd.js"></script>
-    <script type="text/javascript" src="./tabs/outputs.js"></script>
-    <script type="text/javascript" src="./tabs/pid_tuning.js"></script>
-    <script type="text/javascript" src="./tabs/ports.js"></script>
-    <script type="text/javascript" src="./tabs/programming.js"></script>
-    <script type="text/javascript" src="./tabs/receiver.js"></script>
-    <script type="text/javascript" src="./tabs/receiver_msp.js"></script>
-    <script type="text/javascript" src="./tabs/sensors.js"></script>
-    <script type="text/javascript" src="./tabs/setup.js"></script>
-    <script type="text/javascript" src="./tabs/sitl.js"></script>
-
-    <script>if (window.module) module = window.module;</script>
     <title></title>
 </head>
 

diff --git a/js/CliAutoComplete.js b/js/CliAutoComplete.js
@@ -552,3 +552,5 @@ CliAutoComplete._initTextcomplete = function() {
         }),
     ]);
 };
+
+module.exports = CliAutoComplete;
diff --git a/js/appUpdater.js b/js/appUpdater.js
@@ -5,7 +5,7 @@ var appUpdater = appUpdater || {};
 appUpdater.checkRelease = function (currVersion) {
     var modalStart;
     $.get('https://api.github.com/repos/iNavFlight/inav-configurator/releases', function (releaseData) {
-        GUI.log(localization.getMessage('loadedReleaseInfo'));
+        GUI.log(i18n.getMessage('loadedReleaseInfo'));
         //Git return sorted list, 0 - last release
 
         let newVersion = releaseData[0].tag_name;
@@ -15,7 +15,7 @@ appUpdater.checkRelease = function (currVersion) {
             GUI.log(newVersion, app.getVersion());
             GUI.log(currVersion);
 
-            GUI.log(localization.getMessage('newVersionAvailable'));
+            GUI.log(i18n.getMessage('newVersionAvailable'));
             modalStart = new jBox('Modal', {
                 width: 400,
                 height: 200,

diff --git a/js/bitHelper.js b/js/bitHelper.js
@@ -0,0 +1,34 @@
+'use strict'
+
+var BitHelper = function() {
+
+    var self = {};
+
+    self.highByte = function (num) {
+        return num >> 8;
+    }
+
+    self.lowByte = function (num) {
+        return 0x00FF & num;
+    }
+
+    self.specificByte = function (num, pos) {
+        return 0x000000FF & (num >> (8 * pos));
+    }
+
+    self.bit_check = function (num, bit) {
+        return ((num >> bit) % 2 != 0);
+    }
+
+    self.bit_set = function (num, bit) {
+        return num | 1 << bit;
+    }
+
+    self.bit_clear = function(num, bit) {
+        return num & ~(1 << bit);
+    }
+
+    return self;
+}();
+
+module.exports = BitHelper;
diff --git a/js/boards.js b/js/boards.js
@@ -59,3 +59,6 @@ BOARD.findDefinition = function (identifier) {
     }
     return DEFAULT_BOARD_DEFINITION;
 };
+
+module.exports = BOARD;
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -552,3 +552,5 @@ CliAutoComplete._initTextcomplete = function() { @@
             }),
         ]);
     };
+    module.exports = CliAutoComplete;