From cfbd7ae2796c0f6d45c7d21248a5fdf82b387128 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 23 May 2016 20:25:33 -0700 Subject: [PATCH] Show firmware version in vehicle summary --- src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml | 5 +++++ src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml | 5 +++++ src/VehicleSetup/FirmwareUpgradeController.cc | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index b9aeead2f8..9097ce44f6 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -32,5 +32,10 @@ FactPanel { : /* Fact.value == 10 */ "New Y6"); } + + VehicleSummaryRow { + labelText: qsTr("Firmware Version:") + valueText: activeVehicle.firmwareMajorVersion == -1 ? qsTr("Unknown") : activeVehicle.firmwareMajorVersion + "." + activeVehicle.firmwareMinorVersion + "." + activeVehicle.firmwarePatchVersion + activeVehicle.firmwareVersionTypeString + } } } diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index 2494f55813..d95371ef37 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -34,5 +34,10 @@ FactPanel { labelText: qsTr("Vehicle:") valueText: autoStartSet ? controller.currentVehicleName : qsTr("Setup required") } + + VehicleSummaryRow { + labelText: qsTr("Firmware Version:") + valueText: activeVehicle.firmwareMajorVersion == -1 ? qsTr("Unknown") : activeVehicle.firmwareMajorVersion + "." + activeVehicle.firmwareMinorVersion + "." + activeVehicle.firmwarePatchVersion + activeVehicle.firmwareVersionTypeString + } } } diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index deff7b62da..8e704a9481 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -727,7 +727,6 @@ void FirmwareUpgradeController::_loadAPMVersions(QGCSerialPortInfo::BoardType_t } } - void FirmwareUpgradeController::_apmVersionDownloadFinished(QString remoteFile, QString localFile) { qCDebug(FirmwareUpgradeLog) << "Download complete" << remoteFile << localFile; -- GitLab