Commit cb908fcf authored by Don Gagne's avatar Don Gagne

Update board id change for V3 support

parent 403fe3a2
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "QGCApplication.h" #include "QGCApplication.h"
#include "FirmwarePlugin.h" #include "FirmwarePlugin.h"
#include "ParameterManager.h" #include "ParameterManager.h"
#include "Bootloader.h"
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
...@@ -236,7 +237,8 @@ bool FirmwareImage::_px4Load(const QString& imageFilename) ...@@ -236,7 +237,8 @@ bool FirmwareImage::_px4Load(const QString& imageFilename)
} }
uint32_t firmwareBoardId = (uint32_t)px4Json.value(_jsonBoardIdKey).toInt(); uint32_t firmwareBoardId = (uint32_t)px4Json.value(_jsonBoardIdKey).toInt();
if (firmwareBoardId != _boardId) { uint32_t actualBoardId = _boardId == Bootloader::boardIDPX4FMUV3 ? Bootloader::boardIDPX4FMUV2 : _boardId;;
if (firmwareBoardId != actualBoardId) {
emit statusMessage(QString("Downloaded firmware board id does not match hardware board id: %1 != %2").arg(firmwareBoardId).arg(_boardId)); emit statusMessage(QString("Downloaded firmware board id does not match hardware board id: %1 != %2").arg(firmwareBoardId).arg(_boardId));
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment