diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index 9703f44e0bd9da2e7d14b341917677392a9843f3..268132483a720f95d148e8856ee4ba2c16606147 100644 --- a/src/VehicleSetup/Bootloader.h +++ b/src/VehicleSetup/Bootloader.h @@ -66,6 +66,7 @@ public: static const int boardIDPX4FMUV4 = 11; ///< PX4 V4 board, as from USB PID static const int boardIDPX4Flow = 6; ///< PX4 Flow board, as from USB PID static const int boardIDAeroCore = 98; ///< Gumstix AeroCore board, as from USB PID + static const int boardIDAUAVX2_1 = 33; ///< AUAV X2.1 board, as from USB PID static const int boardID3DRRadio = 78; ///< 3DR Radio. This is an arbitrary value unrelated to the PID static const int boardIDMINDPXFMUV2 = 88; ///< MindPX V2 board, as from USB PID static const int boardIDTAPV1 = 64; ///< TAP V1 board, as from USB PID diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index f80ac3d45e3030d67f7eafd89977a51312a8942b..66d6e26976f26705a9b44057c2d731c8668f67a1 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -301,7 +301,12 @@ void FirmwareUpgradeController::_initFirmwareHash() { AutoPilotStackAPM, DeveloperFirmware, PlaneFirmware, "http://firmware.ardupilot.org/Plane/latest/PX4/ArduPlane-v1.px4"}, { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware, "http://firmware.ardupilot.org/Rover/latest/PX4/APMrover2-v1.px4"} }; - + //////////////////////////////////// AUAVX2_1 firmwares ////////////////////////////////////////////////// + FirmwareToUrlElement_t rgAUAVX2_1FirmwareArray[] = { + { AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/auav-x21_default.px4"}, + { AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/auav-x21_default.px4"}, + { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/auav-x21_default.px4"}, + }; //////////////////////////////////// MindPXFMUV2 firmwares ////////////////////////////////////////////////// FirmwareToUrlElement_t rgMindPXFMUV2FirmwareArray[] = { { AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/mindpx-v2_default.px4"}, @@ -355,6 +360,12 @@ void FirmwareUpgradeController::_initFirmwareHash() _rgPX4FMUV1Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); } + size = sizeof(rgAUAVX2_1FirmwareArray)/sizeof(rgAUAVX2_1FirmwareArray[0]); + for (int i = 0; i < size; i++) { + const FirmwareToUrlElement_t& element = rgAUAVX2_1FirmwareArray[i]; + _rgAUAVX2_1Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url); + } + size = sizeof(rgMindPXFMUV2FirmwareArray)/sizeof(rgMindPXFMUV2FirmwareArray[0]); for (int i = 0; i < size; i++) { const FirmwareToUrlElement_t& element = rgMindPXFMUV2FirmwareArray[i]; @@ -406,6 +417,8 @@ QHash* FirmwareUpgradeCo return &_rgPX4FMUV4Firmware; case Bootloader::boardIDAeroCore: return &_rgAeroCoreFirmware; + case Bootloader::boardIDAUAVX2_1: + return &_rgAUAVX2_1Firmware; case Bootloader::boardIDMINDPXFMUV2: return &_rgMindPXFMUV2Firmware; case Bootloader::boardIDTAPV1: diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index f4596e31fe941f9ea3a268391673ba8de1caa091..6833019317cbd2e70e5dfcea6393b44d6e5786b7 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -198,6 +198,7 @@ private: QHash _rgPX4FMUV2Firmware; QHash _rgAeroCoreFirmware; QHash _rgPX4FMUV1Firmware; + QHash _rgAUAVX2_1Firmware; QHash _rgMindPXFMUV2Firmware; QHash _rgTAPV1Firmware; QHash _rgASCV1Firmware; diff --git a/src/comm/QGCSerialPortInfo.h b/src/comm/QGCSerialPortInfo.h index 51f2728454bb3d4c544ea51d506dd81703f725d7..71398d5009f130d4a837eb564701f7daf203ac5f 100644 --- a/src/comm/QGCSerialPortInfo.h +++ b/src/comm/QGCSerialPortInfo.h @@ -43,6 +43,7 @@ public: static const int pixhawkFMUV2ProductId = 17; ///< Product ID for Pixhawk V2 board static const int pixhawkFMUV2OldBootloaderProductId = 22; ///< Product ID for Bootloader on older Pixhawk V2 boards static const int pixhawkFMUV1ProductId = 16; ///< Product ID for PX4 FMU V1 board + static const int auavx2_1FMUV2ProductId = 33; ///< Product ID for AUAV X2.1 FMU V2 board static const int AeroCoreProductId = 4097; ///< Product ID for the AeroCore board diff --git a/src/comm/USBBoardInfo.json b/src/comm/USBBoardInfo.json index 1050c8986d4ca6f75c9c472d711d5125d7ac0e36..424fb6e019d9eb4babee2a5d58d5c8a107be79da 100644 --- a/src/comm/USBBoardInfo.json +++ b/src/comm/USBBoardInfo.json @@ -11,6 +11,7 @@ { "vendorID": 9900, "productID": 18, "boardClass": "Pixhawk", "name": "PX4 FMU V4" }, { "vendorID": 9900, "productID": 22, "boardClass": "Pixhawk", "name": "PX4 FMU V2", "comment": "Bootloader on older Pixhawk V2 boards" }, { "vendorID": 9900, "productID": 4097, "boardClass": "Pixhawk", "name": "AeroCore" }, + { "vendorID": 9900, "productID": 33, "boardClass": "Pixhawk", "name": "AUAV X2.1 FMU V2" }, { "vendorID": 9900, "productID": 48, "boardClass": "Pixhawk", "name": "MindPX FMU V2" }, { "vendorID": 9900, "productID": 64, "boardClass": "Pixhawk", "name": "TAP V1" }, { "vendorID": 9900, "productID": 65, "boardClass": "Pixhawk", "name": "ASC V1" }, @@ -36,7 +37,6 @@ { "regExp": "^PX4 FMU v1.x$", "boardClass": "Pixhawk" }, { "regExp": "^PX4 BL FMU v1.x$", "boardClass": "Pixhawk" }, { "regExp": "^MindPX FMU v2.x$", "boardClass": "Pixhawk" }, - { "regExp": "^MindPX FMU v2.x$", "boardClass": "Pixhawk" }, { "regExp": "^MindPX BL FMU v2.x$", "boardClass": "Pixhawk" }, { "regExp": "^PX4 TAP v1.x$", "boardClass": "Pixhawk" }, { "regExp": "^PX4 BL TAP v1.x$", "boardClass": "Pixhawk" }, diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index ed39910a27308cddb709120406407fd653e6552c..59618eafe7b24d4f914c1ca254a9be8d36c05d4f 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -128,7 +128,7 @@ QGCView { } } //----------------------------------------------------------------- - //-- Miscelanous + //-- Miscellanous Item { width: qgcView.width * 0.8 height: miscLabel.height @@ -136,7 +136,7 @@ QGCView { anchors.horizontalCenter: parent.horizontalCenter QGCLabel { id: miscLabel - text: qsTr("Miscelaneous") + text: qsTr("Miscellaneous") font.family: ScreenTools.demiboldFontFamily } }