Browse Source

Buxfix-segfault - Added board ID for NXPHlite

QGC4.4
David Sidrane 7 years ago committed by Lorenz Meier
parent
commit
b8cbc26d00
  1. 1
      src/VehicleSetup/Bootloader.h
  2. 2
      src/VehicleSetup/FirmwareUpgradeController.cc
  3. 1
      src/VehicleSetup/FirmwareUpgradeController.h

1
src/VehicleSetup/Bootloader.h

@ -74,6 +74,7 @@ public: @@ -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

2
src/VehicleSetup/FirmwareUpgradeController.cc

@ -481,6 +481,8 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo @@ -481,6 +481,8 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
return &_rgASCV1Firmware;
case Bootloader::boardIDCrazyflie2:
return &_rgCrazyflie2Firmware;
case Bootloader::boardIDNXPHliteV3:
return &_rgNXPHliteV3Firmware;
case Bootloader::boardID3DRRadio:
return &_rg3DRRadioFirmware;
default:

1
src/VehicleSetup/FirmwareUpgradeController.h

@ -212,6 +212,7 @@ private: @@ -212,6 +212,7 @@ private:
QHash<FirmwareIdentifier, QString> _rgTAPV1Firmware;
QHash<FirmwareIdentifier, QString> _rgASCV1Firmware;
QHash<FirmwareIdentifier, QString> _rgCrazyflie2Firmware;
QHash<FirmwareIdentifier, QString> _rgNXPHliteV3Firmware;
QHash<FirmwareIdentifier, QString> _rgPX4FLowFirmware;
QHash<FirmwareIdentifier, QString> _rg3DRRadioFirmware;

Loading…
Cancel
Save