diff --git a/js/appUpdater.js b/js/appUpdater.js
index 75ebdcf1..99668691 100644
--- a/js/appUpdater.js
+++ b/js/appUpdater.js
@@ -12,7 +12,7 @@ appUpdater.checkRelease = function (currVersion) {
let newPrerelase = releaseData[0].prerelease;
if (newPrerelase == false && semver.gt(newVersion, currVersion)) {
- GUI.log(newVersion, chrome.runtime.getManifest().version);
+ GUI.log(newVersion, app.getVersion());
GUI.log(currVersion);
GUI.log(localization.getMessage('newVersionAvailable'));
diff --git a/js/connection/connection.js b/js/connection/connection.js
index 0ab77d47..b0eeaba1 100644
--- a/js/connection/connection.js
+++ b/js/connection/connection.js
@@ -100,6 +100,7 @@ class Connection {
connect(path, options, callback) {
this._openRequested = true;
+ this._openCanceled = false;
this._failed = 0;
this.connectImplementation(path, options, connectionInfo => {
if (connectionInfo && !this._openCanceled) {
@@ -118,7 +119,7 @@ class Connection {
if (callback) {
callback(connectionInfo);
}
- } else if (connectionInfo && this.openCanceled) {
+ } else if (connectionInfo && this._openCanceled) {
// connection opened, but this connect sequence was canceled
// we will disconnect without triggering any callbacks
this._connectionId = connectionInfo.connectionId;
diff --git a/js/connection/connectionBle.js b/js/connection/connectionBle.js
index d95164bf..d660a2aa 100644
--- a/js/connection/connectionBle.js
+++ b/js/connection/connectionBle.js
@@ -95,9 +95,8 @@ class ConnectionBle extends Connection {
});
return navigator.bluetooth.requestDevice({
- //acceptAllDevices: true,
- //optionalServices: ids
- filters: [{ services: ['generic_attribute'] }],
+ acceptAllDevices: true,
+ optionalServices: ids
}).then(device => {
console.log("Found BLE device: " + device.name);
this._device = device;
@@ -251,4 +250,12 @@ class ConnectionBle extends Connection {
removeOnReceiveErrorCallback(callback) {
this._onDisconnectListeners = this._onDisconnectListeners.filter(listener => listener !== callback);
}
+
+ static getBleUUIDs() {
+ var ids = [];
+ BleDevices.forEach(device => {
+ ids.push(device.serviceUuid)
+ });
+ return ids;
+ }
}
diff --git a/js/connection/connectionSerial.js b/js/connection/connectionSerial.js
index 5cdbd581..150d4a7c 100644
--- a/js/connection/connectionSerial.js
+++ b/js/connection/connectionSerial.js
@@ -16,23 +16,6 @@ class ConnectionSerial extends Connection {
connectImplementation(path, options, callback) {
try {
this._serialport = new SerialPortStream({binding, path: path, baudRate: options.bitrate, autoOpen: true}, () => {
-
- this._serialport.on('data', buffer => {
- this._onReceiveListeners.forEach(listener => {
- listener({
- connectionId: this._connectionId,
- data: buffer
- });
- });
- })
-
- this._serialport.on('error', error => {
- console.log("Serial error: " + error);
- this._onReceiveErrorListeners.forEach(listener => {
- listener(error);
- });
- });
-
if (callback) {
callback({
connectionId: ++this._connectionId,
@@ -44,6 +27,27 @@ class ConnectionSerial extends Connection {
console.log(error);
callback(false);
}
+
+ this._serialport.on('data', buffer => {
+ this._onReceiveListeners.forEach(listener => {
+ listener({
+ connectionId: this._connectionId,
+ data: buffer
+ });
+ });
+ });
+
+ this._serialport.on('close', error => {
+ this.abort();
+ });
+
+ this._serialport.on('error', error => {
+ this.abort();
+ console.log("Serial error: " + error);
+ this._onReceiveErrorListeners.forEach(listener => {
+ listener(error);
+ });
+ });
}
disconnectImplementation(callback) {
@@ -52,24 +56,27 @@ class ConnectionSerial extends Connection {
if (error) {
console.log("Unable to close serial: " + error)
}
- if (callback) {
- callback(error ? false : true);
- }
});
}
+
+ if (callback) {
+ callback(true);
+ }
}
sendImplementation(data, callback) {
if (this._serialport && this._serialport.isOpen) {
this._serialport.write(Buffer.from(data), error => {
var result = 0;
+ var sent = data.byteLength;
if (error) {
result = 1;
+ sent = 0;
console.log("Serial wrire error: " + error)
}
if (callback) {
callback({
- bytesSent: data.byteLength,
+ bytesSent: sent,
resultCode: result
});
}
diff --git a/js/connection/connectionTcp.js b/js/connection/connectionTcp.js
index 1650e615..f4c54a3b 100644
--- a/js/connection/connectionTcp.js
+++ b/js/connection/connectionTcp.js
@@ -1,5 +1,7 @@
'use strict'
+const net = require('net')
+
const STANDARD_TCP_PORT = 5761;
class ConnectionTcp extends Connection {
@@ -7,8 +9,11 @@ class ConnectionTcp extends Connection {
constructor() {
super();
+ this._socket = null;
this._connectionIP = "";
this.connectionPort = 0;
+ this._onReceiveListeners = [];
+ this._onErrorListener = [];
}
connectImplementation(address, options, callback) {
@@ -21,95 +26,62 @@ class ConnectionTcp extends Connection {
this._connectionPort = STANDARD_PORT;
}
- chrome.sockets.tcp.create({
- name: "iNavTCP",
- bufferSize: 65535
- }, createInfo => {
- this.checkChromeLastError();
- if (createInfo && !this._openCanceled) {
- chrome.sockets.tcp.connect(createInfo.socketId, this._connectionIP, this._connectionPort, result => {
- this.checkChromeLastError();
-
- if (result == 0) {
- // Disable Nagle's algorithm
- chrome.sockets.tcp.setNoDelay(createInfo.socketId, true, noDelayResult => {
- this.checkChromeLastError();
- if (noDelayResult < 0) {
- console.warn("Unable to set TCP_NODELAY: " + noDelayResult);
- if (callback) {
- callback(false);
- }
- }
-
- this.addOnReceiveErrorListener(info => {
- console.error(info);
-
- let message;
- switch (info.resultCode) {
- case -15:
- // connection is lost, cannot write to it anymore, preventing further disconnect attempts
- message = 'error: ERR_SOCKET_NOT_CONNECTED';
- console.log(`TCP: ${message}: ${info.resultCode}`);
- this._connectionId = false;
- return;
- case -21:
- message = 'error: NETWORK_CHANGED';
- break;
- case -100:
- message = 'error: CONNECTION_CLOSED';
- break;
- case -102:
- message = 'error: CONNECTION_REFUSED';
- break;
- case -105:
- message = 'error: NAME_NOT_RESOLVED';
- break;
- case -106:
- message = 'error: INTERNET_DISCONNECTED';
- break;
- case -109:
- message = 'error: ADDRESS_UNREACHABLE';
- break;
- }
-
- let resultMessage = message ? `${message} ${info.resultCode}` : info.resultCode;
- console.warn(`TCP: ${resultMessage} ID: ${this._connectionId}`);
-
- this.abort();
- });
-
- GUI.log(localization.getMessage('connectionConnected', ["tcp://" + this._connectionIP + ":" + this._connectionPort]));
-
- if (callback) {
- callback({
- bitrate: 115200,
- connectionId: createInfo.socketId
- });
- }
-
- });
- } else {
- console.error("Unable to open TCP socket: " + result);
- if (callback) {
- callback(false);
- }
- }
- });
- } else {
- console.error("Unable to create TCP socket.");
-
+ try {
+ this._socket = net.connect({ host: this._connectionIP, port: this._connectionPort }, () => {
+ this._socket.setNoDelay(true);
+ GUI.log(localization.getMessage('connectionConnected', ["tcp://" + this._connectionIP + ":" + this._connectionPort]));
+
if (callback) {
- callback(false);
+ callback({
+ bitrate: 115200,
+ connectionId: ++this._connectionId
+ });
}
+
+ });
+ } catch (error) {
+ console.log(error);
+ callback(false);
+ }
+
+ this._socket.on('data', buffer => {
+ this._onReceiveListeners.forEach(listener => {
+ listener({
+ connectionId: this._connectionId,
+ data: buffer
+ });
+ });
+ })
+
+ this._socket.on('end', () => {
+ console.log("TCP Remote has closed the connection");
+ if (this._socket) {
+ this.abort();
}
});
+
+ this._socket.on('error', (error) => {
+ GUI.log("TCP error: " + error);
+ console.log("TCP error: " + error);
+
+ if (this._socket) {
+ this.abort();
+ }
+ this._onReceiveErrorListeners.forEach(listener => {
+ listener(error);
+ });
+ });
}
disconnectImplementation(callback) {
- chrome.sockets.tcp.disconnect(this._connectionId);
- this.checkChromeLastError();
+
+ if (this._socket && !this._socket.destroyed) {
+ this._socket.end();
+ }
+
this._connectionIP = "";
this._connectionPort = 0;
+ this._socket = null;
if (callback) {
callback(true);
@@ -117,22 +89,31 @@ class ConnectionTcp extends Connection {
}
sendImplementation(data, callback) {;
- chrome.sockets.tcp.send(this._connectionId, data, callback);
+ if (this._socket && !this._socket.destroyed) {
+ this._socket.write(Buffer.from(data), () => {
+ if (callback) {
+ callback({
+ bytesSent: data.byteLength,
+ resultCode: 0
+ });
+ }
+ })
+ }
}
addOnReceiveCallback(callback){
- chrome.sockets.tcp.onReceive.addListener(callback);
+ this._onReceiveErrorListeners.push(callback);
}
removeOnReceiveCallback(callback){
- chrome.sockets.tcp.onReceive.removeListener(callback);
+ this._onReceiveListeners = this._onReceiveErrorListeners.filter(listener => listener !== callback);
}
addOnReceiveErrorCallback(callback) {
- chrome.sockets.tcp.onReceiveError.addListener(callback);
+ this._onReceiveErrorListeners.push(callback);
}
removeOnReceiveErrorCallback(callback) {
- chrome.sockets.tcp.onReceiveError.removeListener(callback);
+ this._onReceiveErrorListeners = this._onReceiveErrorListeners.filter(listener => listener !== callback);
}
}
diff --git a/js/connection/connectionUdp.js b/js/connection/connectionUdp.js
index c99aa551..247cd1a2 100644
--- a/js/connection/connectionUdp.js
+++ b/js/connection/connectionUdp.js
@@ -1,25 +1,21 @@
'use strict'
-const STANDARD_UDP_PORT = 5762;
+const dgram = require('node:dgram');
+const socket = dgram.createSocket('udp4');
+const STANDARD_UDP_PORT = 5761;
class ConnectionUdp extends Connection {
+
constructor() {
super();
-
+
this._connectionIP = "";
this._connectionPort = 0;
- this._timeoutId = false;
- this._isCli = false;
+ this._onReceiveListeners = [];
+ this._onErrorListener = [];
}
- /**
- * @param {boolean} value
- */
- set isCli(value) {
- this._isCli = value;
- }
-
- connectImplementation(address, options, callback) {
+ connectImplementation(address, options, callback) {
var addr = address.split(':');
if (addr.length >= 2) {
this._connectionIP = addr[0];
@@ -29,120 +25,94 @@ class ConnectionUdp extends Connection {
this._connectionPort = STANDARD_UDP_PORT;
}
- chrome.sockets.udp.create({
- name: "iNavUDP",
- bufferSize: 65535,
- }, createInfo => {
- this.checkChromeLastError();
- if (createInfo && !this._openCanceled) {
- chrome.sockets.udp.bind(createInfo.socketId, "0.0.0.0", this._connectionPort, result => {
- this.checkChromeLastError();
- if (result == 0) {
- // UDP connections don't trigger an event if they are interrupted, a simple timeout mechanism must suffice here.
- this.addOnReceiveCallback(() => {
- if (this._timeoutId) {
- clearTimeout(this._timeoutId);
- }
-
- this._timeoutId = setTimeout(() => {
- if (!this._isCli) { // Disable timeout for CLI
- GUI.log(localization.getMessage('connectionUdpTimeout'));
- this.abort();
- }
- }, 10000);
- })
-
- // Actually useless, but according to chrome documentation also UDP triggers error events ¯\_(ツ)_/¯
- this.addOnReceiveErrorListener(info => {
- console.error(info);
-
- let message;
- switch (info.resultCode) {
- case -15:
- // connection is lost, cannot write to it anymore, preventing further disconnect attempts
- message = 'error: ERR_SOCKET_NOT_CONNECTED';
- console.log(`UDP: ${message}: ${info.resultCode}`);
- this._connectionId = false;
- return;
- case -21:
- message = 'error: NETWORK_CHANGED';
- break;
- case -100:
- message = 'error: CONNECTION_CLOSED';
- break;
- case -102:
- message = 'error: CONNECTION_REFUSED';
- break;
- case -105:
- message = 'error: NAME_NOT_RESOLVED';
- break;
- case -106:
- message = 'error: INTERNET_DISCONNECTED';
- break;
- case -109:
- message = 'error: ADDRESS_UNREACHABLE';
- break;
- }
-
- let resultMessage = message ? `${message} ${info.resultCode}` : info.resultCode;
- console.warn(`UDP: ${resultMessage} ID: ${this._connectionId}`);
-
- this.abort();
- });
-
- GUI.log(localization.getMessage('connectionConnected', ["udp://" + this._connectionIP + ":" + this._connectionPort]));
-
- if (callback) {
- callback({
- bitrate: 115200,
- connectionId: createInfo.socketId
- });
- }
- } else {
- console.error("Unable to open UDP socket: " + result);
- if (callback) {
- callback(false);
- }
- }
- });
- } else {
- console.error("Unable to create UDP socket.");
+ try {
+ socket.bind(this._connectionPort, () => {
+ GUI.log(localization.getMessage('connectionConnected', ["udp://" + this._connectionIP + ":" + this._connectionPort]));
if (callback) {
- callback(false);
+ callback({
+ bitrate: 115200,
+ connectionId: ++this._connectionId
+ });
}
- }
+
+ });
+ } catch (error) {
+ console.log(error);
+ callback(false);
+ }
+
+ socket.on('message', (msg, _rinfo) => {
+ this._onReceiveListeners.forEach(listener => {
+ listener({
+ connectionId: ++this._connectionId,
+ data: msg
+ });
+ });
+ })
+
+ socket.on('error', (error) => {
+ GUI.log("UDP error: " + error);
+ console.log("UDP error: " + error);
+ this.abort();
+ this._onReceiveErrorListeners.forEach(listener => {
+ listener(error);
+ });
});
}
disconnectImplementation(callback) {
- chrome.sockets.udp.close(this._connectionId);
- this.checkChromeLastError();
+ var ret = true;
+ try {
+ socket.disconnect();
+ } catch (error) {
+ console.log("Disconecct error: " + error)
+ ret = false;
+ }
+
this._connectionIP = "";
this._connectionPort = 0;
- clearTimeout(this._timeoutId);
- this._timeoutId = false;
- if (callback) {
- callback(true);
- }
+
+ if (callback) {
+ callback(ret);
+ }
}
- sendImplementation(data, callback) {;
- chrome.sockets.udp.send(this._connectionId, data, this._connectionIP, this._connectionPort, callback);
- }
+ sendImplementation(data, callback) {;
+ try {
+ socket.send(Buffer.from(data), this._connectionPort, this._connectionIP, (error) => {
+ var result = 0;
+ var sent = data.byteLength;
+ if (error) {
+ result = 1;
+ sent = 0;
+ console.log("Serial wrire error: " + error)
+ }
+ if (callback) {
+ callback({
+ bytesSent: sent,
+ resultCode: result
+ });
+ }
+ });
+ } catch (error) {
+ console.log("UDP write error: " + error)
+ }
+ }
+
addOnReceiveCallback(callback){
- chrome.sockets.udp.onReceive.addListener(callback);
+ this._onReceiveErrorListeners.push(callback);
}
removeOnReceiveCallback(callback){
- chrome.sockets.udp.onReceive.removeListener(callback);
+ this._onReceiveListeners = this._onReceiveErrorListeners.filter(listener => listener !== callback);
}
addOnReceiveErrorCallback(callback) {
- chrome.sockets.udp.onReceiveError.addListener(callback);
+ this._onReceiveErrorListeners.push(callback);
}
removeOnReceiveErrorCallback(callback) {
- chrome.sockets.udp.onReceiveError.removeListener(callback);
+ this._onReceiveErrorListeners = this._onReceiveErrorListeners.filter(listener => listener !== callback);
}
}
diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js
index de94ea06..fb0dd2fc 100644
--- a/js/defaults_dialog.js
+++ b/js/defaults_dialog.js
@@ -1033,7 +1033,7 @@ helper.defaultsDialog = (function () {
privateScope.onPresetClick = function (event) {
savingDefaultsModal = new jBox('Modal', {
width: 400,
- height: 100,
+ height: 120,
animation: false,
closeOnClick: false,
closeOnEsc: false,
diff --git a/js/helpers.js b/js/helpers.js
index 914fbbaa..b39fb2b7 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -1,15 +1,8 @@
/*global $*/
+
'use strict';
function checkChromeRuntimeError() {
- if (chrome.runtime.lastError) {
- console.error(
- `Chrome API Error: ${chrome.runtime.lastError.message}.\n Traced ${
- new Error().stack
- }`
- );
- return true;
- }
return false;
}
diff --git a/js/libraries/bluetooth-device-chooser/index.html b/js/libraries/bluetooth-device-chooser/index.html
new file mode 100644
index 00000000..b88d9dad
--- /dev/null
+++ b/js/libraries/bluetooth-device-chooser/index.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
Bluetooth Device Chooser
+
+
+
Select Bluetooth device:
+
+
\ No newline at end of file
diff --git a/js/libraries/bluetooth-device-chooser/preload.js b/js/libraries/bluetooth-device-chooser/preload.js
new file mode 100644
index 00000000..892e4de4
--- /dev/null
+++ b/js/libraries/bluetooth-device-chooser/preload.js
@@ -0,0 +1,6 @@
+const { contextBridge, ipcRenderer } = require('electron/renderer');
+
+contextBridge.exposeInMainWorld('electronAPI', {
+ bleScan: (callback) => ipcRenderer.on('ble-scan', (_event, data) => callback(data)),
+ deviceSelected: (deviceId) => ipcRenderer.send('deviceSelected', deviceId)
+});
\ No newline at end of file
diff --git a/js/libraries/bluetooth-device-chooser/renderer.js b/js/libraries/bluetooth-device-chooser/renderer.js
new file mode 100644
index 00000000..c2856e6f
--- /dev/null
+++ b/js/libraries/bluetooth-device-chooser/renderer.js
@@ -0,0 +1,22 @@
+document.addEventListener("DOMContentLoaded", () => {
+ window.electronAPI.bleScan(data => {
+ data.forEach(device => {
+ var dev = document.getElementById(device.deviceId)
+ if (dev) {
+ dev.parentElement.removeChild(dev);
+ }
+ var item = document.createElement('div');
+ item.className = 'item'
+ item.id = device.deviceId;
+ item.addEventListener('click', () => {
+ window.electronAPI.deviceSelected(item.id);
+ window.close();
+ });
+ item.appendChild(document.createTextNode(device.deviceName + ' (' + device.deviceId + ')'));
+ document.getElementById('list').prepend(item);
+ });
+ });
+ document.getElementById('cancel').addEventListener('click', () => {
+ window.close();
+ });
+});
diff --git a/js/libraries/bluetooth-device-chooser/style.css b/js/libraries/bluetooth-device-chooser/style.css
new file mode 100644
index 00000000..c2e7af3e
--- /dev/null
+++ b/js/libraries/bluetooth-device-chooser/style.css
@@ -0,0 +1,38 @@
+body {
+ font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+ background-color: black;
+ margin: 10px;
+}
+
+h1 {
+ font-size: 20px;
+ font-weight: bold;
+ color: white;
+}
+
+#id {
+ margin: 5px;
+}
+
+#list {
+ color: white;
+}
+
+.item {
+ margin: 5px;
+ padding: 5px;
+ height: 40px;
+ line-height: 40px;
+ width: 345px;
+ display: inline-block;
+ vertical-align: middle;
+ border: 1px solid whitesmoke;
+}
+
+.item:hover {
+ background-color: rgb(88, 88, 192);
+}
+
+#cancel {
+ text-align: center;
+}
diff --git a/js/libraries/google-analytics-bundle.js b/js/libraries/google-analytics-bundle.js
deleted file mode 100644
index 9fff0880..00000000
--- a/js/libraries/google-analytics-bundle.js
+++ /dev/null
@@ -1,87 +0,0 @@
-(function() { var g,aa=aa||{},h=this,ba=function(){},ca=function(a){var b=typeof a;if("object"==b)if(a){if(a instanceof Array)return"array";if(a instanceof Object)return b;var c=Object.prototype.toString.call(a);if("[object Window]"==c)return"object";if("[object Array]"==c||"number"==typeof a.length&&"undefined"!=typeof a.splice&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("splice"))return"array";if("[object Function]"==c||"undefined"!=typeof a.call&&"undefined"!=typeof a.propertyIsEnumerable&&
-!a.propertyIsEnumerable("call"))return"function"}else return"null";else if("function"==b&&"undefined"==typeof a.call)return"object";return b},m=function(a){return"array"==ca(a)},da=function(a){var b=ca(a);return"array"==b||"object"==b&&"number"==typeof a.length},n=function(a){return"string"==typeof a},ea=function(a){return"number"==typeof a},p=function(a){return"function"==ca(a)},q=function(a){var b=typeof a;return"object"==b&&null!=a||"function"==b},fa=function(a,b,c){return a.call.apply(a.bind,
-arguments)},ga=function(a,b,c){if(!a)throw Error();if(2
b?1:0};var w=Array.prototype,ja=w.indexOf?function(a,b,c){return w.indexOf.call(a,b,c)}:function(a,b,c){c=null==c?0:0>c?Math.max(0,a.length+c):c;if(n(a))return n(b)&&1==b.length?a.indexOf(b,c):-1;for(;cb?null:n(a)?a.charAt(b):a[b]},pa=function(a,b){var c=ja(a,b),d;(d=0<=c)&&w.splice.call(a,c,1);return d},qa=function(a){return w.concat.apply(w,
-arguments)},ra=function(a,b,c){return 2>=arguments.length?w.slice.call(a,b):w.slice.call(a,b,c)};var sa="StopIteration"in h?h.StopIteration:Error("StopIteration"),ta=function(){};ta.prototype.next=function(){throw sa;};ta.prototype.vc=function(){return this};var ua=function(a,b,c){for(var d in a)b.call(c,a[d],d,a)},va=function(a){var b=[],c=0,d;for(d in a)b[c++]=a[d];return b},wa=function(a){var b=[],c=0,d;for(d in a)b[c++]=d;return b},xa=function(a,b){var c;t:{for(c in a)if(b.call(void 0,a[c],c,a))break t;c=void 0}return c&&a[c]},ya="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),za=function(a,b){for(var c,d,e=1;e2*this.h&&Aa(this),!0):!1};var Aa=function(a){if(a.h!=a.b.length){for(var b=0,c=0;b=c.length)throw sa;var k=c[b++];return a?k:d[k]}};return k};var y=function(a,b){return Object.prototype.hasOwnProperty.call(a,b)};var Ba,Ca,Da={id:"hitType",name:"t",valueType:"text",maxLength:void 0,defaultValue:void 0},Ea={id:"sessionControl",name:"sc",valueType:"text",maxLength:void 0,defaultValue:void 0},Fa={id:"description",name:"cd",valueType:"text",maxLength:2048,defaultValue:void 0},Ga={id:"eventCategory",name:"ec",valueType:"text",maxLength:150,defaultValue:void 0},Ha={id:"eventAction",name:"ea",valueType:"text",maxLength:500,defaultValue:void 0},Ia={id:"eventLabel",name:"el",valueType:"text",maxLength:500,defaultValue:void 0},
-Ja={id:"eventValue",name:"ev",valueType:"integer",maxLength:void 0,defaultValue:void 0},Ka={pd:Da,Qc:{id:"anonymizeIp",name:"aip",valueType:"boolean",maxLength:void 0,defaultValue:void 0},Ad:{id:"queueTime",name:"qt",valueType:"integer",maxLength:void 0,defaultValue:void 0},Wc:{id:"cacheBuster",name:"z",valueType:"text",maxLength:void 0,defaultValue:void 0},Gd:Ea,Wd:{id:"userId",name:"uid",valueType:"text",maxLength:void 0,defaultValue:void 0},xd:{id:"nonInteraction",name:"ni",valueType:"boolean",
-maxLength:void 0,defaultValue:void 0},fd:Fa,Pd:{id:"title",name:"dt",valueType:"text",maxLength:1500,defaultValue:void 0},Sc:{id:"appId",name:"aid",valueType:"text",maxLength:150,defaultValue:void 0},Tc:{id:"appInstallerId",name:"aiid",valueType:"text",maxLength:150,defaultValue:void 0},jd:Ga,hd:Ha,kd:Ia,ld:Ja,Id:{id:"socialNetwork",name:"sn",valueType:"text",maxLength:50,defaultValue:void 0},Hd:{id:"socialAction",name:"sa",valueType:"text",maxLength:50,defaultValue:void 0},Jd:{id:"socialTarget",
-name:"st",valueType:"text",maxLength:2048,defaultValue:void 0},Sd:{id:"transactionId",name:"ti",valueType:"text",maxLength:500,defaultValue:void 0},Rd:{id:"transactionAffiliation",name:"ta",valueType:"text",maxLength:500,defaultValue:void 0},Td:{id:"transactionRevenue",name:"tr",valueType:"currency",maxLength:void 0,defaultValue:void 0},Ud:{id:"transactionShipping",name:"ts",valueType:"currency",maxLength:void 0,defaultValue:void 0},Vd:{id:"transactionTax",name:"tt",valueType:"currency",maxLength:void 0,
-defaultValue:void 0},dd:{id:"currencyCode",name:"cu",valueType:"text",maxLength:10,defaultValue:void 0},td:{id:"itemPrice",name:"ip",valueType:"currency",maxLength:void 0,defaultValue:void 0},ud:{id:"itemQuantity",name:"iq",valueType:"integer",maxLength:void 0,defaultValue:void 0},rd:{id:"itemCode",name:"ic",valueType:"text",maxLength:500,defaultValue:void 0},sd:{id:"itemName",name:"in",valueType:"text",maxLength:500,defaultValue:void 0},qd:{id:"itemCategory",name:"iv",valueType:"text",maxLength:500,
-defaultValue:void 0},bd:{id:"campaignSource",name:"cs",valueType:"text",maxLength:100,defaultValue:void 0},$c:{id:"campaignMedium",name:"cm",valueType:"text",maxLength:50,defaultValue:void 0},ad:{id:"campaignName",name:"cn",valueType:"text",maxLength:100,defaultValue:void 0},Zc:{id:"campaignKeyword",name:"ck",valueType:"text",maxLength:500,defaultValue:void 0},Xc:{id:"campaignContent",name:"cc",valueType:"text",maxLength:500,defaultValue:void 0},Yc:{id:"campaignId",name:"ci",valueType:"text",maxLength:100,
-defaultValue:void 0},od:{id:"gclid",name:"gclid",valueType:"text",maxLength:void 0,defaultValue:void 0},ed:{id:"dclid",name:"dclid",valueType:"text",maxLength:void 0,defaultValue:void 0},zd:{id:"pageLoadTime",name:"plt",valueType:"integer",maxLength:void 0,defaultValue:void 0},gd:{id:"dnsTime",name:"dns",valueType:"integer",maxLength:void 0,defaultValue:void 0},Kd:{id:"tcpConnectTime",name:"tcp",valueType:"integer",maxLength:void 0,defaultValue:void 0},Fd:{id:"serverResponseTime",name:"srt",valueType:"integer",
-maxLength:void 0,defaultValue:void 0},yd:{id:"pageDownloadTime",name:"pdt",valueType:"integer",maxLength:void 0,defaultValue:void 0},Bd:{id:"redirectResponseTime",name:"rrt",valueType:"integer",maxLength:void 0,defaultValue:void 0},Ld:{id:"timingCategory",name:"utc",valueType:"text",maxLength:150,defaultValue:void 0},Od:{id:"timingVar",name:"utv",valueType:"text",maxLength:500,defaultValue:void 0},Nd:{id:"timingValue",name:"utt",valueType:"integer",maxLength:void 0,defaultValue:void 0},Md:{id:"timingLabel",
-name:"utl",valueType:"text",maxLength:500,defaultValue:void 0},md:{id:"exDescription",name:"exd",valueType:"text",maxLength:150,defaultValue:void 0},nd:{id:"exFatal",name:"exf",valueType:"boolean",maxLength:void 0,defaultValue:"1"}},La=function(a){if(1>a||200a||200a)return"0";if(3>a)return"1-2";a=Math.floor(Math.log(a-1)/Math.log(2));return Math.pow(2,a)+1+"-"+Math.pow(2,a+1)},Oa=function(a,b){for(var c=0,d=a.length-1,e=0;c<=d;){var f=Math.floor((c+d)/2),e=a[f];if(b<=e){d=0==f?0:a[f-1];if(b>d)return(d+1).toString()+"-"+e.toString();d=f-1}else if(b>e){if(f>=a.length-1)return(a[a.length-1]+1).toString()+"+";c=f+1}}return"<= 0"};var z=function(){this.ab=[]},Pa=function(){return new z};g=z.prototype;g.when=function(a){this.ab.push(a);return this};g.zb=function(a){var b=arguments;this.when(function(a){return 0<=ja(b,a.Gb())});return this};g.Oc=function(a,b){var c=ra(arguments,1);this.when(function(b){b=b.T().get(a);return 0<=ja(c,b)});return this};g.xb=function(a,b){if(q(this.e))throw Error("Filter has already been set.");this.e=q(b)?r(a,b):a;return this};
-g.Ca=function(){if(0==this.ab.length)throw Error("Must specify at least one predicate using #when or a helper method.");if(!q(this.e))throw Error("Must specify a delegate filter using #applyFilter.");return r(function(a){ma(this.ab,function(b){return b(a)})&&this.e(a)},this)};var A=function(){this.Ab=!1;this.Bb="";this.qb=!1;this.za=null};A.prototype.wc=function(a){this.Ab=!0;this.Bb=a||" - ";return this};A.prototype.Nc=function(){this.qb=!0;return this};A.prototype.Ec=function(){return Qa(this,Na)};A.prototype.Fc=function(a){return Qa(this,ha(Oa,a))};
-var Qa=function(a,b){if(null!=a.za)throw Error("LabelerBuilder: Only one labeling strategy may be used.");a.za=r(function(a){var d=a.T().get(Ja),e=a.T().get(Ia);ea(d)&&(d=b(d),null!=e&&this.Ab&&(d=e+this.Bb+d),a.T().set(Ia,d))},a);return a};A.prototype.Ca=function(){if(null==this.za)throw Error("LabelerBuilder: a labeling strategy must be specified prior to calling build().");return Pa().zb("event").xb(r(function(a){this.za(a);this.qb&&a.T().remove(Ja)},this)).Ca()};var Ra=function(a,b){var c=Array.prototype.slice.call(arguments),d=c.shift();if("undefined"==typeof d)throw Error("[goog.string.format] Template required");return d.replace(/%([0\-\ \+]*)(\d+)?(\.(\d+))?([%sfdiu])/g,function(a,b,d,l,N,J,U,V){if("%"==J)return"%";var Db=c.shift();if("undefined"==typeof Db)throw Error("[goog.string.format] Not enough arguments");arguments[0]=Db;return B[J].apply(null,arguments)})},B={s:function(a,b,c){return isNaN(c)||""==c||a.length>=c?a:a=-1a?"-":0<=b.indexOf("+")?"+":0<=b.indexOf(" ")?" ":"";0<=a&&(d=f+d);if(isNaN(c)||d.length>=c)return d;d=isNaN(e)?Math.abs(a).toString():Math.abs(a).toFixed(e);a=c-d.length-f.length;return d=0<=b.indexOf("-",0)?f+d+Array(a+1).join(" "):f+Array(a+1).join(0<=b.indexOf("0",0)?"0":" ")+d},d:function(a,b,c,d,e,f,k,l){return B.f(parseInt(a,10),b,c,d,0,f,k,l)}};B.i=B.d;
-B.u=B.d;var Sa=function(a){if("function"==typeof a.t)return a.t();if(n(a))return a.split("");if(da(a)){for(var b=[],c=a.length,d=0;dparseFloat(a))?String(b):a}(),bb={},M=function(a){var b;
-if(!(b=bb[a])){b=0;for(var c=String(ab).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),d=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),e=Math.max(c.length,d.length),f=0;0==b&&f=a.keyCode)a.keyCode=-1}catch(b){}};O.prototype.l=function(){};var jb="closure_listenable_"+(1E6*Math.random()|0),kb=function(a){return!(!a||!a[jb])},lb=0;var mb=function(a,b,c,d,e){this.O=a;this.proxy=null;this.src=b;this.type=c;this.pa=!!d;this.sa=e;this.key=++lb;this.removed=this.qa=!1},nb=function(a){a.removed=!0;a.O=null;a.proxy=null;a.src=null;a.sa=null};var P=function(a){this.src=a;this.j={};this.Z=0};P.prototype.add=function(a,b,c,d,e){var f=a.toString();a=this.j[f];a||(a=this.j[f]=[],this.Z++);var k=ob(a,b,d,e);-1e.keyCode||void 0!=e.returnValue)){t:{var f=!1;if(0==e.keyCode)try{e.keyCode=-1;break t}catch(k){f=!0}if(f||void 0==e.returnValue)e.returnValue=!0}e=[];for(f=c.currentTarget;f;f=f.parentNode)e.push(f);for(var f=a.type,l=e.length-1;!c.U&&0<=l;l--)c.currentTarget=e[l],d&=Fb(e[l],f,!0,c);for(l=0;!c.U&&l>>0),ub=function(a){if(p(a))return a;a[Gb]||(a[Gb]=function(b){return a.handleEvent(b)});return a[Gb]};var Q=function(){E.call(this);this.A=new P(this);this.kc=this;this.Qa=null};u(Q,E);Q.prototype[jb]=!0;g=Q.prototype;g.addEventListener=function(a,b,c,d){tb(this,a,b,c,d)};g.removeEventListener=function(a,b,c,d){Bb(this,a,b,c,d)};
-g.dispatchEvent=function(a){var b,c=this.Qa;if(c){b=[];for(var d=1;c;c=c.Qa)b.push(c),++d}c=this.kc;d=a.type||a;if(n(a))a=new F(a,c);else if(a instanceof F)a.target=a.target||c;else{var e=a;a=new F(d,c);za(a,e)}var e=!0,f;if(b)for(var k=b.length-1;!a.U&&0<=k;k--)f=a.currentTarget=b[k],e=Hb(f,d,!0,a)&&e;a.U||(f=a.currentTarget=c,e=Hb(f,d,!0,a)&&e,a.U||(e=Hb(f,d,!1,a)&&e));if(b)for(k=0;!a.U&&k=b.Ia&&b.cancel())}this.hb?this.hb.call(this.gb,this):this.Ka=!0;this.C||this.w(new dc)}};S.prototype.ib=function(a,b){this.Ja=!1;ec(this,a,b)};
-var ec=function(a,b,c){a.C=!0;a.v=c;a.W=!b;fc(a)},hc=function(a){if(a.C){if(!a.Ka)throw new gc;a.Ka=!1}};S.prototype.G=function(a){hc(this);ec(this,!0,a)};S.prototype.w=function(a){hc(this);ec(this,!1,a)};S.prototype.J=function(a,b){return ic(this,a,null,b)};var ic=function(a,b,c,d){a.ja.push([b,c,d]);a.C&&fc(a);return a};S.prototype.then=function(a,b,c){var d,e,f=new R(function(a,b){d=a;e=b});ic(this,d,function(a){a instanceof dc?f.cancel():e(a)});return f.then(a,b,c)};Sb(S);
-var jc=function(a){var b=new S;ic(a,b.G,b.w,b);return b},kc=function(a){return la(a.ja,function(a){return p(a[1])})},fc=function(a){if(a.ka&&a.C&&kc(a)){var b=a.ka,c=lc[b];c&&(h.clearTimeout(c.ma),delete lc[b]);a.ka=0}a.o&&(a.o.Ia--,delete a.o);for(var b=a.v,d=c=!1;a.ja.length&&!a.Ja;){var e=a.ja.shift(),f=e[0],k=e[1],e=e[2];if(f=a.W?k:f)try{var l=f.call(e||a.gb,b);void 0!==l&&(a.W=a.W&&(l==b||l instanceof Error),a.v=b=l);Tb(b)&&(d=!0,a.Ja=!0)}catch(N){b=N,a.W=!0,kc(a)||(c=!0)}}a.v=b;d&&(l=r(a.ib,
-a,!0),d=r(a.ib,a,!1),b instanceof S?(ic(b,l,d),b.Lb=!0):b.then(l,d));c&&(b=new mc(b),lc[b.ma]=b,a.ka=b.ma)},nc=function(a){var b=new S;b.G(a);return b},pc=function(){var a=oc,b=new S;b.w(a);return b},gc=function(){v.call(this)};u(gc,v);gc.prototype.message="Deferred has already fired";gc.prototype.name="AlreadyCalledError";var dc=function(){v.call(this)};u(dc,v);dc.prototype.message="Deferred was canceled";dc.prototype.name="CanceledError";
-var mc=function(a){this.ma=h.setTimeout(r(this.pc,this),0);this.ga=a};mc.prototype.pc=function(){delete lc[this.ma];throw this.ga;};var lc={};var qc=function(a){this.$a=[];this.e=a};qc.prototype.S=function(a){if(!p(a))throw Error("Invalid filter. Must be a function.");this.$a.push(a)};qc.prototype.send=function(a,b){for(var c=new T(a,b),d=0;db.maxLength&&a.set(b,c.substring(0,b.maxLength))})},ed=function(a){Ua(a,function(b,c){void 0!==b.defaultValue&&c==b.defaultValue&&a.remove(b)})};var oc={status:"device-offline",Ba:void 0},fd={status:"rate-limited",Ba:void 0},gd={status:"sampled-out",Ba:void 0},hd={status:"sent",Ba:void 0};var id=function(a,b){this.Wb=a;this.e=b};id.prototype.send=function(a,b){var c;c=this.Wb;var d=c.pb(),e=Math.floor((d-c.ob)*c.Sb);0c.$?c=!1:(c.$-=1,c=!0);return c||"item"==a||"transaction"==a?this.e.send(a,b):nc(fd)};var jd=function(){this.$=60;this.Tb=500;this.Sb=5E-4;this.pb=function(){return(new Date).getTime()};this.ob=this.pb()};var kd=function(a,b){this.k=a;this.e=b};kd.prototype.send=function(a,b){var c=b.get(vc),c=parseInt(c.split("-")[1],16),d;"timing"!=a?d=this.k.V:((d=b.get(yc))&&b.remove(yc),d||(d=this.k.V));return c<655.36*d?this.e.send(a,b):nc(gd)};var ld=/^(?:([^:/?#.]+):)?(?:\/\/(?:([^/?#]*)@)?([^/#?]*?)(?::([0-9]+))?(?=[/#?]|$))?([^?#]+)?(?:\?([^#]*))?(?:#(.*))?$/,md=L,nd=function(a,b){if(md){md=!1;var c=h.location;if(c){var d=c.href;if(d&&(d=(d=nd(3,d))?decodeURI(d):d)&&d!=c.hostname)throw md=!0,Error();}}return b.match(ld)[a]||null};var od=function(){};od.prototype.Eb=null;var qd=function(a){var b;(b=a.Eb)||(b={},pd(a)&&(b[0]=!0,b[1]=!0),b=a.Eb=b);return b};var rd,sd=function(){};u(sd,od);var td=function(a){return(a=pd(a))?new ActiveXObject(a):new XMLHttpRequest},pd=function(a){if(!a.Hb&&"undefined"==typeof XMLHttpRequest&&"undefined"!=typeof ActiveXObject){for(var b=["MSXML2.XMLHTTP.6.0","MSXML2.XMLHTTP.3.0","MSXML2.XMLHTTP","Microsoft.XMLHTTP"],c=0;cthis.na?c.w({status:"payload-too-big",Ba:Ra("Encoded hit length == %s, but should be <= %s.",d.length,this.na)}):xd(this.$b,function(){c.G(hd)},d);return c};var Jd=function(a,b){var c=new Fd;c.add(Da.name,a);Ua(b,function(a,b){c.add(a.name,b.toString())});return c.toString()};var Kd=function(a,b,c){this.k=a;this.Qb=b;this.na=c};Kd.prototype.Sa=function(){if(!this.q){var a=this.k;if(!jc(a.ha).C)throw Error("Cannot construct shared channel prior to settings being ready.");new ad;var b=new cd(new Id(this.Qb,this.na)),c=new jd;this.q=new bd(a,new kd(a,new id(c,b)))}return this.q};var Ld=new x,Md=function(){if(!Ba){var a=new Tc("google-analytics");Ba=new X(a)}return Ba};t("goog.async.Deferred",S);t("goog.async.Deferred.prototype.addCallback",S.prototype.J);t("goog.events.EventTarget",Q);t("goog.events.EventTarget.prototype.listen",Q.prototype.listen);t("analytics.getService",function(a){var b=Ld.get(a,null);if(null===b){var b=chrome.runtime.getManifest().version,c=Md();if(!Ca){var d=Md();Ca=new Wc(d,new Kd(d,"https://www.google-analytics.com/collect",8192))}b=new Hc("ca1.5.2",a,b,c,Ca);Ld.set(a,b)}return b});t("analytics.internal.GoogleAnalyticsService",Hc);
-t("analytics.internal.GoogleAnalyticsService.prototype.getTracker",Hc.prototype.Cc);t("analytics.internal.GoogleAnalyticsService.prototype.getConfig",Hc.prototype.Bc);t("analytics.internal.ServiceSettings",X);t("analytics.internal.ServiceSettings.prototype.setTrackingPermitted",X.prototype.Lc);t("analytics.internal.ServiceSettings.prototype.isTrackingPermitted",X.prototype.va);t("analytics.internal.ServiceSettings.prototype.setSampleRate",X.prototype.Kc);t("analytics.internal.ServiceTracker",W);
-t("analytics.internal.ServiceTracker.prototype.send",W.prototype.send);t("analytics.internal.ServiceTracker.prototype.sendAppView",W.prototype.Gc);t("analytics.internal.ServiceTracker.prototype.sendEvent",W.prototype.Hc);t("analytics.internal.ServiceTracker.prototype.sendSocial",W.prototype.Jc);t("analytics.internal.ServiceTracker.prototype.sendException",W.prototype.Ic);t("analytics.internal.ServiceTracker.prototype.sendTiming",W.prototype.Cb);
-t("analytics.internal.ServiceTracker.prototype.startTiming",W.prototype.Mc);t("analytics.internal.ServiceTracker.Timing",Gc);t("analytics.internal.ServiceTracker.Timing.prototype.send",Gc.prototype.send);t("analytics.internal.ServiceTracker.prototype.forceSessionStart",W.prototype.Ac);t("analytics.internal.ServiceTracker.prototype.addFilter",W.prototype.S);t("analytics.internal.FilterChannel.Hit",T);t("analytics.internal.FilterChannel.Hit.prototype.getHitType",T.prototype.Gb);
-t("analytics.internal.FilterChannel.Hit.prototype.getParameters",T.prototype.T);t("analytics.internal.FilterChannel.Hit.prototype.cancel",T.prototype.cancel);t("analytics.ParameterMap",C);t("analytics.ParameterMap.Entry",C.Entry);t("analytics.ParameterMap.prototype.set",C.prototype.set);t("analytics.ParameterMap.prototype.get",C.prototype.get);t("analytics.ParameterMap.prototype.remove",C.prototype.remove);t("analytics.ParameterMap.prototype.toObject",C.prototype.Jb);
-t("analytics.HitTypes.APPVIEW","appview");t("analytics.HitTypes.EVENT","event");t("analytics.HitTypes.SOCIAL","social");t("analytics.HitTypes.TRANSACTION","transaction");t("analytics.HitTypes.ITEM","item");t("analytics.HitTypes.TIMING","timing");t("analytics.HitTypes.EXCEPTION","exception");ua(Ka,function(a){var b=a.id.replace(/[A-Z]/,"_$&").toUpperCase();t("analytics.Parameters."+b,a)});t("analytics.filters.EventLabelerBuilder",A);
-t("analytics.filters.EventLabelerBuilder.prototype.appendToExistingLabel",A.prototype.wc);t("analytics.filters.EventLabelerBuilder.prototype.stripValue",A.prototype.Nc);t("analytics.filters.EventLabelerBuilder.prototype.powersOfTwo",A.prototype.Ec);t("analytics.filters.EventLabelerBuilder.prototype.rangeBounds",A.prototype.Fc);t("analytics.filters.EventLabelerBuilder.prototype.build",A.prototype.Ca);t("analytics.filters.FilterBuilder",z);t("analytics.filters.FilterBuilder.builder",Pa);
-t("analytics.filters.FilterBuilder.prototype.when",z.prototype.when);t("analytics.filters.FilterBuilder.prototype.whenHitType",z.prototype.zb);t("analytics.filters.FilterBuilder.prototype.whenValue",z.prototype.Oc);t("analytics.filters.FilterBuilder.prototype.applyFilter",z.prototype.xb);t("analytics.filters.FilterBuilder.prototype.build",z.prototype.Ca);t("analytics.EventBuilder",D);t("analytics.EventBuilder.builder",function(){return Va});t("analytics.EventBuilder.prototype.category",D.prototype.xc);
-t("analytics.EventBuilder.prototype.action",D.prototype.action);t("analytics.EventBuilder.prototype.label",D.prototype.label);t("analytics.EventBuilder.prototype.value",D.prototype.value);t("analytics.EventBuilder.prototype.dimension",D.prototype.yc);t("analytics.EventBuilder.prototype.metric",D.prototype.Dc);t("analytics.EventBuilder.prototype.send",D.prototype.send); })()
diff --git a/js/localization.js b/js/localization.js
index 0daa11b1..545f7458 100644
--- a/js/localization.js
+++ b/js/localization.js
@@ -2,6 +2,7 @@
const fs = require('fs')
+
let Localiziation = function(locale) {
let self = { };
let messages = null;
@@ -9,19 +10,28 @@ let Localiziation = function(locale) {
let local = locale;
self.loadMessages = function () {
- var data;
+ const path = require('path');
+ let fileName = path.join(__dirname, "./locale/" + local + "/messages.json");
+ if (!fs.existsSync(fileName)) {
+ fileName = path.join(__dirname, "./../locale/" + local + "/messages.json");
+ }
+ console.log(fileName);
try {
- data = fs.readFileSync(path.join(__dirname, "./locale/" + local + "/messages.json"), 'utf8',);
+ var data = fs.readFileSync(fileName, 'utf8',);
messages = JSON.parse(data);
} catch (err) {
- console.log("Error while reading languge file");
+ console.log("Error while reading language file: " + fileName);
}
}
self.getMessage = function(messageID, substitutions = null) {
- try {
+ try {
+ if (messages == null) {
+ self.loadMessages();
+ }
+
if (substitutions) {
- return messages[messageID].message.replace(/\{(\d+)\}/g, function (t, i) {
+ return messages[messageID].message.replace(/\{(\d+)\}/g, (t, i) => {
return substitutions[i] !== void 0 ? substitutions[i] : "{" + (i - substitutions.length) + "}";
});
} else {
diff --git a/js/main.js b/js/main.js
index d5e273eb..298eac6c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -11,6 +11,18 @@ const Store = require('electron-store');
const store = new Store();
var localization;
+process.on('uncaughtException', function (error) {
+ if (process.env.NODE_ENV !== 'development') {
+ GUI.log(localization.getMessage('unexpectedError', error));
+ if (GUI.connected_to || GUI.connecting_to) {
+ GUI.log(localization.getMessage('disconnecting'));
+ $('a.connect').trigger('click');
+ }
+ } else {
+ throw error;
+ }
+});
+
// Set how the units render on the configurator only
const UnitType = {
none: "none",
diff --git a/js/port_handler.js b/js/port_handler.js
index c4c98d58..eb7dcf73 100755
--- a/js/port_handler.js
+++ b/js/port_handler.js
@@ -1,13 +1,12 @@
'use strict';
-const { findByIds } = require('usb');
+const { ipcRenderer } = require('electron');
var usbDevices = [
{ 'vendorId': 1155, 'productId': 57105},
{ 'vendorId': 11836, 'productId': 57105}
];
-// TODO: Replace with events
var PortHandler = new function () {
this.initial_ports = false;
@@ -152,7 +151,7 @@ PortHandler.check = function () {
self.initial_ports = current_ports;
}
- //self.check_usb_devices();
+ self.check_usb_devices();
GUI.updateManualPortVisibility();
setTimeout(function () {
@@ -164,28 +163,32 @@ PortHandler.check = function () {
PortHandler.check_usb_devices = function (callback) {
self.dfu_available = false;
- for (const device of usbDevices) {
- if (findByIds(device.vendorId, device.productId)) {
- self.dfu_available = true;
- break;
- }
- }
+
+ navigator.usb.getDevices().then(devices => {
+ devices.forEach(device => {
+ usbDevices.forEach(usbDev => {
+ if (device.vendorId == usbDev.vendorId && device.productId == usbDev.productId) {
+ self.dfu_available = true;
+ return;
+ }
+ });
+ });
- if (self.dfu_available) {
- if (!$("div#port-picker #port [value='DFU']").length) {
- $('div#port-picker #port').append($('', {value: "DFU", text: "DFU", data: {isDFU: true}}));
- $('div#port-picker #port').val('DFU');
+ if (self.dfu_available) {
+ if (!$("div#port-picker #port [value='DFU']").length) {
+ $('div#port-picker #port').append($('', {value: "DFU", text: "DFU", data: {isDFU: true}}));
+ $('div#port-picker #port').val('DFU');
+ }
+ } else {
+ if ($("div#port-picker #port [value='DFU']").length) {
+ $("div#port-picker #port [value='DFU']").remove();
+ }
}
- } else {
- if ($("div#port-picker #port [value='DFU']").length) {
- $("div#port-picker #port [value='DFU']").remove();
- }
- }
-
- if (callback)
- callback(self.dfu_available);
-
-};
+
+ if (callback)
+ callback(self.dfu_available);
+ });
+}
PortHandler.update_port_select = function (ports) {
$('div#port-picker #port').html(''); // drop previous one
diff --git a/js/protocols/stm32usbdfu.js b/js/protocols/stm32usbdfu.js
index 53b622fa..15387937 100644
--- a/js/protocols/stm32usbdfu.js
+++ b/js/protocols/stm32usbdfu.js
@@ -17,7 +17,7 @@ var STM32DFU_protocol = function () {
this.hex = null;
this.verify_hex = [];
- this.handle = null; // connection handle
+ this.usbDevice = null; // USB Device object
this.request = {
DETACH: 0x00, // OUT, Requests the device to leave DFU mode and enter the application.
@@ -67,7 +67,7 @@ var STM32DFU_protocol = function () {
this.transferSize = 2048; // Default USB DFU transfer size for F3,F4 and F7
};
-STM32DFU_protocol.prototype.connect = function (device, hex, options, callback) {
+STM32DFU_protocol.prototype.connect = function (usbDevices, hex, options, callback) {
var self = this;
self.hex = hex;
self.callback = callback;
@@ -90,67 +90,62 @@ STM32DFU_protocol.prototype.connect = function (device, hex, options, callback)
// reset progress bar to initial state
TABS.firmware_flasher.flashingMessage(null, TABS.firmware_flasher.FLASH_MESSAGE_TYPES.NEUTRAL).flashProgress(0);
- chrome.usb.getDevices(device, function (result) {
- if (result.length) {
- console.log('USB DFU detected with ID: ' + result[0].device);
+ navigator.usb.getDevices().then(devices => {
+ var dev = null;
+ devices.forEach(device => {
+ usbDevices.forEach(usbDev => {
+ if (device.vendorId == usbDev.vendorId && device.productId == usbDev.productId) {
+ self.usbDevice = device;
+ return;
+ }
+ });
+ });
- self.openDevice(result[0]);
+ if (self.usbDevice ) {
+ console.log('USB DFU detected');
+ self.openDevice();
} else {
console.log('USB DFU not found');
GUI.log(localization.getMessage('stm32UsbDfuNotFound'));
}
+
});
};
-STM32DFU_protocol.prototype.openDevice = function (device) {
+STM32DFU_protocol.prototype.openDevice = function () {
var self = this;
- chrome.usb.openDevice(device, function (handle) {
- if (checkChromeRuntimeError()) {
- console.log('Failed to open USB device!');
- GUI.log(localization.getMessage('usbDeviceOpenFail'));
- if(GUI.operating_system === 'Linux') {
- GUI.log(localization.getMessage('usbDeviceUdevNotice'));
- }
- return;
- }
-
- self.handle = handle;
-
- GUI.log(localization.getMessage('usbDeviceOpened', handle.handle.toString()));
- console.log('Device opened with Handle ID: ' + handle.handle);
+ self.usbDevice.open().then( () => {
+ GUI.log(localization.getMessage('usbDeviceOpened'));
+ console.log('USB-Device opened');
self.claimInterface(0);
+ }).catch(error => {
+ console.log('Failed to open USB device: ' + error);
+ GUI.log(localization.getMessage('usbDeviceOpenFail'));
+ if(GUI.operating_system === 'Linux') {
+ GUI.log(localization.getMessage('usbDeviceUdevNotice'));
+ }
});
};
STM32DFU_protocol.prototype.closeDevice = function () {
var self = this;
- chrome.usb.closeDevice(this.handle, function closed() {
- if (checkChromeRuntimeError()) {
- console.log('Failed to close USB device!');
- GUI.log(localization.getMessage('usbDeviceCloseFail'));
- }
-
+ self.usbDevice.close().then(() => {
GUI.log(localization.getMessage('usbDeviceClosed'));
- console.log('Device closed with Handle ID: ' + self.handle.handle);
-
- self.handle = null;
+ console.log('USB-Device closed');
+ }).catch(error => {
+ console.log('Failed to close USB device!');
+ GUI.log(localization.getMessage('usbDeviceCloseFail'));
});
+
+ self.usbDevice = null;
};
STM32DFU_protocol.prototype.claimInterface = function (interfaceNumber) {
var self = this;
- chrome.usb.claimInterface(this.handle, interfaceNumber, function claimed() {
- // Don't perform the error check on MacOS at this time as there seems to be a bug
- // where it always reports the Chrome error "Error claiming interface." even though
- // the interface is in fact successfully claimed.
- if (checkChromeRuntimeError() && (GUI.operating_system !== "MacOS")) {
- console.log('Failed to claim USB device!');
- self.cleanup();
- }
-
+ self.usbDevice.claimInterface(interfaceNumber).then( () => {
console.log('Claimed interface: ' + interfaceNumber);
if (self.options.exitDfu) {
@@ -158,22 +153,25 @@ STM32DFU_protocol.prototype.claimInterface = function (interfaceNumber) {
} else {
self.upload_procedure(0);
}
+ }).catch(error => {
+ console.log('Failed to claim USB device: ' + error);
+ self.cleanup();
});
};
STM32DFU_protocol.prototype.releaseInterface = function (interfaceNumber) {
var self = this;
- chrome.usb.releaseInterface(this.handle, interfaceNumber, function released() {
+ self.usbDevice.releaseInterface(interfaceNumber).then(() => {
console.log('Released interface: ' + interfaceNumber);
-
self.closeDevice();
});
};
STM32DFU_protocol.prototype.resetDevice = function (callback) {
- chrome.usb.resetDevice(this.handle, function (result) {
- console.log('Reset Device: ' + result);
+ var self = this;
+ self.usbDevice.reset().then( () => {
+ console.log('Reset USB-Device');
if (callback) callback();
});
@@ -181,46 +179,50 @@ STM32DFU_protocol.prototype.resetDevice = function (callback) {
STM32DFU_protocol.prototype.getString = function (index, callback) {
var self = this;
-
- chrome.usb.controlTransfer(self.handle, {
- 'direction': 'in',
- 'recipient': 'device',
- 'requestType': 'standard',
- 'request': 6,
- 'value': 0x300 | index,
- 'index': 0, // specifies language
- 'length': 255 // max length to retreive
- }, function (result) {
- if (checkChromeRuntimeError()) {
- console.log('USB getString failed! ' + result.resultCode);
- callback("", result.resultCode);
- return;
+ var setup = {
+ recipient: 'device',
+ requestType: 'standard',
+ request: 6,
+ value: 0x300 | index,
+ index: 0 // specifies language
+ };
+ self.usbDevice.controlTransferIn(setup, 255).then(result => {
+ if (result.status == 'ok') {;
+ var length = result.data.getUint8(0);
+ var descriptor = "";
+ for (var i = 2; i < length; i += 2) {
+ var charCode = result.data.getUint16(i, true);
+ descriptor += String.fromCharCode(charCode);
+ }
+ callback(descriptor, 0);
+ } else {
+ throw new Error(result.status);
}
- var view = new DataView(result.data);
- var length = view.getUint8(0);
- var descriptor = "";
- for (var i = 2; i < length; i += 2) {
- var charCode = view.getUint16(i, true);
- descriptor += String.fromCharCode(charCode);
- }
- callback(descriptor, result.resultCode);
+
+ }).catch(error => {
+ console.log('USB getString failed: ' + error);
+ callback("", 1);
});
};
STM32DFU_protocol.prototype.getInterfaceDescriptors = function (interfaceNum, callback) {
var self = this;
- chrome.usb.getConfiguration( this.handle, function (config) {
- if (checkChromeRuntimeError()) {
- console.log('USB getConfiguration failed!');
- callback([], -200);
- return;
- }
-
var interfaceID = 0;
var descriptorStringArray = [];
+
+ var interfacesCount = self.usbDevice.configuration.interfaces.length;
+ var descriptorCount = 0;
+ if (interfacesCount == 0) {
+ callback(0, 1); //Error
+ } else if (interfacesCount == 1) {
+ descriptorCount = self.usbDevice.configuration.interfaces[0].alternates.length
+ } else if (interfacesCount > 1) {
+ descriptorCount = interfacesCount;
+ }
+
var getDescriptorString = function () {
- if(interfaceID < config.interfaces.length) {
+ if (interfaceID < descriptorCount) {
self.getInterfaceDescriptor(interfaceID, function (descriptor, resultCode) {
if (resultCode) {
callback([], resultCode);
@@ -245,73 +247,70 @@ STM32DFU_protocol.prototype.getInterfaceDescriptors = function (interfaceNum, ca
}
};
getDescriptorString();
- });
};
STM32DFU_protocol.prototype.getInterfaceDescriptor = function (_interface, callback) {
var self = this;
- chrome.usb.controlTransfer(this.handle, {
- 'direction': 'in',
- 'recipient': 'device',
- 'requestType': 'standard',
- 'request': 6,
- 'value': 0x200,
- 'index': 0,
- 'length': 18 + _interface * 9
- }, function (result) {
- if (checkChromeRuntimeError()) {
- console.log('USB getInterfaceDescriptor failed! ' + result.resultCode);
- callback({}, result.resultCode);
- return;
- }
-
- var buf = new Uint8Array(result.data, 9 + _interface * 9);
- var descriptor = {
- 'bLength': buf[0],
- 'bDescriptorType': buf[1],
- 'bInterfaceNumber': buf[2],
- 'bAlternateSetting': buf[3],
- 'bNumEndpoints': buf[4],
- 'bInterfaceClass': buf[5],
- 'bInterfaceSubclass': buf[6],
- 'bInterfaceProtocol': buf[7],
- 'iInterface': buf[8]
- };
-
- callback(descriptor, result.resultCode);
+ var setup = {
+ recipient: 'device',
+ requestType: 'standard',
+ request: 6,
+ value: 0x200,
+ index: 0
+ }
+ self.usbDevice.controlTransferIn(setup, 18 + _interface * 9).then(result => {
+ if (result.status == 'ok') {
+ var buf = new Uint8Array(result.data.buffer, 9 + _interface * 9);
+ var descriptor = {
+ 'bLength': buf[0],
+ 'bDescriptorType': buf[1],
+ 'bInterfaceNumber': buf[2],
+ 'bAlternateSetting': buf[3],
+ 'bNumEndpoints': buf[4],
+ 'bInterfaceClass': buf[5],
+ 'bInterfaceSubclass': buf[6],
+ 'bInterfaceProtocol': buf[7],
+ 'iInterface': buf[8]
+ };
+ callback(descriptor, 0);
+ } else {
+ throw new Error(result.status)
+ }
+ }).catch(error => {
+ console.log('USB getInterfaceDescriptor failed: ' + error);
+ callback({}, 1);
+ return;
});
};
STM32DFU_protocol.prototype.getFunctionalDescriptor = function (_interface, callback) {
var self = this;
- chrome.usb.controlTransfer(this.handle, {
- 'direction': 'in',
- 'recipient': 'interface',
- 'requestType': 'standard',
- 'request': 6,
- 'value': 0x2100,
- 'index': 0,
- 'length': 255
- }, function (result) {
- if (checkChromeRuntimeError()) {
- console.log('USB getFunctionalDescriptor failed! ' + result.resultCode);
- callback({}, result.resultCode);
- return;
- }
-
- var buf = new Uint8Array(result.data);
-
- var descriptor = {
- 'bLength': buf[0],
- 'bDescriptorType': buf[1],
- 'bmAttributes': buf[2],
- 'wDetachTimeOut': (buf[4] << 8)|buf[3],
- 'wTransferSize': (buf[6] << 8)|buf[5],
- 'bcdDFUVersion': buf[7]
- };
-
- callback(descriptor, result.resultCode);
+ var setup = {
+ recipient: 'interface',
+ requestType: 'standard',
+ request: 6,
+ value: 0x2100,
+ index: 0
+ };
+ self.usbDevice.controlTransferIn(setup, 255).then(result => {
+ if (result.status == 'ok') {
+ var buf = new Uint8Array(result.data.buffer);
+ var descriptor = {
+ 'bLength': buf[0],
+ 'bDescriptorType': buf[1],
+ 'bmAttributes': buf[2],
+ 'wDetachTimeOut': (buf[4] << 8)|buf[3],
+ 'wTransferSize': (buf[6] << 8)|buf[5],
+ 'bcdDFUVersion': buf[7]
+ };
+ callback(descriptor, 0);
+ } else {
+ throw new Error(result.status);
+ }
+ }).catch(error => {
+ console.log('USB getFunctionalDescriptor failed! ' + error);
+ callback({}, 1);
});
};
@@ -424,60 +423,49 @@ STM32DFU_protocol.prototype.getChipInfo = function (_interface, callback) {
STM32DFU_protocol.prototype.controlTransfer = function (direction, request, value, _interface, length, data, callback, _timeout) {
var self = this;
- // timeout support was added in chrome v43
- var timeout;
- if (typeof _timeout === "undefined") {
- timeout = 0; // default is 0 (according to chrome.usb API)
- } else {
- timeout = _timeout;
- }
-
if (direction == 'in') {
// data is ignored
- chrome.usb.controlTransfer(this.handle, {
- 'direction': 'in',
- 'recipient': 'interface',
- 'requestType': 'class',
- 'request': request,
- 'value': value,
- 'index': _interface,
- 'length': length,
- 'timeout': timeout
- }, function (result) {
- if (checkChromeRuntimeError()) {
- console.log('USB controlTransfer IN failed for request ' + request + '!');
+ var setup = {
+ recipient: 'interface',
+ requestType: 'class',
+ request: request,
+ value: value,
+ index: _interface
+ }
+ self.usbDevice.controlTransferIn(setup, length).then( result => {
+ if (result.status == 'ok') {
+ var buf = new Uint8Array(result.data.buffer);
+ callback(buf, result.resultCode);
+ } else {
+ throw new Error(result.status);
}
- if (result.resultCode) console.log('USB transfer result code: ' + result.resultCode);
-
- var buf = new Uint8Array(result.data);
- callback(buf, result.resultCode);
+ }).catch(() => {
+ console.log('USB controlTransfer IN failed for request ' + request + '!');
});
} else {
// length is ignored
+ var dataIn;
if (data) {
- var arrayBuf = new ArrayBuffer(data.length);
- var arrayBufView = new Uint8Array(arrayBuf);
- arrayBufView.set(data);
+ dataIn = new Uint8Array(data);;
} else {
- var arrayBuf = new ArrayBuffer(0);
+ dataIn = new Uint8Array(0);
}
- chrome.usb.controlTransfer(this.handle, {
- 'direction': 'out',
- 'recipient': 'interface',
- 'requestType': 'class',
- 'request': request,
- 'value': value,
- 'index': _interface,
- 'data': arrayBuf,
- 'timeout': timeout
- }, function (result) {
- if (checkChromeRuntimeError()) {
- console.log('USB controlTransfer OUT failed for request ' + request + '!');
+ var setup = {
+ recipient: 'interface',
+ requestType: 'class',
+ request: request,
+ value: value,
+ index: _interface
+ }
+ self.usbDevice.controlTransferOut(setup, dataIn).then(result => {
+ if (result.status == 'ok') {
+ callback(result);
+ } else {
+ throw new Error(result.status);
}
- if (result.resultCode) console.log('USB transfer result code: ' + result.resultCode);
-
- callback(result);
+ }).catch(() => {
+ console.log('USB controlTransfer OUT failed for request ' + request + '!');
});
}
};
diff --git a/js/serial_backend.js b/js/serial_backend.js
index fcde2980..b8578cc7 100755
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -1,4 +1,4 @@
-/*global chrome, chrome.i18n*/
+/*global chrome*/
'use strict';
$(document).ready(function () {
@@ -29,7 +29,7 @@ $(document).ready(function () {
modal = new jBox('Modal', {
width: 400,
- height: 100,
+ height: 120,
animation: false,
closeOnClick: false,
closeOnEsc: false,
@@ -302,7 +302,7 @@ function onOpen(openInfo) {
GUI.log(localization.getMessage('serialPortOpened', [openInfo.connectionId]));
- // save selected port with chrome.storage if the port differs
+ // save selected port if the port differs
var last_used_port = store.get('last_used_port', false);
if (last_used_port) {
if (last_used_port != GUI.connected_to) {
diff --git a/locale/en/messages.json b/locale/en/messages.json
index 98019938..28fc8c82 100644
--- a/locale/en/messages.json
+++ b/locale/en/messages.json
@@ -23,6 +23,12 @@
"options_render": {
"message": "Configurator rendering options"
},
+ "unexpectedError" : {
+ "message": "Unexpected error: {0}"
+ },
+ "disconnecting": {
+ "message": "Disconnecting..."
+ },
"connect": {
"message": "Connect"
},
@@ -303,7 +309,7 @@
"message": "UDP connection timed out."
},
"usbDeviceOpened": {
- "message": "USB device successfully opened with ID: {0}"
+ "message": "USB device successfully opened"
},
"usbDeviceOpenFail": {
"message": "Failed to open USB device!"
diff --git a/main.js b/main.js
index 9f344fff..7f24f0d1 100644
--- a/main.js
+++ b/main.js
@@ -1,16 +1,57 @@
-const { app, BrowserWindow } = require('electron');
+const { app, BrowserWindow, ipcMain } = require('electron');
const windowStateKeeper = require('electron-window-state');
+const path = require('path');
const Store = require('electron-store');
Store.initRenderer();
require('@electron/remote/main').initialize();
+const usbBootloaderIds = [
+ { vendorId: 1155, productId: 57105},
+ { vendorId: 11836, productId: 57105}
+];
+
+
// Handle creating/removing shortcuts on Windows when installing/uninstalling.
if (require('electron-squirrel-startup')) {
app.quit();
}
let mainWindow = null;
+let bluetoothDeviceChooser = null;
+let btDeviceList = null;
+let selectBluetoothCallback = null;
+
+// In Eletrcon the bluetooth device chooser didn't exist, so we have to buid our own
+function createDeviceChooser() {
+ bluetoothDeviceChooser = new BrowserWindow({
+ parent: mainWindow,
+ width: 400,
+ height: 400,
+ webPreferences: {
+ preload: path.join(__dirname, 'js/libraries/bluetooth-device-chooser/preload.js')
+ }
+ });
+ bluetoothDeviceChooser.removeMenu();
+ bluetoothDeviceChooser.loadFile(path.join(__dirname, 'js/libraries/bluetooth-device-chooser/index.html'));
+
+ bluetoothDeviceChooser.on('closed', () => {
+ btDeviceList = null;
+ if (selectBluetoothCallback) {
+ selectBluetoothCallback('');
+ selectBluetoothCallback = null;
+ }
+ bluetoothDeviceChooser = null;
+ });
+
+ ipcMain.on('deviceSelected', (_event, deviceID) => {
+ if (selectBluetoothCallback) {
+ selectBluetoothCallback(deviceID);
+ selectBluetoothCallback = null;
+ }
+ });
+
+}
app.on('ready', () => {
@@ -31,6 +72,69 @@ app.on('ready', () => {
webSecurity: false
},
});
+
+ mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
+ event.preventDefault();
+ selectBluetoothCallback = callback;
+
+ const compare = (a, b) => {
+ if (a.length !== b.length) {
+ return false;
+ }
+ a.every((element, index) => {
+ if (element.deviceId !== b[index].deviceId) {
+ return false;
+ }
+ })
+ return true;
+ }
+
+ if (!btDeviceList || !compare(btDeviceList, deviceList)) {
+ btDeviceList = [...deviceList];
+
+ if (!bluetoothDeviceChooser) {
+ createDeviceChooser();
+ }
+ bluetoothDeviceChooser.webContents.send('ble-scan', btDeviceList);
+ }
+ });
+
+
+ mainWindow.webContents.session.on('select-usb-device', (event, details, callback) => {
+ console.log(details.deviceList)
+ let premittedDevice = null;
+ if (details.deviceList) {
+ details.deviceList.every((device, idx) => {
+ if (device.productId == usbBootloaderIds[idx].productId && device.vendorId == usbBootloaderIds[idx].vendorId) {
+ premittedDevice = device.deviceId;
+ return;
+ }
+ });
+ }
+
+ if (premittedDevice) {
+ callback(premittedDevice);
+ } else {
+ callback();
+ }
+
+ });
+
+ mainWindow.webContents.session.setDevicePermissionHandler((details) => {
+ if (details.deviceType === 'usb' && details.origin === 'file://') {
+ return true;
+ }
+ })
+
+ mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+ return {
+ action: 'allow',
+ overrideBrowserWindowOptions: {
+ autoHideMenuBar: true
+ }
+ }
+ });
+
app.commandLine.appendSwitch('disable-features', 'OutOfBlinkCors')
require("@electron/remote/main").enable(mainWindow.webContents);
diff --git a/src/css/receiver-msp.css b/src/css/receiver-msp.css
index 92b40892..da7f5982 100644
--- a/src/css/receiver-msp.css
+++ b/src/css/receiver-msp.css
@@ -1,4 +1,4 @@
@import 'tabs/receiver_msp.css';
@import './opensans_webfontkit/fonts.css';
-@import '/js/libraries/jquery.nouislider.min.css';
-@import '/js/libraries/jquery.nouislider.pips.min.css';
\ No newline at end of file
+@import '../../js/libraries/jquery.nouislider.min.css';
+@import '../../js/libraries/jquery.nouislider.pips.min.css';
\ No newline at end of file
diff --git a/tabs/calibration.js b/tabs/calibration.js
index 75d3f32f..c88a237d 100755
--- a/tabs/calibration.js
+++ b/tabs/calibration.js
@@ -153,7 +153,7 @@ TABS.calibration.initialize = function (callback) {
modalProcessing = new jBox('Modal', {
width: 400,
- height: 100,
+ height: 120,
animation: false,
closeOnClick: false,
closeOnEsc: false,
@@ -237,7 +237,7 @@ TABS.calibration.initialize = function (callback) {
let modalProcessing = new jBox('Modal', {
width: 400,
- height: 100,
+ height: 120,
animation: false,
closeOnClick: false,
closeOnEsc: false,
@@ -279,7 +279,7 @@ TABS.calibration.initialize = function (callback) {
modalProcessing = new jBox('Modal', {
width: 400,
- height: 100,
+ height: 120,
animation: false,
closeOnClick: false,
closeOnEsc: false,
diff --git a/tabs/cli.js b/tabs/cli.js
index b39386d6..fa0944f1 100644
--- a/tabs/cli.js
+++ b/tabs/cli.js
@@ -1,7 +1,7 @@
'use strict';
-/*global chrome,GUI,TABS,nwdialog,$*/
+/*global chrome,GUI,TABS,$*/
TABS.cli = {
lineDelayMs: 50,
profileSwitchDelayMs: 100,
@@ -159,7 +159,7 @@ TABS.cli.initialize = function (callback) {
}
const fs = require('fs');
- fs.writeFile(result.filePath , self.outputHistory, (err) => {
+ fs.writeFile(result.filePath, self.outputHistory, (err) => {
if (err) {
GUI.log(localization.getMessage('ErrorWritingFile'));
return console.error(err);
diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
index b8260daa..c16247f7 100755
--- a/tabs/firmware_flasher.js
+++ b/tabs/firmware_flasher.js
@@ -1,4 +1,4 @@
-/*global $,nwdialog*/
+/*global $*/
'use strict';
const { marked } = require('marked');
@@ -223,8 +223,19 @@ TABS.firmware_flasher.initialize = function (callback) {
$('a.load_file').on('click', function () {
- nwdialog.setContext(document);
- nwdialog.openFileDialog('.hex', function(filename) {
+ var options = {
+ filters: [ { name: "HEX file", extensions: ['hex'] } ]
+ };
+ dialog.showOpenDialog(options).then(result => {
+ if (result.canceled) {
+ return;
+ }
+
+ let filename;
+ if (result.filePaths.length == 1) {
+ filename = result.filePaths[0];
+ }
+
const fs = require('fs');
$('div.git_info').slideUp();
diff --git a/tabs/logging.js b/tabs/logging.js
index 2b681719..a75bc6f2 100644
--- a/tabs/logging.js
+++ b/tabs/logging.js
@@ -1,4 +1,3 @@
-/*global nwdialog*/
'use strict';
TABS.logging = {};
@@ -226,13 +225,17 @@ TABS.logging.initialize = function (callback) {
const filename = 'inav_data_log_' + date.getFullYear() + '-' + zeroPad(date.getMonth() + 1, 2) + '-'
+ zeroPad(date.getDate(), 2) + '_' + zeroPad(date.getHours(), 2) + zeroPad(date.getMinutes(), 2)
+ zeroPad(date.getSeconds(), 2);
- const accepts = [{
- description: 'TXT files', extensions: ['txt'],
- }];
- nwdialog.setContext(document);
- nwdialog.saveFileDialog(filename, accepts, '', function(file) {
- loggingFileName = file;
+ var options = {
+ defaultPath: filename,
+ filters: [ { name: "TXT file", extensions: ['txt'] } ]
+ };
+ dialog.showSaveDialog(options).then(result => {
+ if (result.canceled) {
+ return;
+ }
+
+ loggingFileName = result.filePath;
readyToWrite = true;
store.set('logging_file_name', loggingFileName);
store.set('logging_file_ready', readyToWrite);
diff --git a/tabs/magnetometer.html b/tabs/magnetometer.html
index 43fc9c9a..ec05a405 100644
--- a/tabs/magnetometer.html
+++ b/tabs/magnetometer.html
@@ -1,6 +1,6 @@