Browse Source

Merge pull request #6960 from Williangalvani/addmetadata

Add updated Sub parameters metadata
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
ac05923f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
  2. 11008
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.6dev.xml
  3. 1
      src/FirmwarePlugin/APM/APMResources.qrc

4
src/FirmwarePlugin/APM/APMFirmwarePlugin.cc

@ -840,8 +840,10 @@ QString APMFirmwarePlugin::internalParameterMetaDataFile(Vehicle* vehicle) @@ -840,8 +840,10 @@ QString APMFirmwarePlugin::internalParameterMetaDataFile(Vehicle* vehicle)
case MAV_TYPE_SUBMARINE:
if (vehicle->firmwareMajorVersion() < 3 || (vehicle->firmwareMajorVersion() == 3 && vehicle->firmwareMinorVersion() <= 4)) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.4.xml");
} else {
} else if (vehicle->firmwareMinorVersion() <= 5) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.5.xml");
} else {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.6dev.xml");
}
default:
return QString();

11008
src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.6dev.xml

File diff suppressed because it is too large Load Diff

1
src/FirmwarePlugin/APM/APMResources.qrc

@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
<file alias="APMParameterFactMetaData.Rover.3.4.xml">APMParameterFactMetaData.Rover.3.4.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.4.xml">APMParameterFactMetaData.Sub.3.4.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.5.xml">APMParameterFactMetaData.Sub.3.5.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.6dev.xml">APMParameterFactMetaData.Sub.3.6dev.xml</file>
<file alias="Copter.OfflineEditing.params">Copter3.5.OfflineEditing.params</file>
<file alias="Plane.OfflineEditing.params">Plane3.7.OfflineEditing.params</file>
</qresource>

Loading…
Cancel
Save