diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index 37e36eb869beb24248d1190c592c0477538010a8..49f72f5e2ae25ea4ccd5e17d414069a148d15ab9 100644 --- a/src/VehicleSetup/Bootloader.h +++ b/src/VehicleSetup/Bootloader.h @@ -77,6 +77,7 @@ public: static const int boardIDOmnibusF4SD = 42; ///< Omnibus F4 SD, as from USB PID static const int boardIDFMUK66V3 = 28; ///< FMUK66V3 board, as from USB PID static const int boardIDKakuteF7 = 123; ///< Holybro KakuteF7 board, as from USB PID + static const int boardIDDurandalV1 = 139; ///< Holybro Durandal-v1 board, as from USB PID /// Simulated board id for V3 which is a V2 board which supports larger flash space /// IMPORTANT: Make sure this id does not conflict with any newly added real board ids diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index 5aacd2fd84d12af968fd841fbc628646d71d0dee..479937d19e84126b0b50ff00bd7f90889cda7cc0 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -283,6 +283,12 @@ void FirmwareUpgradeController::_initFirmwareHash() { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/nxp_fmuk66-v3_default.px4"}, }; + //////////////////////////////////// Durandal firmwares ////////////////////////////////////////////////// + FirmwareToUrlElement_t rgDurandalV1FirmwareArray[] = { + { AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/holybro_durandal-v1_default.px4"}, + { AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/holybro_durandal-v1_default.px4"}, + { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/holybro_durandal-v1_default.px4"}, + }; /////////////////////////////// px4flow firmwares /////////////////////////////////////// FirmwareToUrlElement_t rgPX4FLowFirmwareArray[] = { { PX4FlowPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Flow/master/px4flow.px4" }, @@ -480,6 +486,12 @@ void FirmwareUpgradeController::_initFirmwareHash() _rgKakuteF7Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); } + size = sizeof(rgDurandalV1FirmwareArray)/sizeof(rgDurandalV1FirmwareArray[0]); + for (int i = 0; i < size; i++) { + const FirmwareToUrlElement_t& element = rgDurandalV1FirmwareArray[i]; + _rgDurandalV1Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); + } + size = sizeof(rgFMUK66V3FirmwareArray)/sizeof(rgFMUK66V3FirmwareArray[0]); for (int i = 0; i < size; i++) { const FirmwareToUrlElement_t& element = rgFMUK66V3FirmwareArray[i]; @@ -559,6 +571,9 @@ QHash* FirmwareUpgradeCo case Bootloader::boardIDKakuteF7: rgFirmware = &_rgKakuteF7Firmware; break; + case Bootloader::boardIDDurandalV1: + rgFirmware = &_rgDurandalV1Firmware; + break; case Bootloader::boardIDFMUK66V3: rgFirmware = &_rgFMUK66V3Firmware; break; diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index 80855be8bea3f03571f547d658c8f22c2f7d379e..398e7a82e263ecbf95447fc4055bc9d52be57f20 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -213,6 +213,7 @@ private: QHash _rgCrazyflie2Firmware; QHash _rgOmnibusF4SDFirmware; QHash _rgKakuteF7Firmware; + QHash _rgDurandalV1Firmware; QHash _rgFMUK66V3Firmware; QHash _rgPX4FLowFirmware; QHash _rg3DRRadioFirmware;