Unverified Commit fd7ee47a authored by Darren Lines's avatar Darren Lines Committed by GitHub
Browse files

Merge pull request #18 from iNavFlight/master

Merge from master
parents 3a3e0ac8 4251e1a9
......@@ -3,7 +3,7 @@
var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.6.0',
'maxFirmwareVersionAccepted': '2.8.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'maxFirmwareVersionAccepted': '3.1.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'connectionValid': false,
'connectionValidCliOnly': false,
'cliActive': false,
......
......@@ -868,7 +868,11 @@ var FC = {
return [ "NONE", "HCSR04", "SRF10", "INAV_I2C", "VL53L0X", "MSP", "UIB", "Benewake TFmini"];
},
getOpticalFlowNames: function () {
return [ "NONE", "PMW3901", "CXOF", "MSP", "FAKE" ];
if (semver.gte(CONFIG.flightControllerVersion, "2.7.0")) {
return [ "NONE", "CXOF", "MSP", "FAKE" ];
} else {
return [ "NONE", "PMW3901", "CXOF", "MSP", "FAKE" ];
}
},
getArmingFlags: function () {
return {
......
......@@ -152,7 +152,7 @@ const mixerList = [
{
id: 8,
name: 'Flying Wing',
model: 'custom',
model: 'flying_wing',
image: 'flying_wing',
enabled: true,
legacy: true,
......@@ -171,7 +171,7 @@ const mixerList = [
{
id: 27,
name: 'Flying Wing with differential thrust',
model: 'custom',
model: 'flying_wing',
image: 'flying_wing',
enabled: true,
legacy: false,
......
{
"manifest_version": 2,
"minimum_chrome_version": "38",
"version": "2.7.0",
"version": "3.0.0",
"author": "Several",
"name": "INAV - Configurator",
"short_name": "INAV",
......
{
"name": "inav-configurator",
"description": "INAV Configurator",
"version": "2.7.0",
"version": "3.0.0",
"main": "main.html",
"default_locale": "en",
"scripts": {
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment