From 1d376dbf5ce89129c5514dd60c6f267ca6d482d2 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Tue, 11 Aug 2015 23:02:06 +0200
Subject: [PATCH] FMUv1 bootloader: Fix binary selection to use correct binary,
 fall back to description if required

---
 src/VehicleSetup/PX4FirmwareUpgradeThread.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
index 0174deb58..8d601dc5c 100644
--- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
@@ -152,7 +152,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
                         found = true;
                     } else if (info.productIdentifier() == SerialPortIds::pixhawkFMUV1ProductId) {
                         qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V1";
-                        type = FoundBoardPX4FMUV2;
+                        type = FoundBoardPX4FMUV1;
                         found = true;
                     } else if (info.productIdentifier() == SerialPortIds::px4FlowProductId) {
                         qCDebug(FirmwareUpgradeLog) << "Found PX4 Flow";
@@ -179,6 +179,10 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
                     qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V2 (by name matching fallback)";
                     type = FoundBoardPX4FMUV2;
                     found = true;
+                } else if (info.description() == "PX4 FMU v1.x") {
+                    qCDebug(FirmwareUpgradeLog) << "Found PX4 FMU V1 (by name matching fallback)";
+                    type = FoundBoardPX4FMUV1;
+                    found = true;
                 }
             }
         }
-- 
2.22.0