Merge branch 'master' into hdzero-osd

gulpfile.js

@@ -39,16 +39,16 @@ const LINUX_INSTALL_DIR = '/opt/emuflight';
 var gitChangeSetId;
 
 // FIXME: hardcoded version number
+// 0.45.6 Win7 connects; 0.42.3 fixed OSX Flashing; 0.46.X broke Win7 connect. maybe serial/usb needs updating
+// reverted to 0.42.6 due to Windows increased CLI-tab buffer/autocomplete issues.
+// 0.50.3 is last version to open Links properly. also works on Win11.
 var NWversion;
-if ((os.platform() === 'win32') || (os.platform() === 'win64')) {
+if (os.platform() === 'win32') {
     NWversion ='0.42.6'
 } else {
     NWversion ='0.50.3'
 }
 
-// 0.45.6 Win7 connects; 0.42.3 fixed OSX Flashing; 0.46.X breaks Win7 connect
-// maybe serial/usb needs updating
-// revert to 0.42.6 due to Windows® users increased CLI-tab buffer/autocomplete issues.
 var nwBuilderOptions = {
     version: NWversion,
     files: './dist/**/*',

locales/en/messages.json

@@ -230,10 +230,12 @@
     "configMigrationSuccessful": {
         "message": "Configuration migration complete, migrations applied: $1"
     },
-
     "tabFirmwareFlasher": {
         "message": "Firmware Flasher"
     },
+    "tabMixerCalc": {
+        "message": "Motor Mix Calc"
+    },
     "tabLanding": {
         "message": "Welcome"
     },
@@ -580,7 +582,7 @@
         "message": "NEWS"
     },
     "defaultWelcomeText": {
-        "message": "EmuFlight development is in heavy flux.  Some UI features may be unfinished or some firmware features only accessible via CLI.<br><br>EmuFlight source code and releases reside on <a href=\"https://github.com/emuflight/EmuFlight\" title=\"github.com/emuflight/EmuFlight\" target=\"_blank\">GitHub</a>.<br /><br /> Helio/Strix IMUF can be flashed via the <a href=\"https://github.com/emuflight/Nemesis/releases/tag/imuf-flasher-0.1.0\" target=\"_blank\">IMUF Flasher Tool</a> or Downloaded from the <a href=\"https://github.com/emuflight/imu-f/releases\" target=\"_blank\">IMUF releases</a> repository. <br /><br />EmuFlight BlackBox Logs can be read with a fork of BBE available from this <a href=\"https://github.com/emuflight/EmuFlight-Blackbox-Explorer/releases\" target=\"_blank\">EmuFlight-BlackBox-Explorer</a> repository.<br /><br />Latest <a href=\"https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers\" title=\"http://www.silabs.com\" target=\"_blank\">CP210x Drivers</a>.<br />Latest <a href=\"https://www.st.com/en/development-tools/stsw-stm32102.html\" title=\"http://www.st.com\" target=\"_blank\">STM USB VCP Drivers</a>.<br />Latest <a href=\"http://zadig.akeo.ie/\" title=\"http://zadig.akeo.ie\" target=\"_blank\">Zadig</a>.<br />"
+        "message": "EmuFlight development is in heavy flux.  Some UI features may be unfinished or some firmware features only accessible via CLI.<br><br>EmuFlight source code and releases reside on <a href=\"https://github.com/emuflight/EmuFlight\" title=\"github.com/emuflight/EmuFlight\" target=\"_blank\">GitHub</a>.<br /><br /> Helio/Strix IMUF can be flashed via the <a href=\"https://github.com/emuflight/Nemesis/releases/tag/imuf-flasher-0.1.0\" target=\"_blank\">IMUF Flasher Tool</a> or Downloaded from the <a href=\"https://github.com/emuflight/imu-f/releases\" target=\"_blank\">IMUF releases</a> repository. <br /><br />EmuFlight BlackBox Logs can be read with a fork of BBE available from this <a href=\"https://github.com/emuflight/EmuFlight-Blackbox-Explorer/releases\" target=\"_blank\">EmuFlight-BlackBox-Explorer</a> repository.<br /><br /><a href=\"https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers\" title=\"http://www.silabs.com\" target=\"_blank\">CP210x Drivers</a>.<br /><a href=\"https://www.st.com/en/development-tools/stsw-stm32102.html\" title=\"http://www.st.com\" target=\"_blank\">STM USB VCP Drivers</a>.<br /><a href=\"http://zadig.akeo.ie/\" title=\"http://zadig.akeo.ie\" target=\"_blank\">Zadig</a>.<br /><a href=\"https://impulserc.com/pages/downloads\" target=\"_blank\">ImpulseRC Driver Fixer</a>.<br />"
     },
     "defaultContributingHead": {
         "message": "Contributing"

src/css/tabs/mixercalc.css

@@ -0,0 +1,80 @@
+#tab-static {
+  background-color: inherit;
+  background-image: none;
+}
+
+a {
+  color: #00a3e0;
+}
+
+.button {
+  background-color: #00a3e0;
+  color: black;
+}
+
+.outputpanel {
+  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
+  width: 700px;
+  padding: 10px;
+  background-color: #f0fff0;
+  color: #000;
+  border: 1px solid #bbb;
+}
+
+.initially-hidden {
+  display: none;
+}
+
+.ajax-loading {
+  line-height: 16px;
+}
+
+table,
+th,
+td {
+  border-collapse: collapse;
+}
+
+th {
+  background-color: #eee;
+  text-align: center;
+  padding: 2px 6px 2px 6px;
+}
+
+td {
+  text-align: center;
+  padding: 4px;
+}
+
+.center {
+  text-align: center;
+  margin: auto;
+}
+
+#mixerviz {
+  width: 600px;
+  float: left;
+  display: block;
+}
+
+#mixerviz:focus {
+  box-shadow: 0 0 3pt 2pt #00a3e0;
+}
+
+#mixervals {
+  width: 360px;
+  padding: 6px;
+  display: inline-block;
+}
+
+#inputs {
+  width: 100px;
+  height: 250px;
+  color: #000;
+  border: 1px solid #000;
+  float: left;
+}
+
+#inputs:focus {
+  box-shadow: 0 0 2pt 2pt #00a3e0;
+}

src/js/gui.js

@@ -19,7 +19,8 @@ var GUI_control = function () {
         'changelog',
         'firmware_flasher',
         'privacy_policy',
-        'help'
+        'help',
+        'mixercalc'
     ];
     this.defaultAllowedFCTabsWhenConnected = [
         'setup',

src/js/main.js

@@ -270,6 +270,11 @@ function startProcess() {
                 }
 
                 switch (tab) {
+
+                    case 'mixercalc':
+                        TABS.staticTab.initialize('mixercalc', content_ready);
+                        break;
+
                     case 'landing':
                         TABS.landing.initialize(content_ready);
                         break;