diff --git a/README.md b/README.md index d436cce2..dead8225 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ For local development, **node.js** build system is used. - With Chrome: Run `npm run gulp`. Then open `chrome://extensions`, enable the `Developer mode`, click on the `Load unpacked extension...` button and select the `inav-configurator` directory. -Other tasks are also defined in `gulpfile.js`. To run a task, use `./node_modules/gulp/bin/gulp.js task-name`. Available ones are: +Other tasks are also defined in `gulpfile.js`. To run a task, use `node ./node_modules/gulp/bin/gulp.js task-name`. Available ones are: - **build**: Generate JS and CSS output files used by the configurator from their sources. It must be run whenever changes are made to any `.js` or `.css` files in order to have those changes appear in the configurator. If new files are added, they must be included in `gulpfile.js`. See the comments at the top of `gulpfile.js` to learn how to do so. See also the `watch` task. diff --git a/js/data_storage.js b/js/data_storage.js index 4a938c73..1583f3f4 100755 --- a/js/data_storage.js +++ b/js/data_storage.js @@ -3,7 +3,7 @@ var CONFIGURATOR = { // all versions are specified and compared using semantic versioning http://semver.org/ 'minfirmwareVersionAccepted': '3.0.0', - 'maxFirmwareVersionAccepted': '3.2.0', // Condition is < (lt) so we accept all in 3.1 branch + 'maxFirmwareVersionAccepted': '5.0.0', // Condition is < (lt) so we accept all in 3.1 branch 'connectionValid': false, 'connectionValidCliOnly': false, 'cliActive': false, diff --git a/manifest.json b/manifest.json index bc63be64..fce67c65 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "minimum_chrome_version": "38", - "version": "3.1.0", + "version": "4.0.0", "author": "Several", "name": "INAV - Configurator", "short_name": "INAV", diff --git a/package.json b/package.json index 463e7271..48f650c2 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "inav-configurator", "description": "INAV Configurator", - "version": "3.0.1", + "version": "4.0.0", "main": "main.html", "default_locale": "en", "scripts": { diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm index 93323fbf..2b67278a 100644 --- a/resources/osd/bold.mcm +++ b/resources/osd/bold.mcm @@ -2498,48 +2498,48 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 01010101 +00100010 +00101010 +00010101 +00100010 +00001000 01010101 +00100010 +00001000 +00010001 +00100010 +00001000 +10001000 +01001000 +01001000 +00100001 +01001000 +01001000 +10001000 +01010001 +01010001 +00000001 01010101 +01010100 +00100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000010 +00100001 +01010100 +00100010 +00100001 +01000010 +00100010 +00100001 +00100010 +00100010 +00100001 +00000000 +00000000 +00000001 01010101 01010101 01010101 diff --git a/resources/osd/bold.png b/resources/osd/bold.png index 0485982e..6092e55f 100644 Binary files a/resources/osd/bold.png and b/resources/osd/bold.png differ diff --git a/resources/osd/bold/039.png b/resources/osd/bold/039.png new file mode 100644 index 00000000..47cb31d3 Binary files /dev/null and b/resources/osd/bold/039.png differ diff --git a/resources/osd/clarity.mcm b/resources/osd/clarity.mcm index 41d20f22..c56855ca 100644 --- a/resources/osd/clarity.mcm +++ b/resources/osd/clarity.mcm @@ -2504,48 +2504,48 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01000100 +00100010 +00101010 +00100010 +00100010 +00001000 +00100010 +00100010 +00001000 +01001000 +01001000 +01001000 +00100010 +01001000 +01001000 +00100010 +01010001 +01010001 +01000100 01010101 01010101 +01000101 01010101 +01010100 +00100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000010 +00100001 +01010100 +00100010 +00100001 +01000010 +00100010 +00100001 +00100010 +00100010 +00100001 +00000000 +00000000 +00000001 01010101 01010101 01010101 diff --git a/resources/osd/clarity.png b/resources/osd/clarity.png index 62b635e3..e54bb3d3 100644 Binary files a/resources/osd/clarity.png and b/resources/osd/clarity.png differ diff --git a/resources/osd/clarity/039.png b/resources/osd/clarity/039.png new file mode 100644 index 00000000..2573ab25 Binary files /dev/null and b/resources/osd/clarity/039.png differ diff --git a/resources/osd/clarity_medium.mcm b/resources/osd/clarity_medium.mcm index 95f8db42..0b186d4a 100644 --- a/resources/osd/clarity_medium.mcm +++ b/resources/osd/clarity_medium.mcm @@ -2504,48 +2504,48 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01000100 +00100010 +00101010 +00100010 +00100010 +00001000 +00100010 +00100010 +00001000 +01001000 +01001000 +01001000 +00100010 +01001000 +01001000 +00100010 +01010001 +01010001 +01000100 01010101 01010101 +01000101 01010101 +01010100 +00100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000010 +00100001 +01010100 +00100010 +00100001 +01000010 +00100010 +00100001 +00100010 +00100010 +00100001 +00000000 +00000000 +00000001 01010101 01010101 01010101 diff --git a/resources/osd/clarity_medium.png b/resources/osd/clarity_medium.png index 2253636f..42266c20 100644 Binary files a/resources/osd/clarity_medium.png and b/resources/osd/clarity_medium.png differ diff --git a/resources/osd/clarity_medium/039.png b/resources/osd/clarity_medium/039.png new file mode 100644 index 00000000..a89b5608 Binary files /dev/null and b/resources/osd/clarity_medium/039.png differ diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm index 6b46124c..bf3da21e 100644 --- a/resources/osd/default.mcm +++ b/resources/osd/default.mcm @@ -2501,48 +2501,48 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01010101 +00100010 +00101010 +00010101 +00100010 +00001000 +00010001 +00100010 +00001000 +10001000 +01001000 +01001000 +00100001 +01001000 +01001000 +10001000 +01010001 +01010001 +00000001 01010101 01010101 +01000101 01010101 +01010100 +00100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000010 +00100001 +01010100 +00100010 +00100001 +01000010 +00100010 +00100001 +00100010 +00100010 +00100001 +00000000 +00000000 +00000001 01010101 01010101 01010101 diff --git a/resources/osd/default.png b/resources/osd/default.png index d9cfb62c..2e1e56eb 100644 Binary files a/resources/osd/default.png and b/resources/osd/default.png differ diff --git a/resources/osd/default/039.png b/resources/osd/default/039.png new file mode 100644 index 00000000..cda1288d Binary files /dev/null and b/resources/osd/default/039.png differ diff --git a/resources/osd/iNav character map.md b/resources/osd/iNav character map.md index 57b054e7..8c79c381 100644 --- a/resources/osd/iNav character map.md +++ b/resources/osd/iNav character map.md @@ -33,7 +33,7 @@ _ASCII_ _*_ | | # SYM_AH_MI | | Ah per Mile | 036 | 0x24 _ASCII_ _*_ | | % | 037 | 0x25 _ASCII_ _*_ | | & | 038 | 0x26 ---- | --- | --- | 039 | 0x27 +SYM_VTX_POWER | SYM.VTX_POWER | VTx Power | 039 | 0x27 _ASCII_ _*_ | | Symbols and numbers | 040 - 062 | 0x28 - 0x3E SYM_AH_NM | SYM.AH_NM | Ah per Nautical Mile | 063 | 0x3F _ASCII_ _*_ | | Alphabet and symbols | 064 - 095 | 0x40 - 0x5F diff --git a/resources/osd/impact.mcm b/resources/osd/impact.mcm index 333e8122..34462dc5 100644 --- a/resources/osd/impact.mcm +++ b/resources/osd/impact.mcm @@ -2501,51 +2501,51 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01010101 +00100010 +00101010 +00010101 +00100010 +00001000 +00010001 +00100010 +00001000 +10001000 +01001000 +01001000 +00100001 +01001000 +01001000 +10001000 +01010001 +01010001 +00000001 01010101 01010101 +00000101 01010101 +01010100 +10100001 01010101 +01000000 +10100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00101000 +10100001 +01010000 +00101000 +10100001 +01001010 +00101000 +10100001 +01001010 +00101000 +10100001 +01010000 +00000000 +00000101 01010101 01010101 01010101 diff --git a/resources/osd/impact.png b/resources/osd/impact.png index 901ad57c..36623830 100644 Binary files a/resources/osd/impact.png and b/resources/osd/impact.png differ diff --git a/resources/osd/impact/039.png b/resources/osd/impact/039.png new file mode 100644 index 00000000..caa00f7a Binary files /dev/null and b/resources/osd/impact/039.png differ diff --git a/resources/osd/impact_mini.mcm b/resources/osd/impact_mini.mcm index cbd81314..7dd04dcd 100644 --- a/resources/osd/impact_mini.mcm +++ b/resources/osd/impact_mini.mcm @@ -2501,51 +2501,51 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01010101 +00100010 +00101010 +00010101 +00100010 +00001000 +00010001 +00100010 +00001000 +10001000 +01001000 +01001000 +00100001 +01001000 +01001000 +10001000 +01010001 +01010000 +00000001 01010101 01010101 +00000101 01010101 +01010100 +10100001 01010101 +01000000 +10100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00101000 +10100001 +01010000 +00101000 +10100001 +01001010 +00101000 +10100001 +01001010 +00101000 +10100001 +01010000 +00000000 +00000101 01010101 01010101 01010101 diff --git a/resources/osd/impact_mini.png b/resources/osd/impact_mini.png index 6fb2503e..6d252d46 100644 Binary files a/resources/osd/impact_mini.png and b/resources/osd/impact_mini.png differ diff --git a/resources/osd/impact_mini/039.png b/resources/osd/impact_mini/039.png new file mode 100644 index 00000000..19cfb495 Binary files /dev/null and b/resources/osd/impact_mini/039.png differ diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm index bf304498..7e858ce5 100644 --- a/resources/osd/large.mcm +++ b/resources/osd/large.mcm @@ -2501,48 +2501,48 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01000100 +00100010 +00101010 +00100010 +00100010 +00001000 +00100010 +00100010 +00001000 +00001000 +00100010 +00001000 +00100010 +01001000 +01001000 +00100010 +01010001 +01010001 +01000100 01010101 01010101 +01000101 01010101 +01010100 +00100001 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000010 +00100001 +01010100 +00100010 +00100001 +01000010 +00100010 +00100001 +00100010 +00100010 +00100001 +00000000 +00000000 +00000001 01010101 01010101 01010101 diff --git a/resources/osd/large.png b/resources/osd/large.png index 11fda4cf..bbb39889 100644 Binary files a/resources/osd/large.png and b/resources/osd/large.png differ diff --git a/resources/osd/large/039.png b/resources/osd/large/039.png new file mode 100644 index 00000000..50480ce9 Binary files /dev/null and b/resources/osd/large/039.png differ diff --git a/resources/osd/vision.mcm b/resources/osd/vision.mcm index 50c27c17..3ff69639 100644 --- a/resources/osd/vision.mcm +++ b/resources/osd/vision.mcm @@ -2501,51 +2501,51 @@ MAX7456 01010101 01010101 01010101 +01000100 +01000000 +01000100 +00100010 +00101010 +00100010 +00100010 +00001000 +00100010 +00100010 +00001000 +00001000 +00100010 +00001000 +00100010 +01001000 +01001000 +00100010 +01010001 +01010001 +01000100 01010101 +01010100 +00010101 01010101 +01010010 +10000101 01010101 +01010010 +10000101 01010101 +00000010 +10000101 +01010100 +10100010 +10000101 +01010100 +10100010 +10000101 +01010100 +10100010 +10000101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00000000 +00010101 01010101 01010101 01010101 diff --git a/resources/osd/vision.png b/resources/osd/vision.png index 314ddf52..bf1b5580 100644 Binary files a/resources/osd/vision.png and b/resources/osd/vision.png differ diff --git a/resources/osd/vision/039.png b/resources/osd/vision/039.png new file mode 100644 index 00000000..e14e7e23 Binary files /dev/null and b/resources/osd/vision/039.png differ diff --git a/tabs/onboard_logging.js b/tabs/onboard_logging.js index dacdf413..bdddfce8 100644 --- a/tabs/onboard_logging.js +++ b/tabs/onboard_logging.js @@ -353,11 +353,10 @@ TABS.onboard_logging.initialize = function (callback) { const date = new Date(); const filename = 'blackbox_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 = '.txt'; + + zeroPad(date.getSeconds(), 2) + '.TXT'; nwdialog.setContext(document); - nwdialog.saveFileDialog(filename, accepts, '', function(file) { + nwdialog.saveFileDialog(filename, function(file) { onComplete(file); }); } diff --git a/tabs/osd.js b/tabs/osd.js index 71e256d9..fc27b0d9 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -98,6 +98,7 @@ SYM.MAH_NM_0 = 0x60; SYM.MAH_NM_1 = 0x61; SYM.AH_NM = 0x3F; SYM.WH_NM = 0x70; +SYM.VTX_POWER = 0x27; SYM.MAX = 0xCE; SYM.AH_AIRCRAFT0 = 0x1A2; @@ -761,7 +762,7 @@ OSD.constants = { { name: 'MAIN_BATT_REMAINING_PERCENTAGE', id: 38, - preview: '100%' + preview: FONT.symbol(SYM.BATT) + '100%' }, { name: 'REMAINING_FLIGHT_TIME', @@ -1636,7 +1637,7 @@ OSD.constants = { { name: 'VTX_POWER', id: 105, - preview: '1' + preview: FONT.symbol(SYM.VTX_POWER) + '1' }, ] },