From d977e09059f80fb473e7bb7b40939e011fa1e1d8 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Fri, 6 Jul 2018 11:13:57 -0400 Subject: [PATCH 1/3] Add auto connect support for the PX4 NXPHlite v3.x --- src/comm/USBBoardInfo.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/comm/USBBoardInfo.json b/src/comm/USBBoardInfo.json index 53013b6..dd24ff6 100644 --- a/src/comm/USBBoardInfo.json +++ b/src/comm/USBBoardInfo.json @@ -19,14 +19,15 @@ { "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": 9900, "productID": 21, "boardClass": "PX4 Flow", "name": "PX4 Flow" }, { "vendorID": 1027, "productID": 24597, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "3DR Radio" }, { "vendorID": 1027, "productID": 24577, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "3DR Radio on FTDI" }, - { "vendorID": 4292, "productID": 60000, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "SILabs Radio" }, + { "vendorID": 4292, "productID": 60000, "boardClass": "SiK Radio", "name": "SiK Radio", "comment": "SILabs Radio" }, - { "vendorID": 5446, "productID": 424, "boardClass": "RTK GPS", "name": "RTK GPS", "comment": "Ublox RTK GPS" }, + { "vendorID": 5446, "productID": 424, "boardClass": "RTK GPS", "name": "RTK GPS", "comment": "Ublox RTK GPS" }, { "vendorID": 8352, "productID": 16732, "boardClass": "OpenPilot", "name": "OpenPilot OPLink" }, { "vendorID": 8352, "productID": 16733, "boardClass": "OpenPilot", "name": "OpenPilot CC3D" }, @@ -35,8 +36,8 @@ ], "boardFallback": [ - { "regExp": "^PX4 FMU v5.x$", "boardClass": "Pixhawk" }, - { "regExp": "^PX4 BL FMU v5.x$","boardClass": "Pixhawk" }, + { "regExp": "^PX4 FMU v5.x$", "boardClass": "Pixhawk" }, + { "regExp": "^PX4 BL FMU v5.x$", "boardClass": "Pixhawk" }, { "regExp": "^PX4 FMU v4.x PRO$", "boardClass": "Pixhawk" }, { "regExp": "^PX4 BL FMU v4.x PRO$","boardClass": "Pixhawk" }, { "regExp": "^PX4 FMU v4.x$", "boardClass": "Pixhawk" }, From b8cbc26d0060a10f627c59a1dd3d9d95572f68cf Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Mon, 9 Jul 2018 11:21:18 -0700 Subject: [PATCH 2/3] Buxfix-segfault - Added board ID for NXPHlite --- src/VehicleSetup/Bootloader.h | 1 + src/VehicleSetup/FirmwareUpgradeController.cc | 2 ++ src/VehicleSetup/FirmwareUpgradeController.h | 1 + 3 files changed, 4 insertions(+) diff --git a/src/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h index 09a62a8..10a1b55 100644 --- a/src/VehicleSetup/Bootloader.h +++ b/src/VehicleSetup/Bootloader.h @@ -74,6 +74,7 @@ public: static const int boardIDTAPV1 = 64; ///< TAP V1 board, as from USB PID 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 boardIDNXPHliteV3 = 28; ///< NXPHliteV3 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 2bc5ac0..9300f6e 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -481,6 +481,8 @@ QHash* FirmwareUpgradeCo return &_rgASCV1Firmware; case Bootloader::boardIDCrazyflie2: return &_rgCrazyflie2Firmware; + case Bootloader::boardIDNXPHliteV3: + return &_rgNXPHliteV3Firmware; case Bootloader::boardID3DRRadio: return &_rg3DRRadioFirmware; default: diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index 2193636..5979655 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -212,6 +212,7 @@ private: QHash _rgTAPV1Firmware; QHash _rgASCV1Firmware; QHash _rgCrazyflie2Firmware; + QHash _rgNXPHliteV3Firmware; QHash _rgPX4FLowFirmware; QHash _rg3DRRadioFirmware; From 3fd4bfaa79b5a206efb382b577866cb4557d66d5 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 11 Jul 2018 12:45:58 -0400 Subject: [PATCH 3/3] Switching to Qt 5.11.1 (Windows only) --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6447bda..ea99b1d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ environment: install: - git submodule update --init --recursive - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.11.0\msvc2015\bin;%PATH% + - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.11.1\msvc2015\bin;%PATH% - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\ - ps: | Write-Host "Installing GStreamer..." -ForegroundColor Cyan @@ -35,7 +35,7 @@ install: Write-Host "Installed" -ForegroundColor Green build_script: - - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.11.0\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro + - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.11.1\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro - cd %SHADOW_BUILD_DIR% && jom - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe ) # Generate the source server information to embed in the PDB