Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2b7cc309
Commit
2b7cc309
authored
Apr 18, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1477 from DonLakeFlyer/BoardId
Allow firmware flash for unknown board ids
parents
9a141821
ce1a71f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
10 deletions
+1
-10
FirmwareUpgrade.qml
src/VehicleSetup/FirmwareUpgrade.qml
+1
-1
PX4Bootloader.cc
src/VehicleSetup/PX4Bootloader.cc
+0
-4
PX4Bootloader.h
src/VehicleSetup/PX4Bootloader.h
+0
-5
No files found.
src/VehicleSetup/FirmwareUpgrade.qml
View file @
2b7cc309
...
...
@@ -121,7 +121,7 @@ Rectangle {
frameVisible
:
false
font.pointSize
:
qgcPal
.
dpiAdjustedDefaultFontPointSize
text
:
qsTr
(
"
Please disconnect all
connections and unplug board from USB
before selecting Upgrade.
"
)
text
:
qsTr
(
"
Please disconnect all
vehicles from QGroundControl
before selecting Upgrade.
"
)
style
:
TextAreaStyle
{
textColor
:
qgcPal
.
text
...
...
src/VehicleSetup/PX4Bootloader.cc
View file @
2b7cc309
...
...
@@ -439,10 +439,6 @@ bool PX4Bootloader::getBoardInfo(QextSerialPort* port, uint32_t& bootloaderVersi
if
(
!
getBoardInfo
(
port
,
INFO_BOARD_ID
,
_boardID
))
{
goto
Error
;
}
if
(
_boardID
!=
_boardIDPX4Flow
&&
_boardID
!=
_boardIDPX4FMUV1
&&
_boardID
!=
_boardIDPX4FMUV2
&&
_boardID
!=
_boardIDuNode
)
{
_errorString
=
tr
(
"Unsupported board: %1"
).
arg
(
_boardID
);
goto
Error
;
}
if
(
!
getBoardInfo
(
port
,
INFO_FLASH_SIZE
,
_boardFlashSize
))
{
qWarning
()
<<
_errorString
;
...
...
src/VehicleSetup/PX4Bootloader.h
View file @
2b7cc309
...
...
@@ -142,11 +142,6 @@ private:
bool
_bootloaderVerifyRev2
(
QextSerialPort
*
port
,
const
QString
firmwareFilename
);
bool
_bootloaderVerifyRev3
(
QextSerialPort
*
port
);
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
_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
_boardFlashSize
;
///< flash size for currently connected board
uint32_t
_imageCRC
;
///< CRC for image in currently selected firmware file
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment