From b8cbc26d0060a10f627c59a1dd3d9d95572f68cf Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Mon, 9 Jul 2018 11:21:18 -0700 Subject: [PATCH] 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 09a62a89e..10a1b55ad 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 2bc5ac052..9300f6e26 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 2193636e1..5979655b2 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; -- 2.22.0