Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
189419cf
Commit
189419cf
authored
Aug 13, 2015
by
Lorenz Meier
Browse files
Merge pull request #1774 from DonLakeFlyer/Flash
Catch boot loader on fallback
parents
1d376dbf
48bf7241
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
View file @
189419cf
...
...
@@ -175,11 +175,11 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
if
(
!
found
)
{
// Fall back to port name matching which could lead to incorrect board mapping. But in some cases the
// vendor and product id do not come through correctly so this is used as a last chance detection method.
if
(
info
.
description
()
==
"PX4 FMU v2.x"
)
{
if
(
info
.
description
()
==
"PX4 FMU
v2.x"
||
info
.
description
()
==
"PX4 BL FMU
v2.x"
)
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Found PX4 FMU V2 (by name matching fallback)"
;
type
=
FoundBoardPX4FMUV2
;
found
=
true
;
}
else
if
(
info
.
description
()
==
"PX4 FMU v1.x"
)
{
}
else
if
(
info
.
description
()
==
"PX4 FMU
v1.x"
||
info
.
description
()
==
"PX4 BL FMU
v1.x"
)
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Found PX4 FMU V1 (by name matching fallback)"
;
type
=
FoundBoardPX4FMUV1
;
found
=
true
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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