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
d778158a
Commit
d778158a
authored
May 08, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/mavlink/qgroundcontrol
into qgc4
parents
c61fa31d
27a70b81
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
PX4ParameterFactMetaData.xml
src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
+1
-0
Vehicle.cc
src/Vehicle/Vehicle.cc
+1
-0
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+13
-0
No files found.
src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
View file @
d778158a
...
...
@@ -10039,6 +10039,7 @@ to fixed wing mode. Zero or negative values will produce an instant throttle ris
<min>
0
</min>
<max>
2
</max>
<decimal>
0
</decimal>
<reboot_required>
true
</reboot_required>
<values>
<value
code=
"0"
>
Tailsitter
</value>
<value
code=
"1"
>
Tiltrotor
</value>
...
...
src/Vehicle/Vehicle.cc
View file @
d778158a
...
...
@@ -953,6 +953,7 @@ void Vehicle::_handleVfrHud(mavlink_message_t& message)
_airSpeedFact
.
setRawValue
(
qIsNaN
(
vfrHud
.
airspeed
)
?
0
:
vfrHud
.
airspeed
);
_groundSpeedFact
.
setRawValue
(
qIsNaN
(
vfrHud
.
groundspeed
)
?
0
:
vfrHud
.
groundspeed
);
_climbRateFact
.
setRawValue
(
qIsNaN
(
vfrHud
.
climb
)
?
0
:
vfrHud
.
climb
);
_throttlePctFact
.
setRawValue
(
vfrHud
.
throttle
);
}
void
Vehicle
::
_handleEstimatorStatus
(
mavlink_message_t
&
message
)
...
...
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
d778158a
...
...
@@ -267,6 +267,13 @@ void FirmwareUpgradeController::_initFirmwareHash()
{
AutoPilotStackPX4
,
BetaFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/beta/omnibus_f4sd_default.px4"
},
{
AutoPilotStackPX4
,
DeveloperFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/omnibus_f4sd_default.px4"
},
};
//////////////////////////////////// FMUK66V3 firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t
rgFMUK66V3FirmwareArray
[]
=
{
{
AutoPilotStackPX4
,
StableFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/stable/nxp_fmuk66-v3_default.px4"
},
{
AutoPilotStackPX4
,
BetaFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/beta/nxp_fmuk66-v3_default.px4"
},
{
AutoPilotStackPX4
,
DeveloperFirmware
,
DefaultVehicleFirmware
,
"http://px4-travis.s3.amazonaws.com/Firmware/master/nxp_fmuk66-v3_default.px4"
},
};
/////////////////////////////// px4flow firmwares ///////////////////////////////////////
FirmwareToUrlElement_t
rgPX4FLowFirmwareArray
[]
=
{
...
...
@@ -454,6 +461,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
const
FirmwareToUrlElement_t
&
element
=
rgOmnibusF4SDFirmwareArray
[
i
];
_rgOmnibusF4SDFirmware
.
insert
(
FirmwareIdentifier
(
element
.
stackType
,
element
.
firmwareType
,
element
.
vehicleType
),
element
.
url
);
}
size
=
sizeof
(
rgFMUK66V3FirmwareArray
)
/
sizeof
(
rgFMUK66V3FirmwareArray
[
0
]);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
const
FirmwareToUrlElement_t
&
element
=
rgFMUK66V3FirmwareArray
[
i
];
_rgFMUK66V3Firmware
.
insert
(
FirmwareIdentifier
(
element
.
stackType
,
element
.
firmwareType
,
element
.
vehicleType
),
element
.
url
);
}
size
=
sizeof
(
rgPX4FLowFirmwareArray
)
/
sizeof
(
rgPX4FLowFirmwareArray
[
0
]);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
...
...
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