diff --git a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp index 74ddae50f..c15d743a0 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp @@ -263,6 +263,15 @@ int UAVObjectUtilManager::getBoardModel() return ret; } +int UAVObjectUtilManager::getBootloaderRevision() +{ + FirmwareIAPObj::DataFields firmwareIapData = getFirmwareIap(); + + int ret = firmwareIapData.BootloaderRevision; + + return ret; +} + /** * Get the UAV Board CPU Serial Number, for anyone interested. Return format is a byte array */ diff --git a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.h b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.h index a89e241f7..e8279e93e 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.h +++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.h @@ -58,6 +58,7 @@ public: int getGPSPositionSensor(double LLA[3]); int getBoardModel(); + int getBootloaderRevision(); QByteArray getBoardCPUSerial(); quint32 getFirmwareCRC(); QByteArray getBoardDescription(); diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp index b433f9641..26116eae2 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp @@ -99,8 +99,9 @@ void RunningDeviceWidget::populate() QString serial = utilMngr->getBoardCPUSerial().toHex(); myDevice->CPUSerial->setText(serial); - + myDevice->lblBLRev->setText(tr("BL version: ") + QString::number(utilMngr->getBootloaderRevision())); QByteArray description = utilMngr->getBoardDescription(); + deviceDescriptorStruct devDesc; if (UAVObjectUtilManager::descriptionToStructure(description, devDesc)) { if (devDesc.gitTag.startsWith("RELEASE", Qt::CaseSensitive)) { diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui index 05f5b7eaf..66f920795 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui @@ -95,6 +95,19 @@ + + + + + 0 + 0 + + + + BlRevision + + +