From 4bfcbae7bc67fd56d4aff1c3f0af5e5d6b8a7bb4 Mon Sep 17 00:00:00 2001 From: "Konstantin (DigitalEntity) Sharlaimov" Date: Tue, 8 Sep 2020 11:50:21 +0200 Subject: [PATCH 1/2] Add support for MSP sensors: BARO, MAG, GPS --- js/fc.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/fc.js b/js/fc.js index 749f535c..6a5c0745 100644 --- a/js/fc.js +++ b/js/fc.js @@ -688,7 +688,8 @@ var FC = { 'I2C-NAV', 'DJI NAZA', 'UBLOX7', - 'MTK' + 'MTK', + 'MSP' ]; }, getGpsBaudRates: function () { @@ -862,11 +863,11 @@ var FC = { return [ "NONE", "AUTO", "ADXL345", "MPU6050", "MMA845x", "BMA280", "LSM303DLHC", "MPU6000", "MPU6500", "MPU9250", "BMI160", "ICM20689", "FAKE"]; }, getMagnetometerNames: function () { - return ["NONE", "AUTO", "HMC5883", "AK8975", "GPSMAG", "MAG3110", "AK8963", "IST8310", "QMC5883", "MPU9250", "IST8308", "LIS3MDL", "FAKE"]; + return ["NONE", "AUTO", "HMC5883", "AK8975", "GPSMAG", "MAG3110", "AK8963", "IST8310", "QMC5883", "MPU9250", "IST8308", "LIS3MDL", "MSP", "FAKE"]; }, getBarometerNames: function () { if (semver.gte(CONFIG.flightControllerVersion, "2.6.0")) { - return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "BMP388", "DPS310", "FAKE"]; + return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "BMP388", "DPS310", "MSP", "FAKE"]; } else { return ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "BMP388", "FAKE"]; } From 3e5e17c746459c9d8515df48e43270e040468cc6 Mon Sep 17 00:00:00 2001 From: "Konstantin (DigitalEntity) Sharlaimov" Date: Sun, 8 Nov 2020 20:07:26 +0100 Subject: [PATCH 2/2] [MSP SENSOR] Add support for MSP PITOT --- js/fc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/fc.js b/js/fc.js index 6a5c0745..afc4dfdc 100644 --- a/js/fc.js +++ b/js/fc.js @@ -873,7 +873,11 @@ var FC = { } }, getPitotNames: function () { - return ["NONE", "AUTO", "MS4525", "ADC", "VIRTUAL", "FAKE"]; + if (semver.gte(CONFIG.flightControllerVersion, "2.6.0")) { + return ["NONE", "AUTO", "MS4525", "ADC", "VIRTUAL", "FAKE", "MSP"]; + } else { + return ["NONE", "AUTO", "MS4525", "ADC", "VIRTUAL", "FAKE"]; + } }, getRangefinderNames: function () { return [ "NONE", "HCSR04", "SRF10", "INAV_I2C", "VL53L0X", "MSP", "UIB", "Benewake TFmini"];