diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index 6542d7c215c9f32160b90a9b7e8e05f579330932..7a175f1702498c77ebdc07220a1b35fc44189d5f 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 c4163a9323fce06a854f1308beb5e2aa87cd5cb6..5f6c39a7aca0dbedffa7dc602fd6d57397d7ba76 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -319,6 +319,12 @@ void FirmwareUpgradeController::_initFirmwareHash() { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/holybro_kakutef7_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" }, @@ -406,6 +412,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]; @@ -486,6 +498,9 @@ QHash* FirmwareUpgradeCo case Bootloader::boardIDKakuteF7: _rgFirmwareDynamic = _rgKakuteF7Firmware; break; + case Bootloader::boardIDDurandalV1: + _rgFirmwareDynamic = _rgDurandalV1Firmware; + break; case Bootloader::boardIDFMUK66V3: _rgFirmwareDynamic = _rgFMUK66V3Firmware; break; diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index 594d6756f51bd84539d1c1371336dc8137fc943d..5327010c95d43f919c095ad268b3a403d8407099 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -218,6 +218,7 @@ private: QHash _rgCrazyflie2Firmware; QHash _rgOmnibusF4SDFirmware; QHash _rgKakuteF7Firmware; + QHash _rgDurandalV1Firmware; QHash _rgFMUK66V3Firmware; QHash _rgPX4FLowFirmware; QHash _rg3DRRadioFirmware;