Merge branch 'master' into release_4.0.0

pull/1397/head
Paweł Spychalski 3 years ago committed by GitHub
commit b512e1fcb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -3,7 +3,7 @@
var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '3.0.0',
'maxFirmwareVersionAccepted': '5.0.0', // Condition is < (lt) so we accept all in 3.1 branch
'maxFirmwareVersionAccepted': '6.0.0', // Condition is < (lt) so we accept all in 4.x branch
'connectionValid': false,
'connectionValidCliOnly': false,
'cliActive': false,

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

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

@ -53,13 +53,13 @@ TABS.auxiliary.initialize = function (callback) {
"ARM", "PREARM", // Arming
"ANGLE", "HORIZON", "MANUAL", // Flight modes
"NAV RTH", "NAV COURSE HOLD", "NAV CRUISE", "NAV POSHOLD", "NAV WP", "GCS NAV", // Navigation modes
"NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SURFACE", // Flight mode modifiers
"NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE", // Flight mode modifiers
"AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON", "TURN ASSIST", // Fixed wing specific
"FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ", // Multi-rotor specific
"OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3", // OSD
"CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3", // FPV Camera
"BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", // Misc
"MSP RC OVERRIDE", "USER1", "USER2"
"BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "BLACKBOX", "FAILSAFE", "KILLSWITCH", // Misc
"TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2"
];
// Sort the modes

Loading…
Cancel
Save