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
412de39c
Unverified
Commit
412de39c
authored
Feb 27, 2020
by
Don Gagne
Committed by
GitHub
Feb 27, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8435 from DonLakeFlyer/FlashLogging
Even better manifest logging
parents
981c05cd
7a501329
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
8 deletions
+19
-8
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+19
-8
No files found.
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
412de39c
...
...
@@ -724,28 +724,39 @@ void FirmwareUpgradeController::setSelectedFirmwareBuildType(FirmwareBuildType_t
void
FirmwareUpgradeController
::
_buildAPMFirmwareNames
(
void
)
{
#if !defined(NO_ARDUPILOT_DIALECT)
qCDebug
(
FirmwareUpgradeLog
)
<<
"_buildAPMFirmwareNames"
<<
_foundBoardInfo
.
description
()
<<
_foundBoardInfo
.
vendorIdentifier
()
<<
_foundBoardInfo
.
productIdentifier
();
bool
chibios
=
_apmChibiOSSetting
->
rawValue
().
toInt
()
==
0
;
FirmwareVehicleType_t
vehicleType
=
static_cast
<
FirmwareVehicleType_t
>
(
_apmVehicleTypeSetting
->
rawValue
().
toInt
());
bool
chibios
=
_apmChibiOSSetting
->
rawValue
().
toInt
()
==
0
;
FirmwareVehicleType_t
vehicleType
=
static_cast
<
FirmwareVehicleType_t
>
(
_apmVehicleTypeSetting
->
rawValue
().
toInt
());
QString
boardDescription
=
_foundBoardInfo
.
description
();
quint16
boardVID
=
_foundBoardInfo
.
vendorIdentifier
();
quint16
boardPID
=
_foundBoardInfo
.
productIdentifier
();
#if 0
// This is left in for debugging manifest problems
boardDescription = "KakuteF7";
boardVID = 1155;
boardPID = 22336;
#endif
qCDebug
(
FirmwareUpgradeLog
)
<<
QStringLiteral
(
"_buildAPMFirmwareNames description(%1) vid(%2/0x%3) pid(%4/0x%5)"
).
arg
(
boardDescription
).
arg
(
boardVID
).
arg
(
boardVID
,
1
,
16
).
arg
(
boardPID
).
arg
(
boardPID
,
1
,
16
);
_apmFirmwareNames
.
clear
();
_apmFirmwareUrls
.
clear
();
QString
apmDescriptionSuffix
(
"-BL"
);
bool
bootloaderMatch
=
_foundBoardInfo
.
description
()
.
endsWith
(
apmDescriptionSuffix
);
bool
bootloaderMatch
=
boardDescription
.
endsWith
(
apmDescriptionSuffix
);
for
(
const
ManifestFirmwareInfo_t
&
firmwareInfo
:
_rgManifestFirmwareInfo
)
{
bool
match
=
false
;
if
(
firmwareInfo
.
firmwareBuildType
==
_selectedFirmwareBuildType
&&
firmwareInfo
.
chibios
==
chibios
&&
firmwareInfo
.
vehicleType
==
vehicleType
)
{
if
(
bootloaderMatch
)
{
if
(
firmwareInfo
.
rgBootloaderPortString
.
contains
(
_foundBoardInfo
.
description
()
))
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Bootloader match:"
<<
firmwareInfo
.
friendlyName
<<
_foundBoardInfo
.
description
()
<<
firmwareInfo
.
rgBootloaderPortString
<<
firmwareInfo
.
url
<<
firmwareInfo
.
vehicleType
;
if
(
firmwareInfo
.
rgBootloaderPortString
.
contains
(
boardDescription
))
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Bootloader match:"
<<
firmwareInfo
.
friendlyName
<<
boardDescription
<<
firmwareInfo
.
rgBootloaderPortString
<<
firmwareInfo
.
url
<<
firmwareInfo
.
vehicleType
;
match
=
true
;
}
}
else
{
if
(
firmwareInfo
.
rgVID
.
contains
(
_foundBoardInfo
.
vendorIdentifier
())
&&
firmwareInfo
.
rgPID
.
contains
(
_foundBoardInfo
.
productIdentifier
()
))
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"
Fallback match:"
<<
firmwareInfo
.
friendlyName
<<
_foundBoardInfo
.
vendorIdentifier
()
<<
_foundBoardInfo
.
productIdentifier
()
<<
_bootloaderBoardID
<<
firmwareInfo
.
url
<<
firmwareInfo
.
vehicleType
;
if
(
firmwareInfo
.
rgVID
.
contains
(
boardVID
)
&&
firmwareInfo
.
rgPID
.
contains
(
boardPID
))
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"
VID/PID match:"
<<
firmwareInfo
.
friendlyName
<<
boardVID
<<
boardPID
<<
_bootloaderBoardID
<<
firmwareInfo
.
url
<<
firmwareInfo
.
vehicleType
;
match
=
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