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
0dd15458
Commit
0dd15458
authored
Mar 26, 2020
by
junwoo091400
Committed by
Hyon Lim
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feature Add:
- UVify Core board support is implemented.
parent
898d0618
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletion
+19
-1
Bootloader.h
src/VehicleSetup/Bootloader.h
+1
-0
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+15
-0
FirmwareUpgradeController.h
src/VehicleSetup/FirmwareUpgradeController.h
+1
-0
USBBoardInfo.json
src/comm/USBBoardInfo.json
+2
-1
No files found.
src/VehicleSetup/Bootloader.h
View file @
0dd15458
...
@@ -79,6 +79,7 @@ public:
...
@@ -79,6 +79,7 @@ public:
static
const
int
boardIDKakuteF7
=
123
;
///< Holybro KakuteF7 board, as from USB PID
static
const
int
boardIDKakuteF7
=
123
;
///< Holybro KakuteF7 board, as from USB PID
static
const
int
boardIDDurandalV1
=
139
;
///< Holybro Durandal-v1 board, as from USB PID
static
const
int
boardIDDurandalV1
=
139
;
///< Holybro Durandal-v1 board, as from USB PID
static
const
int
boardIDModalFCV1
=
41775
;
///< ModalAI FC V1 board, as from USB PID
static
const
int
boardIDModalFCV1
=
41775
;
///< ModalAI FC V1 board, as from USB PID
static
const
int
boardIDUVifyCore
=
20
;
///< UVify Core board, as from USB PID
/// Simulated board id for V3 which is a V2 board which supports larger flash space
/// 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
/// IMPORTANT: Make sure this id does not conflict with any newly added real board ids
...
...
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
0dd15458
...
@@ -332,6 +332,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
...
@@ -332,6 +332,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
{
AutoPilotStackPX4
,
BetaFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/beta/modalai_fc-v1_default.px4"
},
{
AutoPilotStackPX4
,
BetaFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/beta/modalai_fc-v1_default.px4"
},
{
AutoPilotStackPX4
,
DeveloperFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/modalai_fc-v1_default.px4"
},
{
AutoPilotStackPX4
,
DeveloperFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/modalai_fc-v1_default.px4"
},
};
};
//////////////////////////////////// UVify FC firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t
rgUVifyCoreFirmwareArray
[]
=
{
{
AutoPilotStackPX4
,
StableFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/stable/uvify_core_default.px4"
},
{
AutoPilotStackPX4
,
BetaFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/beta/uvify_core_default.px4"
},
{
AutoPilotStackPX4
,
DeveloperFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/uvify_core_default.px4"
},
};
/////////////////////////////// px4flow firmwares ///////////////////////////////////////
/////////////////////////////// px4flow firmwares ///////////////////////////////////////
FirmwareToUrlElement_t
rgPX4FLowFirmwareArray
[]
=
{
FirmwareToUrlElement_t
rgPX4FLowFirmwareArray
[]
=
{
...
@@ -438,6 +444,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
...
@@ -438,6 +444,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
_rgModalFCV1Firmware
.
insert
(
FirmwareIdentifier
(
element
.
stackType
,
element
.
firmwareType
,
element
.
vehicleType
),
element
.
url
);
_rgModalFCV1Firmware
.
insert
(
FirmwareIdentifier
(
element
.
stackType
,
element
.
firmwareType
,
element
.
vehicleType
),
element
.
url
);
}
}
size
=
sizeof
(
rgUVifyCoreFirmwareArray
)
/
sizeof
(
rgUVifyCoreFirmwareArray
[
0
]);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
const
FirmwareToUrlElement_t
&
element
=
rgUVifyCoreFirmwareArray
[
i
];
_rgUVifyCoreFirmware
.
insert
(
FirmwareIdentifier
(
element
.
stackType
,
element
.
firmwareType
,
element
.
vehicleType
),
element
.
url
);
}
size
=
sizeof
(
rgPX4FLowFirmwareArray
)
/
sizeof
(
rgPX4FLowFirmwareArray
[
0
]);
size
=
sizeof
(
rgPX4FLowFirmwareArray
)
/
sizeof
(
rgPX4FLowFirmwareArray
[
0
]);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
const
FirmwareToUrlElement_t
&
element
=
rgPX4FLowFirmwareArray
[
i
];
const
FirmwareToUrlElement_t
&
element
=
rgPX4FLowFirmwareArray
[
i
];
...
@@ -521,6 +533,9 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
...
@@ -521,6 +533,9 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
case
Bootloader
:
:
boardIDModalFCV1
:
case
Bootloader
:
:
boardIDModalFCV1
:
_rgFirmwareDynamic
=
_rgModalFCV1Firmware
;
_rgFirmwareDynamic
=
_rgModalFCV1Firmware
;
break
;
break
;
case
Bootloader
:
:
boardIDUVifyCore
:
_rgFirmwareDynamic
=
_rgUVifyCoreFirmware
;
break
;
case
Bootloader
:
:
boardID3DRRadio
:
case
Bootloader
:
:
boardID3DRRadio
:
_rgFirmwareDynamic
=
_rg3DRRadioFirmware
;
_rgFirmwareDynamic
=
_rg3DRRadioFirmware
;
break
;
break
;
...
...
src/VehicleSetup/FirmwareUpgradeController.h
View file @
0dd15458
...
@@ -222,6 +222,7 @@ private:
...
@@ -222,6 +222,7 @@ private:
QHash
<
FirmwareIdentifier
,
QString
>
_rgDurandalV1Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgDurandalV1Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgFMUK66V3Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgFMUK66V3Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgModalFCV1Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgModalFCV1Firmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgUVifyCoreFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgPX4FLowFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rgPX4FLowFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rg3DRRadioFirmware
;
QHash
<
FirmwareIdentifier
,
QString
>
_rg3DRRadioFirmware
;
...
...
src/comm/USBBoardInfo.json
View file @
0dd15458
...
@@ -22,7 +22,8 @@
...
@@ -22,7 +22,8 @@
{
"vendorID"
:
8137
,
"productID"
:
28
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 FMUK66 v3.x"
},
{
"vendorID"
:
8137
,
"productID"
:
28
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 FMUK66 v3.x"
},
{
"vendorID"
:
1155
,
"productID"
:
41775
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 FMU ModalAI FCv1"
},
{
"vendorID"
:
1155
,
"productID"
:
41775
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 FMU ModalAI FCv1"
},
{
"vendorID"
:
12642
,
"productID"
:
75
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 DurandalV1"
},
{
"vendorID"
:
12642
,
"productID"
:
75
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 DurandalV1"
},
{
"vendorID"
:
4104
,
"productID"
:
1
,
"boardClass"
:
"Pixhawk", "name"
:
"PX4 FMU UVify Core"
},
{
"vendorID"
:
1155
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
1155
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
4617
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
4617
,
"productID"
:
22336
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
4617
,
"productID"
:
22337
,
"boardClass"
:
"Pixhawk", "name"
:
"ArduPilot ChibiOS"
},
{
"vendorID"
:
4617
,
"productID"
:
22337
,
"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