Browse Source

Merge pull request #8058 from mavlink/durandal_firmware_support

Firmware update: add Durandal-v1
QGC4.4
Beat Küng 6 years ago committed by GitHub
parent
commit
67204922dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/VehicleSetup/Bootloader.h
  2. 15
      src/VehicleSetup/FirmwareUpgradeController.cc
  3. 1
      src/VehicleSetup/FirmwareUpgradeController.h

1
src/VehicleSetup/Bootloader.h

@ -77,6 +77,7 @@ public:
static const int boardIDOmnibusF4SD = 42; ///< Omnibus F4 SD, as from USB PID 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 boardIDFMUK66V3 = 28; ///< FMUK66V3 board, as from USB PID
static const int boardIDKakuteF7 = 123; ///< Holybro KakuteF7 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 /// 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 /// IMPORTANT: Make sure this id does not conflict with any newly added real board ids

15
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"}, { 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 /////////////////////////////////////// /////////////////////////////// px4flow firmwares ///////////////////////////////////////
FirmwareToUrlElement_t rgPX4FLowFirmwareArray[] = { FirmwareToUrlElement_t rgPX4FLowFirmwareArray[] = {
{ PX4FlowPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Flow/master/px4flow.px4" }, { 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); _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]); size = sizeof(rgFMUK66V3FirmwareArray)/sizeof(rgFMUK66V3FirmwareArray[0]);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
const FirmwareToUrlElement_t& element = rgFMUK66V3FirmwareArray[i]; const FirmwareToUrlElement_t& element = rgFMUK66V3FirmwareArray[i];
@ -486,6 +498,9 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
case Bootloader::boardIDKakuteF7: case Bootloader::boardIDKakuteF7:
_rgFirmwareDynamic = _rgKakuteF7Firmware; _rgFirmwareDynamic = _rgKakuteF7Firmware;
break; break;
case Bootloader::boardIDDurandalV1:
_rgFirmwareDynamic = _rgDurandalV1Firmware;
break;
case Bootloader::boardIDFMUK66V3: case Bootloader::boardIDFMUK66V3:
_rgFirmwareDynamic = _rgFMUK66V3Firmware; _rgFirmwareDynamic = _rgFMUK66V3Firmware;
break; break;

1
src/VehicleSetup/FirmwareUpgradeController.h

@ -218,6 +218,7 @@ private:
QHash<FirmwareIdentifier, QString> _rgCrazyflie2Firmware; QHash<FirmwareIdentifier, QString> _rgCrazyflie2Firmware;
QHash<FirmwareIdentifier, QString> _rgOmnibusF4SDFirmware; QHash<FirmwareIdentifier, QString> _rgOmnibusF4SDFirmware;
QHash<FirmwareIdentifier, QString> _rgKakuteF7Firmware; QHash<FirmwareIdentifier, QString> _rgKakuteF7Firmware;
QHash<FirmwareIdentifier, QString> _rgDurandalV1Firmware;
QHash<FirmwareIdentifier, QString> _rgFMUK66V3Firmware; QHash<FirmwareIdentifier, QString> _rgFMUK66V3Firmware;
QHash<FirmwareIdentifier, QString> _rgPX4FLowFirmware; QHash<FirmwareIdentifier, QString> _rgPX4FLowFirmware;
QHash<FirmwareIdentifier, QString> _rg3DRRadioFirmware; QHash<FirmwareIdentifier, QString> _rg3DRRadioFirmware;

Loading…
Cancel
Save