From dad505ca3cecef71adf41d167b9551d5991b6bcb Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 10 Feb 2016 11:20:56 -0800 Subject: [PATCH] Change from APM to ArduPilot naming --- src/QmlControls/QGroundControlQmlGlobal.cc | 2 +- src/VehicleSetup/FirmwareUpgrade.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc index f932e5c44..5c8afa2d8 100644 --- a/src/QmlControls/QGroundControlQmlGlobal.cc +++ b/src/QmlControls/QGroundControlQmlGlobal.cc @@ -49,7 +49,7 @@ QGroundControlQmlGlobal::QGroundControlQmlGlobal(QGCApplication* app) QStringList firmwareEnumStrings; 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); _offlineEditingFirmwareTypeMetaData.setEnumInfo(firmwareEnumStrings, firmwareEnumValues); diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 87d1556f3..b79c7750d 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -227,7 +227,7 @@ QGCView { QGCRadioButton { id: apmFlightStack exclusiveGroup: firmwareGroup - text: "APM Flight Stack" + text: "ArduPilot Flight Stack" visible: !px4Flow onClicked: parent.firmwareVersionChanged(firmwareTypeList) -- 2.22.0