From 00c711c05844eb64814178f810242d1d6113bbff Mon Sep 17 00:00:00 2001 From: Pritam Ghanghas Date: Sat, 28 Nov 2015 19:54:31 +0530 Subject: [PATCH] small fix to recognize clone px4flow units --- src/VehicleSetup/PX4FirmwareUpgradeThread.cc | 1 + src/comm/QGCSerialPortInfo.cc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc index 3df01ce..fe6c887 100644 --- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc +++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc @@ -133,6 +133,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QGCSerialPortInfo& port { foreach (QGCSerialPortInfo info, QGCSerialPortInfo::availablePorts()) { qCDebug(FirmwareUpgradeLog) << "Serial Port --------------"; + qCDebug(FirmwareUpgradeLog) << "\tboard type" << info.boardType(); qCDebug(FirmwareUpgradeLog) << "\tport name:" << info.portName(); qCDebug(FirmwareUpgradeLog) << "\tdescription:" << info.description(); qCDebug(FirmwareUpgradeLog) << "\tsystem location:" << info.systemLocation(); diff --git a/src/comm/QGCSerialPortInfo.cc b/src/comm/QGCSerialPortInfo.cc index fb3316a..3ca0faa 100644 --- a/src/comm/QGCSerialPortInfo.cc +++ b/src/comm/QGCSerialPortInfo.cc @@ -81,6 +81,9 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::boardType(void) const } else if (description().startsWith("PX4 FMU")) { qCDebug(QGCSerialPortInfoLog) << "Found PX4 FMU, assuming V2 (by name matching fallback)"; boardType = BoardTypePX4FMUV2; + } else if (description().contains(QRegExp("PX4.*Flow", Qt::CaseInsensitive))) { + qCDebug(QGCSerialPortInfoLog) << "Found possible px4 flow camera (by name matching fallback)"; + boardType = BoardTypePX4Flow; } else if (description() == "FT231X USB UART") { qCDebug(QGCSerialPortInfoLog) << "Found possible Radio (by name matching fallback)"; boardType = BoardType3drRadio;