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
f94abb0b
Commit
f94abb0b
authored
Jun 01, 2015
by
Andrew C. Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the firmware upgrade controller to add support for the Gumstix AeroCore board.
parent
e3a27797
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+17
-4
FirmwareUpgradeController.h
src/VehicleSetup/FirmwareUpgradeController.h
+1
-0
No files found.
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
f94abb0b
...
...
@@ -167,7 +167,14 @@ void FirmwareUpgradeController::_getFirmwareFile(void)
"http://px4-travis.s3.amazonaws.com/Firmware/beta/px4fmu-v2_default.px4"
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/px4fmu-v2_default.px4"
};
static
const
char
*
rgAeroCoreFirmware
[
3
]
=
{
"http://s3-us-west-2.amazonaws.com/gumstix-aerocore/PX4/stable/aerocore_default.px4"
,
"http://s3-us-west-2.amazonaws.com/gumstix-aerocore/PX4/beta/aerocore_default.px4"
,
"http://s3-us-west-2.amazonaws.com/gumstix-aerocore/PX4/master/aerocore_default.px4"
};
static
const
char
*
rgPX4FlowFirmware
[
3
]
=
{
"http://px4-travis.s3.amazonaws.com/Flow/master/px4flow.px4"
,
...
...
@@ -190,7 +197,11 @@ void FirmwareUpgradeController::_getFirmwareFile(void)
case
_boardIDPX4FMUV2
:
prgFirmware
=
rgPX4FMUV2Firmware
;
break
;
case
_boardIDAeroCore
:
prgFirmware
=
rgAeroCoreFirmware
;
break
;
default:
prgFirmware
=
NULL
;
break
;
...
...
@@ -427,7 +438,9 @@ void FirmwareUpgradeController::_downloadFinished(void)
firmwareBoardID
=
_boardIDPX4Flow
;
}
else
if
(
downloadFilename
.
toLower
().
contains
(
"px4fmu-v1"
))
{
firmwareBoardID
=
_boardIDPX4FMUV1
;
}
}
else
if
(
downloadFilename
.
toLower
().
contains
(
"aerocore"
))
{
firmwareBoardID
=
_boardIDAeroCore
;
}
if
(
firmwareBoardID
!=
0
&&
firmwareBoardID
!=
_boardID
)
{
_appendStatusLog
(
tr
(
"Downloaded firmware board id does not match hardware board id: %1 != %2"
).
arg
(
firmwareBoardID
).
arg
(
_boardID
));
...
...
@@ -634,4 +647,4 @@ bool FirmwareUpgradeController::activeQGCConnections(void)
bool
FirmwareUpgradeController
::
pluggedInBoard
(
void
)
{
return
_threadController
->
pluggedInBoard
();
}
\ No newline at end of file
}
src/VehicleSetup/FirmwareUpgradeController.h
View file @
f94abb0b
...
...
@@ -127,6 +127,7 @@ private:
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 Flow board
static
const
int
_boardIDAeroCore
=
98
;
///< Board ID for Gumstix AeroCore board
uint32_t
_boardID
;
///< Board ID
uint32_t
_boardFlashSize
;
///< Flash size in bytes of board
...
...
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