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
189419cf
Commit
189419cf
authored
Aug 13, 2015
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1774 from DonLakeFlyer/Flash
Catch boot loader on fallback
parents
1d376dbf
48bf7241
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
PX4FirmwareUpgradeThread.cc
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+2
-2
No files found.
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
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