diff --git a/src/js/Features.js b/src/js/Features.js index 4fc0208c6b..d32613bffb 100644 --- a/src/js/Features.js +++ b/src/js/Features.js @@ -67,7 +67,10 @@ const Features = function (config) { if ( config.buildOptions.some( (opt) => - opt.includes("CRSF") || opt.includes("GHST") || opt.includes("FPORT") || opt.includes("JETI"), + opt.includes("CRSF") || + opt.includes("GHST") || + opt.includes("FPORT") || + opt.includes("JETI"), ) ) { enableTelemetry = true; diff --git a/src/js/debug.js b/src/js/debug.js index 29641d1a82..5609ebd82b 100644 --- a/src/js/debug.js +++ b/src/js/debug.js @@ -854,7 +854,7 @@ function update() { delete DEBUG.fieldNames.GPS_RESCUE_THROTTLE_PID; delete DEBUG.fieldNames.GYRO_SCALED; - + DEBUG.fieldNames["MULTI_GYRO_RAW"] = DEBUG.fieldNames.DUAL_GYRO_RAW; DEBUG.fieldNames["MULTI_GYRO_DIFF"] = DEBUG.fieldNames.DUAL_GYRO_DIFF; DEBUG.fieldNames["MULTI_GYRO_SCALED"] = DEBUG.fieldNames.DUAL_GYRO_SCALED; diff --git a/src/js/fc.js b/src/js/fc.js index 35e9e044a5..73adac1bbf 100644 --- a/src/js/fc.js +++ b/src/js/fc.js @@ -1,6 +1,6 @@ import { bit_check } from "./bit"; import { reactive } from "vue"; -import { API_VERSION_1_45, API_VERSION_1_46 } from "./data_storage"; +import { API_VERSION_1_45, API_VERSION_1_46, API_VERSION_1_47 } from "./data_storage"; import semver from "semver"; const INITIAL_CONFIG = { @@ -84,6 +84,7 @@ const FIRMWARE_BUILD_OPTIONS = { USE_SERIALRX_SUMD: 4106, USE_SERIALRX_SUMH: 4107, USE_SERIALRX_XBUS: 4108, + USE_SERIALRX_MAVLINK: 4109, // Motor Protocols USE_BRUSHED: 8230, @@ -804,6 +805,10 @@ const FC = { serialRxTypes[0] = "NONE"; serialRxTypes.push("SPEKTRUM1024"); } + + if (semver.gte(apiVersion, API_VERSION_1_47)) { + serialRxTypes.push("MAVLINK"); + } return serialRxTypes; }, @@ -851,6 +856,9 @@ const FC = { if (options.includes("USE_SERIALRX_GHST")) { supportedRxTypes.push("IRC GHOST"); } + if (options.includes("USE_SERIALRX_MAVLINK")) { + supportedRxTypes.push("MAVLINK"); + } return supportedRxTypes; }