Browse Source

add new 4.2 metadata for Ardupilot

QGC4.4
Bill Geyer 2 years ago committed by Patrick José Pereira
parent
commit
7a00804956
  1. 9
      src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
  2. 20530
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.2.xml
  3. 20343
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.4.2.xml
  4. 17892
      src/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.4.2.xml
  5. 3
      src/FirmwarePlugin/APM/APMResources.qrc

9
src/FirmwarePlugin/APM/APMFirmwarePlugin.cc

@ -657,6 +657,9 @@ QString APMFirmwarePlugin::_internalParameterMetaDataFile(Vehicle* vehicle)
case MAV_TYPE_TRICOPTER: case MAV_TYPE_TRICOPTER:
case MAV_TYPE_COAXIAL: case MAV_TYPE_COAXIAL:
case MAV_TYPE_HELICOPTER: case MAV_TYPE_HELICOPTER:
if (vehicle->versionCompare(4, 2, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.2.xml");
}
if (vehicle->versionCompare(4, 1, 0) >= 0) { if (vehicle->versionCompare(4, 1, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.1.xml"); return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.1.xml");
} }
@ -679,6 +682,9 @@ QString APMFirmwarePlugin::_internalParameterMetaDataFile(Vehicle* vehicle)
case MAV_TYPE_VTOL_RESERVED4: case MAV_TYPE_VTOL_RESERVED4:
case MAV_TYPE_VTOL_RESERVED5: case MAV_TYPE_VTOL_RESERVED5:
case MAV_TYPE_FIXED_WING: case MAV_TYPE_FIXED_WING:
if (vehicle->versionCompare(4, 2, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.4.2.xml");
}
if (vehicle->versionCompare(4, 1, 0) >= 0) { if (vehicle->versionCompare(4, 1, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.4.1.xml"); return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.4.1.xml");
} }
@ -695,6 +701,9 @@ QString APMFirmwarePlugin::_internalParameterMetaDataFile(Vehicle* vehicle)
case MAV_TYPE_GROUND_ROVER: case MAV_TYPE_GROUND_ROVER:
case MAV_TYPE_SURFACE_BOAT: case MAV_TYPE_SURFACE_BOAT:
if (vehicle->versionCompare(4, 2, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.4.2.xml");
}
if (vehicle->versionCompare(4, 1, 0) >= 0) { if (vehicle->versionCompare(4, 1, 0) >= 0) {
return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.4.1.xml"); return QStringLiteral(":/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.4.1.xml");
} }

20530
src/FirmwarePlugin/APM/APMParameterFactMetaData.Copter.4.2.xml

File diff suppressed because it is too large Load Diff

20343
src/FirmwarePlugin/APM/APMParameterFactMetaData.Plane.4.2.xml

File diff suppressed because it is too large Load Diff

17892
src/FirmwarePlugin/APM/APMParameterFactMetaData.Rover.4.2.xml

File diff suppressed because it is too large Load Diff

3
src/FirmwarePlugin/APM/APMResources.qrc

@ -48,16 +48,19 @@
<file alias="APMParameterFactMetaData.Plane.3.10.xml">APMParameterFactMetaData.Plane.3.10.xml</file> <file alias="APMParameterFactMetaData.Plane.3.10.xml">APMParameterFactMetaData.Plane.3.10.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.0.xml">APMParameterFactMetaData.Plane.4.0.xml</file> <file alias="APMParameterFactMetaData.Plane.4.0.xml">APMParameterFactMetaData.Plane.4.0.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.1.xml">APMParameterFactMetaData.Plane.4.1.xml</file> <file alias="APMParameterFactMetaData.Plane.4.1.xml">APMParameterFactMetaData.Plane.4.1.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.2.xml">APMParameterFactMetaData.Plane.4.2.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.5.xml">APMParameterFactMetaData.Copter.3.5.xml</file> <file alias="APMParameterFactMetaData.Copter.3.5.xml">APMParameterFactMetaData.Copter.3.5.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.6.xml">APMParameterFactMetaData.Copter.3.6.xml</file> <file alias="APMParameterFactMetaData.Copter.3.6.xml">APMParameterFactMetaData.Copter.3.6.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.7.xml">APMParameterFactMetaData.Copter.3.7.xml</file> <file alias="APMParameterFactMetaData.Copter.3.7.xml">APMParameterFactMetaData.Copter.3.7.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.0.xml">APMParameterFactMetaData.Copter.4.0.xml</file> <file alias="APMParameterFactMetaData.Copter.4.0.xml">APMParameterFactMetaData.Copter.4.0.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.1.xml">APMParameterFactMetaData.Copter.4.1.xml</file> <file alias="APMParameterFactMetaData.Copter.4.1.xml">APMParameterFactMetaData.Copter.4.1.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.2.xml">APMParameterFactMetaData.Copter.4.2.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.4.xml">APMParameterFactMetaData.Rover.3.4.xml</file> <file alias="APMParameterFactMetaData.Rover.3.4.xml">APMParameterFactMetaData.Rover.3.4.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.5.xml">APMParameterFactMetaData.Rover.3.5.xml</file> <file alias="APMParameterFactMetaData.Rover.3.5.xml">APMParameterFactMetaData.Rover.3.5.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.6.xml">APMParameterFactMetaData.Rover.3.6.xml</file> <file alias="APMParameterFactMetaData.Rover.3.6.xml">APMParameterFactMetaData.Rover.3.6.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.0.xml">APMParameterFactMetaData.Rover.4.0.xml</file> <file alias="APMParameterFactMetaData.Rover.4.0.xml">APMParameterFactMetaData.Rover.4.0.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.1.xml">APMParameterFactMetaData.Rover.4.1.xml</file> <file alias="APMParameterFactMetaData.Rover.4.1.xml">APMParameterFactMetaData.Rover.4.1.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.2.xml">APMParameterFactMetaData.Rover.4.2.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.4.xml">APMParameterFactMetaData.Sub.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.5.xml">APMParameterFactMetaData.Sub.3.5.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.6.xml">APMParameterFactMetaData.Sub.3.6.xml</file> <file alias="APMParameterFactMetaData.Sub.3.6.xml">APMParameterFactMetaData.Sub.3.6.xml</file>

Loading…
Cancel
Save