speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #862 from iNavFlight/release-2-3-0

Browse Source 
Release Configurator 2.3.1
pull/864/head
Paweł Spychalski 5 years ago committed by GitHub
parent 7cce386aab 22335fa99e
commit 0fbdc439ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 62 deletions
Show Stats Download Patch File Download Diff File

4
js/serial_backend.js
Unescape Escape View File

@ -199,6 +199,10 @@ function onValidFirmware()
GUI.allowedTabs = GUI.defaultAllowedTabsWhenConnected.slice();
onConnect();
if (semver.gte(CONFIG.flightControllerVersion, "2.3.0")) {
helper.defaultsDialog.init();
}
$('#tabs ul.mode-connected .tab_setup a').click();
});
});

2
manifest.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
"version": "2.3.0-RC3",
"version": "2.3.1",
"author": "Several",
"name": "INAV - Configurator",
"short_name": "INAV",

6
package-lock.json generated
Unescape Escape View File

@ -3728,7 +3728,7 @@
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"requires": {
"is-plain-object": "^2.0.4"
"is-plain-object": "2.0.4"
}
}
}
@ -5130,7 +5130,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "^0.1.0"
"is-extendable": "0.1.1"
}
}
}
@ -5950,7 +5950,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "^0.1.0"
"is-extendable": "0.1.1"
}
},
"set-value": {

2
package.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"name": "inav-configurator",
"description": "INAV Configurator",
"version": "2.3.0-RC3",
"version": "2.3.1",
"main": "main.html",
"default_locale": "en",
"scripts": {

84
tabs/cli.js
Unescape Escape View File

@ -1,5 +1,5 @@
'use strict';
/*global chrome*/
/*global chrome,GUI,TABS,nwdialog,$*/
TABS.cli = {
lineDelayMs: 50,
profileSwitchDelayMs: 100,
@ -96,13 +96,13 @@ function sendLinesWithDelay(outputArray) {
return (delay, line, index) => {
return new Promise((resolve) => {
helper.timeout.add('CLI_send_slowly', () => {
var processingDelay = self.lineDelayMs;
let processingDelay = TABS.cli.lineDelayMs;
if (line.toLowerCase().startsWith('profile')) {
processingDelay = self.profileSwitchDelayMs;
processingDelay = TABS.cli.profileSwitchDelayMs;
}
const isLastCommand = outputArray.length === index + 1;
if (isLastCommand && self.cliBuffer) {
line = getCliCommand(line, self.cliBuffer);
if (isLastCommand && TABS.cli.cliBuffer) {
line = getCliCommand(line, TABS.cli.cliBuffer);
}
TABS.cli.sendLine(line, () => {
resolve(processingDelay);
@ -160,40 +160,22 @@ TABS.cli.initialize = function (callback) {
description: suffix.toUpperCase() + ' files', extensions: [suffix],
}];
chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: filename, accepts: accepts}, function(entry) {
if (chrome.runtime.lastError) {
if (chrome.runtime.lastError.message === 'User cancelled') {
GUI.log(chrome.i18n.getMessage('cliSaveToFileAborted'));
} else {
GUI.log(chrome.i18n.getMessage('cliSaveToFileFailed'));
console.error(chrome.runtime.lastError.message);
}
return;
}
if (!entry) {
nwdialog.setContext(document);
nwdialog.saveFileDialog(filename, accepts, '', function(result) {
if (!result) {
GUI.log(chrome.i18n.getMessage('cliSaveToFileAborted'));
return;
}
const fs = require('fs');
entry.createWriter(function (writer) {
writer.onerror = function (){
GUI.log(chrome.i18n.getMessage('cliSaveToFileFailed'));
};
writer.onwriteend = function () {
if (self.outputHistory.length > 0 && writer.length === 0) {
writer.write(new Blob([self.outputHistory], {type: 'text/plain'}));
} else {
GUI.log(chrome.i18n.getMessage('cliSaveToFileCompleted'));
}
};
writer.truncate(0);
}, function (){
GUI.log(chrome.i18n.getMessage('cliSaveToFileFailed'));
console.error('Failed to get file writer');
fs.writeFile(result, self.outputHistory, (err) => {
if (err) {
GUI.log('<span style="color: red">Error writing file</span>');
return console.error(err);
}
GUI.log('File saved');
});
});
});
@ -211,22 +193,9 @@ TABS.cli.initialize = function (callback) {
}
$('.tab-cli .load').click(function() {
var accepts = [
{
description: 'Config files', extensions: ["txt", "config"],
},
{
description: 'All files',
},
];
chrome.fileSystem.chooseEntry({type: 'openFile', accepts: accepts}, function(entry) {
if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError.message);
return;
}
if (!entry) {
nwdialog.setContext(document);
nwdialog.openFileDialog(".txt", false, '', function(result) {
if (!result) {
console.log('No file selected');
return;
}
@ -257,12 +226,15 @@ TABS.cli.initialize = function (callback) {
self.GUI.snippetPreviewWindow.open();
}
entry.file((file) => {
let reader = new FileReader();
reader.onload =
() => previewCommands(reader.result);
reader.onerror = () => console.error(reader.error);
reader.readAsText(file);
const fs = require('fs');
fs.readFile(result, (err, data) => {
if (err) {
GUI.log('<span style="color: red">Error reading file</span>');
return console.error(err);
}
previewCommands(data);
});
});
});

4
tabs/mission_control.js
Unescape Escape View File

@ -354,7 +354,9 @@ TABS.mission_control.initialize = function (callback) {
}
});
//reset text position
textGeom.setCoordinates(map.getCoordinateFromPixel([0,0]));
if (textGeom) {
textGeom.setCoordinates(map.getCoordinateFromPixel([0,0]));
}
}
function paintLine(pos1, pos2) {

Write Preview
Loading…
Cancel
Save