Browse Source

Merge pull request #2300 from pritamghanghas/clone_px4flow_fix

small fix to recognize clone px4flow units
QGC4.4
Don Gagne 10 years ago
parent
commit
0371223ef0
  1. 1
      src/VehicleSetup/PX4FirmwareUpgradeThread.cc
  2. 3
      src/comm/QGCSerialPortInfo.cc

1
src/VehicleSetup/PX4FirmwareUpgradeThread.cc

@ -133,6 +133,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QGCSerialPortInfo& port @@ -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();

3
src/comm/QGCSerialPortInfo.cc

@ -81,6 +81,9 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::boardType(void) const @@ -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;

Loading…
Cancel
Save