Fix Mission Planner, uniform fs requires

js/main.js

@@ -85,8 +85,6 @@ function createWindow() {
     menu.append(new MenuItem({ label: 'Copy', role: 'copy', accelerator: 'CmdOrCtrl+C', visible: props.selectionText }));
     menu.append(new MenuItem({ label: 'Paste', role: 'paste', accelerator: 'CmdOrCtrl+V', visible: props.isEditable }));
     menu.append(new MenuItem({ label: "Select all", role: 'selectAll', accelerator: 'CmdOrCtrl+A', visible: props.isEditable}));
-    
-
 
     menu.items.forEach(item => {
       if (item.visible) {

tabs/cli.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
 const { dialog } = require("@electron/remote");
 
 const MSP = require('./../js/msp');
@@ -170,7 +171,6 @@ TABS.cli.initialize = function (callback) {
                     return;
                 }
                 
-                const fs = require('fs');
                 fs.writeFile(result.filePath, self.outputHistory, (err) => {
                     if (err) {
                         GUI.log(i18n.getMessage('ErrorWritingFile'));
@@ -255,7 +255,6 @@ TABS.cli.initialize = function (callback) {
                 }
 
                 if (result.filePaths.length == 1) {
-                    const fs = require('fs');
                     fs.readFile(result.filePaths[0], (err, data) => {
                         if (err) {
                             GUI.log(i18n.getMessage('ErrorReadingFile'));

tabs/firmware_flasher.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { marked } = require('marked');
+const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
 const { dialog } = require('@electron/remote');
@@ -254,8 +255,6 @@ TABS.firmware_flasher.initialize = function (callback) {
                 if (result.filePaths.length == 1) {
                     filename = result.filePaths[0];
                 }
-
-                const fs = require('fs');
                 
                 $('div.git_info').slideUp();
 

tabs/logging.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
 const { dialog } = require("@electron/remote");
 const Store = require('electron-store');
 const store = new Store();
@@ -84,7 +85,6 @@ TABS.logging.initialize = function (callback) {
                             }
 
                             interval.add('log_data_poll', log_data_poll, parseInt($('select.speed').val()), true); // refresh rate goes here
-                            const fs = require('fs');
                             interval.add('write_data', function write_data() {
                                 if (log_buffer.length && readyToWrite) { // only execute when there is actual data to write
 

tabs/mission_control.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const path = require('path');
+const fs = require('fs');
 const ol = require('openlayers');
+const xml2js = require('xml2js');
 const Store = require('electron-store');
 const store = new Store();
 const { dialog } = require("@electron/remote");
@@ -3161,9 +3163,6 @@ TABS.mission_control.initialize = function (callback) {
     //
     /////////////////////////////////////////////
     function loadMissionFile(filename) {
-        const fs = require('fs');
-        if (!window.xml2js) return GUI.log(i18n.getMessage('errorReadingFileXml2jsNotFound'));
-
         for (let i = FC.SAFEHOMES.getMaxSafehomeCount(); i < FC.FW_APPROACH.getMaxFwApproachCount(); i++) {
             FC.FW_APPROACH.clean(i);
         }
@@ -3174,7 +3173,7 @@ TABS.mission_control.initialize = function (callback) {
                 return console.error(err);
             }
 
-            window.xml2js.Parser({ 'explicitChildren': true, 'preserveChildrenOrder': true }).parseString(data, (err, result) => {
+            xml2js.Parser({ 'explicitChildren': true, 'preserveChildrenOrder': true }).parseString(data, (err, result) => {
                 if (err) {
                     GUI.log(i18n.getMessage('errorParsingFile'));
                     return console.error(err);
@@ -3344,9 +3343,6 @@ TABS.mission_control.initialize = function (callback) {
     }
 
     function saveMissionFile(filename) {
-        const fs = require('fs');
-        if (!window.xml2js) return GUI.log(i18n.getMessage('errorWritingFileXml2jsNotFound'));
-
         var center = ol.proj.toLonLat(map.getView().getCenter());
         var zoom = map.getView().getZoom();
         let multimission = multimissionCount && !singleMissionActive();
@@ -3408,7 +3404,7 @@ TABS.mission_control.initialize = function (callback) {
             approachIdx++;
         }
 
-        var builder = new window.xml2js.Builder({ 'rootName': 'mission', 'renderOpts': { 'pretty': true, 'indent': '\t', 'newline': '\n' } });
+        var builder = new xml2js.Builder({ 'rootName': 'mission', 'renderOpts': { 'pretty': true, 'indent': '\t', 'newline': '\n' } });
         var xml = builder.buildObject(data);
         xml = xml.replace(/missionitem mission/g, 'meta mission');
         fs.writeFile(filename, xml, (err) => {

tabs/onboard_logging.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { dialog } = require("@electron/remote");
+const fs = require('fs');
 const path = require('path');
 
 const MSPCodes = require('./../js/msp/MSPCodes');
@@ -357,7 +358,6 @@ TABS.onboard_logging.initialize = function (callback) {
                 const maxBytes = FC.DATAFLASH.usedSize;
 
                 prepare_file(function(filename) {
-                    const fs = require('fs');
                     let nextAddress = 0;
 
                     show_saving_dialog();

tabs/osd.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const inflection = require( 'inflection' );
+const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
 const mapSeries = require('promise-map-series');
@@ -269,7 +270,6 @@ FONT.openFontFile = function ($preview) {
             }
             
             if (result.filePaths.length == 1) {
-                const fs = require('fs');
                 const fontData = fs.readFileSync(result.filePaths[0], {flag: "r"});
                 FONT.parseMCMFontFile(fontData.toString());
                 resolve();