Merge pull request #4646 from bluerobotics/fw-upload

Add Sub master to firmware options

src/VehicleSetup/FirmwareUpgradeController.cc

@@ -226,7 +226,8 @@ void FirmwareUpgradeController::_initFirmwareHash()
         { AutoPilotStackAPM, DeveloperFirmware, CopterFirmware,         "http://firmware.ardupilot.org/Copter/latest/PX4/ArduCopter-v2.px4"},
         { AutoPilotStackAPM, DeveloperFirmware, HeliFirmware,           "http://firmware.ardupilot.org/Copter/latest/PX4-heli/ArduCopter-v2.px4"},
         { AutoPilotStackAPM, DeveloperFirmware, PlaneFirmware,          "http://firmware.ardupilot.org/Plane/latest/PX4/ArduPlane-v2.px4"},
-        { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware,          "http://firmware.ardupilot.org/Rover/latest/PX4/APMrover2-v2.px4"}
+        { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware,          "http://firmware.ardupilot.org/Rover/latest/PX4/APMrover2-v2.px4"},
+        { AutoPilotStackAPM, DeveloperFirmware, SubFirmware,            "http://firmware.ardupilot.org/Sub/latest/PX4/ArduSub-v2.px4"},
     };
 
     //////////////////////////////////// PX4FMU aerocore firmwares //////////////////////////////////////////////////
@@ -701,6 +702,8 @@ QStringList FirmwareUpgradeController::apmAvailableVersions(void)
         case CopterFirmware:
             version = "MultiRotor - ";
             break;
+        case SubFirmware:
+            version = "Sub - ";
             break;
         case PlaneFirmware:
         case RoverFirmware:

src/VehicleSetup/FirmwareUpgradeController.h

@@ -63,6 +63,7 @@ public:
             CopterFirmware,
             PlaneFirmware,
             RoverFirmware,
+            SubFirmware,
             DefaultVehicleFirmware
         } FirmwareVehicleType_t;