Merge branch 'change-profiles-with-programmin' of https://github.com/MrD-RC/inav-configurator into change-profiles-with-programmin
|
@ -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.
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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": {
|
||||
|
|
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
BIN
resources/osd/bold/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
BIN
resources/osd/clarity/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
BIN
resources/osd/clarity_medium/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
BIN
resources/osd/default/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
BIN
resources/osd/impact/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
BIN
resources/osd/impact_mini/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
BIN
resources/osd/large/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
BIN
resources/osd/vision/039.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
|
@ -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);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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'
|
||||
},
|
||||
]
|
||||
},
|
||||
|
|