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
4132dde4
Commit
4132dde4
authored
May 03, 2019
by
Jari van Ewijk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename NXPhlite to FMUK66
parent
2d8ae582
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
Bootloader.h
src/VehicleSetup/Bootloader.h
+1
-1
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+2
-2
FirmwareUpgradeController.h
src/VehicleSetup/FirmwareUpgradeController.h
+1
-1
USBBoardInfo.json
src/comm/USBBoardInfo.json
+1
-1
No files found.
src/VehicleSetup/Bootloader.h
View file @
4132dde4
...
...
@@ -75,7 +75,7 @@ public:
static
const
int
boardIDASCV1
=
65
;
///< ASC V1 board, as from USB PID
static
const
int
boardIDCrazyflie2
=
12
;
///< Crazyflie 2.0 board, as from USB PID
static
const
int
boardIDOmnibusF4SD
=
42
;
///< Omnibus F4 SD, as from USB PID
static
const
int
boardID
NXPHliteV3
=
28
;
///< NXPHlite
V3 board, as from USB PID
static
const
int
boardID
FMUK66V3
=
28
;
///< FMUK66
V3 board, as from USB PID
/// Simulated board id for V3 which is a V2 board which supports larger flash space
/// IMPORTANT: Make sure this id does not conflict with any newly added real board ids
...
...
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
4132dde4
...
...
@@ -526,8 +526,8 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
case
Bootloader
:
:
boardIDOmnibusF4SD
:
_rgFirmwareDynamic
=
_rgOmnibusF4SDFirmware
;
break
;
case
Bootloader
:
:
boardID
NXPHlite
V3
:
_rgFirmwareDynamic
=
_rg
NXPHlite
V3Firmware
;
case
Bootloader
:
:
boardID
FMUK66
V3
:
_rgFirmwareDynamic
=
_rg
FMUK66
V3Firmware
;
break
;
case
Bootloader
:
:
boardID3DRRadio
:
_rgFirmwareDynamic
=
_rg3DRRadioFirmware
;
...
...
src/VehicleSetup/FirmwareUpgradeController.h
View file @
4132dde4
...
...
@@ -212,7 +212,7 @@ private:
QHash
<
FirmwareIdentifier
,
QString
>
_rgASCV1Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgCrazyflie2Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgOmnibusF4SDFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rg
NXPHlite
V3Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rg
FMUK66
V3Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgPX4FLowFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rg3DRRadioFirmware
;
...
...
src/comm/USBBoardInfo.json
View file @
4132dde4
...
...
@@ -19,7 +19,7 @@
{
"vendorID"
:
9900
,
"productID"
:
65
,
"boardClass"
:
"Pixhawk", "name"
:
"ASC V1"
},
{
"vendorID"
:
9900
,
"productID"
:
22
,
"boardClass"
:
"Pixhawk", "name"
:
"Crazyflie 2"
},
{
"vendorID"
:
9900
,
"productID"
:
1
,
"boardClass"
:
"Pixhawk", "name"
:
"Omnibus F4 SD"
},
{
"vendorID"
:
8137
,
"productID"
:
28
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4
NXPHlite
v3.x"
},
{
"vendorID"
:
8137
,
"productID"
:
28
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4
FMUK66
v3.x"
},
{
"vendorID"
:
1155
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
4617
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
...
...
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