Browse Source

Merge pull request #2771 from DonLakeFlyer/ArduPilotNaming

Change from APM to ArduPilot naming
QGC4.4
Don Gagne 9 years ago
parent
commit
307bae05c6
  1. 2
      src/QmlControls/QGroundControlQmlGlobal.cc
  2. 2
      src/VehicleSetup/FirmwareUpgrade.qml

2
src/QmlControls/QGroundControlQmlGlobal.cc

@ -49,7 +49,7 @@ QGroundControlQmlGlobal::QGroundControlQmlGlobal(QGCApplication* app)
QStringList firmwareEnumStrings; QStringList firmwareEnumStrings;
QVariantList firmwareEnumValues; QVariantList firmwareEnumValues;
firmwareEnumStrings << "APM Flight Stack" << "PX4 Flight Stack" << "Mavlink Generic Flight Stack"; firmwareEnumStrings << "ArduPilot Flight Stack" << "PX4 Flight Stack" << "Mavlink Generic Flight Stack";
firmwareEnumValues << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_ARDUPILOTMEGA) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_PX4) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_GENERIC); firmwareEnumValues << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_ARDUPILOTMEGA) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_PX4) << QVariant::fromValue((uint32_t)MAV_AUTOPILOT_GENERIC);
_offlineEditingFirmwareTypeMetaData.setEnumInfo(firmwareEnumStrings, firmwareEnumValues); _offlineEditingFirmwareTypeMetaData.setEnumInfo(firmwareEnumStrings, firmwareEnumValues);

2
src/VehicleSetup/FirmwareUpgrade.qml

@ -227,7 +227,7 @@ QGCView {
QGCRadioButton { QGCRadioButton {
id: apmFlightStack id: apmFlightStack
exclusiveGroup: firmwareGroup exclusiveGroup: firmwareGroup
text: "APM Flight Stack" text: "ArduPilot Flight Stack"
visible: !px4Flow visible: !px4Flow
onClicked: parent.firmwareVersionChanged(firmwareTypeList) onClicked: parent.firmwareVersionChanged(firmwareTypeList)

Loading…
Cancel
Save