Browse Source

Merge pull request #1344 from crashmatt/master

Support for bootloading uNode board
QGC4.4
Lorenz Meier 10 years ago
parent
commit
61bc6f35d3
  1. 2
      src/VehicleSetup/PX4Bootloader.cc
  2. 1
      src/VehicleSetup/PX4Bootloader.h

2
src/VehicleSetup/PX4Bootloader.cc

@ -439,7 +439,7 @@ bool PX4Bootloader::getBoardInfo(QextSerialPort* port, uint32_t& bootloaderVersi
if (!getBoardInfo(port, INFO_BOARD_ID, _boardID)) { if (!getBoardInfo(port, INFO_BOARD_ID, _boardID)) {
goto Error; goto Error;
} }
if (_boardID != _boardIDPX4Flow && _boardID != _boardIDPX4FMUV1 && _boardID != _boardIDPX4FMUV2) { if (_boardID != _boardIDPX4Flow && _boardID != _boardIDPX4FMUV1 && _boardID != _boardIDPX4FMUV2 && _boardID != _boardIDuNode) {
_errorString = tr("Unsupported board: %1").arg(_boardID); _errorString = tr("Unsupported board: %1").arg(_boardID);
goto Error; goto Error;
} }

1
src/VehicleSetup/PX4Bootloader.h

@ -145,6 +145,7 @@ private:
static const int _boardIDPX4FMUV1 = 5; ///< Board ID for PX4 V1 board static const int _boardIDPX4FMUV1 = 5; ///< Board ID for PX4 V1 board
static const int _boardIDPX4FMUV2 = 9; ///< Board ID for PX4 V2 board static const int _boardIDPX4FMUV2 = 9; ///< Board ID for PX4 V2 board
static const int _boardIDPX4Flow = 6; ///< Board ID for PX4 Floaw board static const int _boardIDPX4Flow = 6; ///< Board ID for PX4 Floaw board
static const int _boardIDuNode = 29; ///< Board ID for uNode board
uint32_t _boardID; ///< board id for currently connected board uint32_t _boardID; ///< board id for currently connected board
uint32_t _boardFlashSize; ///< flash size for currently connected board uint32_t _boardFlashSize; ///< flash size for currently connected board

Loading…
Cancel
Save