Browse Source

Show firmware version in vehicle summary

QGC4.4
Don Gagne 9 years ago
parent
commit
cfbd7ae279
  1. 5
      src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
  2. 5
      src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
  3. 1
      src/VehicleSetup/FirmwareUpgradeController.cc

5
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml

@ -32,5 +32,10 @@ FactPanel {
: /* Fact.value == 10 */ "New Y6"); : /* Fact.value == 10 */ "New Y6");
} }
VehicleSummaryRow {
labelText: qsTr("Firmware Version:")
valueText: activeVehicle.firmwareMajorVersion == -1 ? qsTr("Unknown") : activeVehicle.firmwareMajorVersion + "." + activeVehicle.firmwareMinorVersion + "." + activeVehicle.firmwarePatchVersion + activeVehicle.firmwareVersionTypeString
}
} }
} }

5
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml

@ -34,5 +34,10 @@ FactPanel {
labelText: qsTr("Vehicle:") labelText: qsTr("Vehicle:")
valueText: autoStartSet ? controller.currentVehicleName : qsTr("Setup required") 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
}
} }
} }

1
src/VehicleSetup/FirmwareUpgradeController.cc

@ -727,7 +727,6 @@ void FirmwareUpgradeController::_loadAPMVersions(QGCSerialPortInfo::BoardType_t
} }
} }
void FirmwareUpgradeController::_apmVersionDownloadFinished(QString remoteFile, QString localFile) void FirmwareUpgradeController::_apmVersionDownloadFinished(QString remoteFile, QString localFile)
{ {
qCDebug(FirmwareUpgradeLog) << "Download complete" << remoteFile << localFile; qCDebug(FirmwareUpgradeLog) << "Download complete" << remoteFile << localFile;

Loading…
Cancel
Save