From d061eeca820fa92ff23f511df9f01aa9e9c6cb83 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 18 Jul 2019 10:24:56 -0700 Subject: [PATCH 1/5] FMUK66 updates --- src/VehicleSetup/Bootloader.h | 2 +- src/VehicleSetup/FirmwareUpgradeController.cc | 4 ++-- src/VehicleSetup/FirmwareUpgradeController.h | 2 +- src/comm/USBBoardInfo.json | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index d2d3c19..34f962b 100644 --- a/src/VehicleSetup/Bootloader.h +++ b/src/VehicleSetup/Bootloader.h @@ -75,7 +75,7 @@ public: static const int boardIDASCV1 = 65; ///< ASC V1 board, as from USB PID static const int boardIDCrazyflie2 = 12; ///< Crazyflie 2.0 board, as from USB PID static const int boardIDOmnibusF4SD = 42; ///< Omnibus F4 SD, as from USB PID - static const int boardIDNXPHliteV3 = 28; ///< NXPHliteV3 board, as from USB PID + static const int boardIDFMUK66V3 = 28; ///< FMUK66V3 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 5c27016..d205b87 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -529,8 +529,8 @@ QHash* FirmwareUpgradeCo case Bootloader::boardIDOmnibusF4SD: rgFirmware = &_rgOmnibusF4SDFirmware; break; - case Bootloader::boardIDNXPHliteV3: - rgFirmware = &_rgNXPHliteV3Firmware; + case Bootloader::boardIDFMUK66V3: + _rgFirmwareDynamic = _rgFMUK66V3Firmware; break; case Bootloader::boardID3DRRadio: rgFirmware = &_rg3DRRadioFirmware; diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index 3aaed12..112117f 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -212,7 +212,7 @@ private: QHash _rgASCV1Firmware; QHash _rgCrazyflie2Firmware; QHash _rgOmnibusF4SDFirmware; - QHash _rgNXPHliteV3Firmware; + QHash _rgFMUK66V3Firmware; QHash _rgPX4FLowFirmware; QHash _rg3DRRadioFirmware; diff --git a/src/comm/USBBoardInfo.json b/src/comm/USBBoardInfo.json index 358480f..e713433 100644 --- a/src/comm/USBBoardInfo.json +++ b/src/comm/USBBoardInfo.json @@ -19,7 +19,8 @@ { "vendorID": 9900, "productID": 65, "boardClass": "Pixhawk", "name": "ASC V1" }, { "vendorID": 9900, "productID": 22, "boardClass": "Pixhawk", "name": "Crazyflie 2" }, { "vendorID": 9900, "productID": 1, "boardClass": "Pixhawk", "name": "Omnibus F4 SD" }, - { "vendorID": 8137, "productID": 28, "boardClass": "Pixhawk", "name": "PX4 NXPHlite v3.x" }, + { "vendorID": 8137, "productID": 28, "boardClass": "Pixhawk", "name": "PX4 FMUK66 v3.x" }, + { "vendorID": 1155, "productID": 22336, "boardClass": "Pixhawk", "name": "ArduPilot ChibiOS" }, { "vendorID": 4617, "productID": 22336, "boardClass": "Pixhawk", "name": "ArduPilot ChibiOS" }, From 925702aa56260ae03e4b6e10bedb47af756b3779 Mon Sep 17 00:00:00 2001 From: Jari van Ewijk Date: Tue, 7 May 2019 19:48:14 +0200 Subject: [PATCH 2/5] [FMUK66] Actually use the defined firmware URLs --- src/VehicleSetup/FirmwareUpgradeController.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index d205b87..92e0e3f 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -458,6 +458,12 @@ void FirmwareUpgradeController::_initFirmwareHash() const FirmwareToUrlElement_t& element = rgOmnibusF4SDFirmwareArray[i]; _rgOmnibusF4SDFirmware.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]; + _rgFMUK66V3Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); + } size = sizeof(rgPX4FLowFirmwareArray)/sizeof(rgPX4FLowFirmwareArray[0]); for (int i = 0; i < size; i++) { From ae99e8f7abfec8b4a5ca8b535e03c7799a17f0d0 Mon Sep 17 00:00:00 2001 From: Jari van Ewijk Date: Tue, 7 May 2019 16:09:39 +0200 Subject: [PATCH 3/5] Add NXP FMUK66V3 firmware urls --- src/VehicleSetup/FirmwareUpgradeController.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index 92e0e3f..edc6385 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -267,6 +267,13 @@ void FirmwareUpgradeController::_initFirmwareHash() { AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/omnibus_f4sd_default.px4"}, { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/omnibus_f4sd_default.px4"}, }; + + //////////////////////////////////// FMUK66V3 firmwares ////////////////////////////////////////////////// + FirmwareToUrlElement_t rgFMUK66V3FirmwareArray[] = { + { AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/nxp_fmuk66-v3_default.px4"}, + { AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/nxp_fmuk66-v3_default.px4"}, + { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/nxp_fmuk66-v3_default.px4"}, + }; /////////////////////////////// px4flow firmwares /////////////////////////////////////// FirmwareToUrlElement_t rgPX4FLowFirmwareArray[] = { From 7cfd10ba168487cbabb0f5962d2ab43d813c5153 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 18 Jul 2019 10:29:06 -0700 Subject: [PATCH 4/5] Update --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index cdb34db..0fd41a5 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes. * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans. ### 3.5.4 - Not yet released +* Add support for FMUK66 flashing/connection * Guard against null geometry coming from gstreamer which can cause crashes * Add .apj file selection support to custom firmware flash From 35a01acd3e9940a6827075e1477fab2c87be2b92 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 19 Jul 2019 09:34:28 -0700 Subject: [PATCH 5/5] Adjust merge to Stable code --- src/VehicleSetup/FirmwareUpgradeController.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index edc6385..5f2fe29 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -543,7 +543,7 @@ QHash* FirmwareUpgradeCo rgFirmware = &_rgOmnibusF4SDFirmware; break; case Bootloader::boardIDFMUK66V3: - _rgFirmwareDynamic = _rgFMUK66V3Firmware; + rgFirmware = &_rgFMUK66V3Firmware; break; case Bootloader::boardID3DRRadio: rgFirmware = &_rg3DRRadioFirmware;