Browse Source

FMUv1 bootloader: Fix binary selection to use correct binary, fall back to description if required

QGC4.4
Lorenz Meier 10 years ago
parent
commit
1d376dbf5c
  1. 6
      src/VehicleSetup/PX4FirmwareUpgradeThread.cc

6
src/VehicleSetup/PX4FirmwareUpgradeThread.cc

@ -152,7 +152,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
found = true; found = true;
} else if (info.productIdentifier() == SerialPortIds::pixhawkFMUV1ProductId) { } else if (info.productIdentifier() == SerialPortIds::pixhawkFMUV1ProductId) {
qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V1"; qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V1";
type = FoundBoardPX4FMUV2; type = FoundBoardPX4FMUV1;
found = true; found = true;
} else if (info.productIdentifier() == SerialPortIds::px4FlowProductId) { } else if (info.productIdentifier() == SerialPortIds::px4FlowProductId) {
qCDebug(FirmwareUpgradeLog) << "Found PX4 Flow"; qCDebug(FirmwareUpgradeLog) << "Found PX4 Flow";
@ -179,6 +179,10 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V2 (by name matching fallback)"; qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V2 (by name matching fallback)";
type = FoundBoardPX4FMUV2; type = FoundBoardPX4FMUV2;
found = true; found = true;
} else if (info.description() == "PX4 FMU v1.x") {
qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V1 (by name matching fallback)";
type = FoundBoardPX4FMUV1;
found = true;
} }
} }
} }

Loading…
Cancel
Save