Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
48bf7241
Commit
48bf7241
authored
9 years ago
by
Don Gagne
Browse files
Options
Downloads
Patches
Plain Diff
Catch boot loader on fallback
parent
1d376dbf
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+2
-2
2 additions, 2 deletions
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
with
2 additions
and
2 deletions
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+
2
−
2
View file @
48bf7241
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment