1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-26 01:35:23 +03:00

Merge branch 'iNavFlight:master' into mode-in-range-and-acro-indicator-block

This commit is contained in:
Darren Lines 2021-09-22 12:45:41 +01:00 committed by GitHub
commit 00e9473ecd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 393 additions and 393 deletions

View file

@ -57,7 +57,7 @@ For local development, **node.js** build system is used.
- With Chrome: Run `npm run gulp`. Then open `chrome://extensions`, enable - 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. 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 - **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. 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.

View file

@ -3,7 +3,7 @@
var CONFIGURATOR = { var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/ // all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '3.0.0', '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, 'connectionValid': false,
'connectionValidCliOnly': false, 'connectionValidCliOnly': false,
'cliActive': false, 'cliActive': false,

View file

@ -861,7 +861,7 @@ var FC = {
return []; return [];
}, },
getAccelerometerNames: function () { getAccelerometerNames: function () {
return [ "NONE", "AUTO", "ADXL345", "MPU6050", "MMA845x", "BMA280", "LSM303DLHC", "MPU6000", "MPU6500", "MPU9250", "BMI160", "ICM20689", "FAKE"]; return [ "NONE", "AUTO", "MPU6050", "LSM303DLHC", "MPU6000", "MPU6500", "MPU9250", "BMI160", "ICM20689", "FAKE"];
}, },
getBarometerNames: function () { getBarometerNames: function () {
if (semver.gte(CONFIG.flightControllerVersion, "2.6.0")) { if (semver.gte(CONFIG.flightControllerVersion, "2.6.0")) {

View file

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

View file

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

View file

@ -2498,48 +2498,48 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01000100
01000000
01010101 01010101
00100010
00101010
00010101
00100010
00001000
01010101 01010101
00100010
00001000
00010001
00100010
00001000
10001000
01001000
01001000
00100001
01001000
01001000
10001000
01010001
01010001
00000001
01010101 01010101
01010100
00100001
01010101 01010101
01010101 01000010
01010101 00100001
01010101 01010100
01010101 00100010
01010101 00100001
01010101 01000010
01010101 00100010
01010101 00100001
01010101 00100010
01010101 00100010
01010101 00100001
01010101 00000000
01010101 00000000
01010101 00000001
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
resources/osd/bold/039.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -2504,48 +2504,48 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
01000101
01010101 01010101
01010100
00100001
01010101 01010101
01010101 01000010
01010101 00100001
01010101 01010100
01010101 00100010
01010101 00100001
01010101 01000010
01010101 00100010
01010101 00100001
01010101 00100010
01010101 00100010
01010101 00100001
01010101 00000000
01010101 00000000
01010101 00000001
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -2504,48 +2504,48 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
01000101
01010101 01010101
01010100
00100001
01010101 01010101
01010101 01000010
01010101 00100001
01010101 01010100
01010101 00100010
01010101 00100001
01010101 01000010
01010101 00100010
01010101 00100001
01010101 00100010
01010101 00100010
01010101 00100001
01010101 00000000
01010101 00000000
01010101 00000001
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -2501,48 +2501,48 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
01000101
01010101 01010101
01010100
00100001
01010101 01010101
01010101 01000010
01010101 00100001
01010101 01010100
01010101 00100010
01010101 00100001
01010101 01000010
01010101 00100010
01010101 00100001
01010101 00100010
01010101 00100010
01010101 00100001
01010101 00000000
01010101 00000000
01010101 00000001
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -33,7 +33,7 @@ _ASCII_ _*_ | | #
SYM_AH_MI | | Ah per Mile | 036 | 0x24 SYM_AH_MI | | Ah per Mile | 036 | 0x24
_ASCII_ _*_ | | % | 037 | 0x25 _ASCII_ _*_ | | % | 037 | 0x25
_ASCII_ _*_ | | & | 038 | 0x26 _ASCII_ _*_ | | & | 038 | 0x26
--- | --- | --- | 039 | 0x27 SYM_VTX_POWER | SYM.VTX_POWER | VTx Power | 039 | 0x27
_ASCII_ _*_ | | Symbols and numbers | 040 - 062 | 0x28 - 0x3E _ASCII_ _*_ | | Symbols and numbers | 040 - 062 | 0x28 - 0x3E
SYM_AH_NM | SYM.AH_NM | Ah per Nautical Mile | 063 | 0x3F SYM_AH_NM | SYM.AH_NM | Ah per Nautical Mile | 063 | 0x3F
_ASCII_ _*_ | | Alphabet and symbols | 064 - 095 | 0x40 - 0x5F _ASCII_ _*_ | | Alphabet and symbols | 064 - 095 | 0x40 - 0x5F

View file

@ -2501,51 +2501,51 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
00000101
01010101 01010101
01010100
10100001
01010101 01010101
01000000
10100001
01010101 01010101
01010101 00101000
01010101 10100001
01010101 01010000
01010101 00101000
01010101 10100001
01010101 01001010
01010101 00101000
01010101 10100001
01010101 01001010
01010101 00101000
01010101 10100001
01010101 01010000
01010101 00000000
01010101 00000101
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
@ -13183,39 +13183,27 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010000 01010101
01010100 01010101
00010101 01010101
01001010 01010101
00010010 01010101
10000101 01010101
01001010 01010101
00010010 01010101
10000101 01010101
01001010 01010101
00010010 01010101
10000101 01010101
01001010 01010101
00010010 01010101
10000101 01010101
01001010 01010101
00010010 01010101
10000101 01010101
01010000 01010101
01010100 01010101
00010101 01010101
01010000
01010100
00010101
01001010
00010010
10000101
01001010
00010010
10000101
01010000
01010100
00010101
00010001 00010001
01000101 01000101
00010001 00010001
@ -16198,6 +16186,18 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00010100 00010100
00010101 00010101
01010100 01010100

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

@ -2501,51 +2501,51 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
00000101
01010101 01010101
01010100
10100001
01010101 01010101
01000000
10100001
01010101 01010101
01010101 00101000
01010101 10100001
01010101 01010000
01010101 00101000
01010101 10100001
01010101 01001010
01010101 00101000
01010101 10100001
01010101 01001010
01010101 00101000
01010101 10100001
01010101 01010000
01010101 00000000
01010101 00000101
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
@ -12808,51 +12808,51 @@ MAX7456
01010101 01010101
01010101 01010101
01010101 01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01000000
01010101
01010101
00101010
00010101
01010100 01010100
10101010
10000101
01010100
10100010
10000101
01010101
00101010
00010101
01010100
10101010
10000101
01010100
10100010
10000101
01010100
10101010
10000100
01010101
00101010
00010100 00010100
00010101
01010010
10000010
10000101
01010010
10100010
10000101
01010010
10101010
10000101
01010010
10101010
10000101
01010010
10001010
10000101
01010010
10000010
10000101
01010010
10000010
10000101
01010010
10000010
10000101
01010100
00010100
00010101
01010101 01010101
01000000 01010001
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01001000
01010101 01010101
01010001
01001000
01010001
01001000
01001000
01001000
01010001
01010001
01010001
01010101 01010101
01010101 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 259 B

Before After
Before After

View file

@ -2501,48 +2501,48 @@ MAX7456
01010101 01010101
01010101 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
01010101 01010101
01000101
01010101 01010101
01010100
00100001
01010101 01010101
01010101 01000010
01010101 00100001
01010101 01010100
01010101 00100010
01010101 00100001
01010101 01000010
01010101 00100010
01010101 00100001
01010101 00100010
01010101 00100010
01010101 00100001
01010101 00000000
01010101 00000000
01010101 00000001
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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
resources/osd/large/039.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -2501,51 +2501,51 @@ MAX7456
01010101 01010101
01010101 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
01010100
00010101
01010101 01010101
01010010
10000101
01010101 01010101
01010010
10000101
01010101 01010101
00000010
10000101
01010100
10100010
10000101
01010100
10100010
10000101
01010100
10100010
10000101
01010101 01010101
01010101 00000000
01010101 00010101
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 01010101
01010101 01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -353,11 +353,10 @@ TABS.onboard_logging.initialize = function (callback) {
const date = new Date(); const date = new Date();
const filename = 'blackbox_log_' + date.getFullYear() + '-' + zeroPad(date.getMonth() + 1, 2) + '-' 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.getDate(), 2) + '_' + zeroPad(date.getHours(), 2) + zeroPad(date.getMinutes(), 2)
+ zeroPad(date.getSeconds(), 2); + zeroPad(date.getSeconds(), 2) + '.TXT';
const accepts = '.txt';
nwdialog.setContext(document); nwdialog.setContext(document);
nwdialog.saveFileDialog(filename, accepts, '', function(file) { nwdialog.saveFileDialog(filename, function(file) {
onComplete(file); onComplete(file);
}); });
} }

View file

@ -98,6 +98,7 @@ SYM.MAH_NM_0 = 0x60;
SYM.MAH_NM_1 = 0x61; SYM.MAH_NM_1 = 0x61;
SYM.AH_NM = 0x3F; SYM.AH_NM = 0x3F;
SYM.WH_NM = 0x70; SYM.WH_NM = 0x70;
SYM.VTX_POWER = 0x27;
SYM.MAX = 0xCE; SYM.MAX = 0xCE;
SYM.AH_AIRCRAFT0 = 0x1A2; SYM.AH_AIRCRAFT0 = 0x1A2;
@ -761,7 +762,7 @@ OSD.constants = {
{ {
name: 'MAIN_BATT_REMAINING_PERCENTAGE', name: 'MAIN_BATT_REMAINING_PERCENTAGE',
id: 38, id: 38,
preview: '100%' preview: FONT.symbol(SYM.BATT) + '100%'
}, },
{ {
name: 'REMAINING_FLIGHT_TIME', name: 'REMAINING_FLIGHT_TIME',
@ -1636,7 +1637,7 @@ OSD.constants = {
{ {
name: 'VTX_POWER', name: 'VTX_POWER',
id: 105, id: 105,
preview: '1' preview: FONT.symbol(SYM.VTX_POWER) + '1'
}, },
] ]
}, },