From 45bcbe85bcf1d692af4deeb0ac3602ebda965028 Mon Sep 17 00:00:00 2001 From: Clyde McQueen Date: Wed, 28 Feb 2024 14:30:29 -0800 Subject: [PATCH] Update parameters for Sub 4.5 --- src/FirmwarePlugin/APM/APMFirmwarePlugin.cc | 3 +++ src/FirmwarePlugin/APM/APMResources.qrc | 1 + src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc index 481181c1c807..24cc1ce89b1f 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc @@ -742,6 +742,9 @@ QString APMFirmwarePlugin::_internalParameterMetaDataFile(Vehicle* vehicle) return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.3.4.xml"); case MAV_TYPE_SUBMARINE: + if (vehicle->versionCompare(4, 5, 0) >= 0) { // 4.5.x + return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.4.5.xml"); + } if (vehicle->versionCompare(4, 1, 0) >= 0) { // 4.1.x return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.4.1.xml"); } diff --git a/src/FirmwarePlugin/APM/APMResources.qrc b/src/FirmwarePlugin/APM/APMResources.qrc index 27a8ba52ecd9..9bb45373c305 100644 --- a/src/FirmwarePlugin/APM/APMResources.qrc +++ b/src/FirmwarePlugin/APM/APMResources.qrc @@ -67,6 +67,7 @@ ArduPilot-Parameter-Repository/Sub-3.6/apm.pdef.xml ArduPilot-Parameter-Repository/Sub-4.0/apm.pdef.xml ArduPilot-Parameter-Repository/Sub-4.1/apm.pdef.xml + ArduPilot-Parameter-Repository/Sub-4.5/apm.pdef.xml Copter3.6.OfflineEditing.params Plane3.9.OfflineEditing.params Rover3.5.OfflineEditing.params diff --git a/src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository b/src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository index 772370ab665f..e2755f994af7 160000 --- a/src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository +++ b/src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository @@ -1 +1 @@ -Subproject commit 772370ab665fd7a7edcfe488f1c900a1d7d3a4a9 +Subproject commit e2755f994af751eb0219c98064b861303ef962b1