Merge pull request #6785 from DonLakeFlyer/Chibios

ArduPilot: ChibiOS flash support for Pixhawk family boards

src/VehicleSetup/FirmwareImage.cc

@@ -57,6 +57,9 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
     } else if (imageFilename.endsWith(".px4")) {
         _binFormat = true;
         return _px4Load(imageFilename);
+    } else if (imageFilename.endsWith(".apj")) {
+        _binFormat = true;
+        return _px4Load(imageFilename);
     } else if (imageFilename.endsWith(".ihx")) {
         _binFormat = false;
         return _ihxLoad(imageFilename);

src/VehicleSetup/FirmwareUpgradeController.h

@@ -54,17 +54,16 @@ public:
         } FirmwareType_t;
 
         typedef enum {
-            QuadFirmware,
-            X8Firmware,
-            HexaFirmware,
-            OctoFirmware,
-            YFirmware,
-            Y6Firmware,
-            HeliFirmware,
             CopterFirmware,
+            HeliFirmware,
             PlaneFirmware,
             RoverFirmware,
             SubFirmware,
+            CopterChibiOSFirmware,
+            HeliChibiOSFirmware,
+            PlaneChibiOSFirmware,
+            RoverChibiOSFirmware,
+            SubChibiOSFirmware,
             DefaultVehicleFirmware
         } FirmwareVehicleType_t;
 

src/comm/QGCSerialPortInfo.cc

@@ -185,6 +185,8 @@ QGCSerialPortInfo::BoardType_t QGCSerialPortInfo::_boardClassStringToType(const
 
 bool QGCSerialPortInfo::getBoardInfo(QGCSerialPortInfo::BoardType_t& boardType, QString& name) const
 {
+    boardType = BoardTypeUnknown;
+
     _loadJsonData();
 
     if (isNull()) {
@@ -220,7 +222,6 @@ bool QGCSerialPortInfo::getBoardInfo(QGCSerialPortInfo::BoardType_t& boardType,
         }
     }
 
-    boardType = BoardTypeUnknown;
     return false;
 }
 

src/comm/USBBoardInfo.json

@@ -57,6 +57,7 @@
         { "regExp": "^PX4 Crazyflie v2.0",  "boardClass": "Pixhawk" },
         { "regExp": "^Crazyflie BL",        "boardClass": "Pixhawk" },
         { "regExp": "^PX4 OmnibusF4SD",     "boardClass": "Pixhawk" },
+        { "regExp": "^fmuv[2345]$",         "boardClass": "Pixhawk" },
         { "regExp": "PX4.*Flow",            "boardClass": "PX4 Flow" },
         { "regExp": "^FT231X USB UART$",    "boardClass": "SiK Radio" },
         { "regExp": "USB UART$",            "boardClass": "SiK Radio",  "androidOnly": true, "comment": "Very broad fallback, too dangerous for non-android" }