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
1ae69b3b
Commit
1ae69b3b
authored
Aug 27, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/mavlink/qgroundcontrol
into pairingTweaks
parents
41351f80
7fd844d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
GuidedActionList.qml
src/FlightDisplay/GuidedActionList.qml
+9
-6
Vehicle.cc
src/Vehicle/Vehicle.cc
+3
-7
No files found.
src/FlightDisplay/GuidedActionList.qml
View file @
1ae69b3b
...
@@ -31,7 +31,10 @@ Rectangle {
...
@@ -31,7 +31,10 @@ Rectangle {
property
var
altitudeSlider
property
var
altitudeSlider
property
alias
model
:
actionRepeater
.
model
property
alias
model
:
actionRepeater
.
model
property
real
_margins
:
Math
.
round
(
ScreenTools
.
defaultFontPixelHeight
*
0.66
)
property
real
_margins
:
Math
.
round
(
ScreenTools
.
defaultFontPixelHeight
*
0.66
)
property
real
_actionWidth
:
ScreenTools
.
defaultFontPixelWidth
*
25
property
real
_actionHorizSpacing
:
ScreenTools
.
defaultFontPixelHeight
*
2
QGCPalette
{
id
:
qgcPal
}
QGCPalette
{
id
:
qgcPal
}
...
@@ -58,11 +61,11 @@ Rectangle {
...
@@ -58,11 +61,11 @@ Rectangle {
Layout.minimumWidth
:
_width
Layout.minimumWidth
:
_width
Layout.maximumWidth
:
_width
Layout.maximumWidth
:
_width
property
real
_width
:
Math
.
min
(
_root
.
width
*
0.8
,
actionRow
.
width
)
property
real
_width
:
Math
.
min
(
(
_actionWidth
*
2
)
+
_actionHorizSpacing
,
actionRow
.
width
)
RowLayout
{
RowLayout
{
id
:
actionRow
id
:
actionRow
spacing
:
ScreenTools
.
defaultFontPixelHeight
*
2
spacing
:
_actionHorizSpacing
Repeater
{
Repeater
{
id
:
actionRepeater
id
:
actionRepeater
...
@@ -74,11 +77,11 @@ Rectangle {
...
@@ -74,11 +77,11 @@ Rectangle {
QGCLabel
{
QGCLabel
{
id
:
actionMessage
id
:
actionMessage
text
:
modelData
.
text
?
modelData
.
text
:
""
text
:
modelData
.
text
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
Layout.minimumWidth
:
_
w
idth
Layout.minimumWidth
:
_
actionW
idth
Layout.maximumWidth
:
_
w
idth
Layout.maximumWidth
:
_
actionW
idth
Layout.fillHeight
:
true
Layout.fillHeight
:
true
property
real
_width
:
ScreenTools
.
defaultFontPixelWidth
*
25
property
real
_width
:
ScreenTools
.
defaultFontPixelWidth
*
25
...
...
src/Vehicle/Vehicle.cc
View file @
1ae69b3b
...
@@ -348,8 +348,10 @@ Vehicle::Vehicle(MAV_AUTOPILOT firmwareType,
...
@@ -348,8 +348,10 @@ Vehicle::Vehicle(MAV_AUTOPILOT firmwareType,
,
_globalPositionIntMessageAvailable
(
false
)
,
_globalPositionIntMessageAvailable
(
false
)
,
_defaultCruiseSpeed
(
_settingsManager
->
appSettings
()
->
offlineEditingCruiseSpeed
()
->
rawValue
().
toDouble
())
,
_defaultCruiseSpeed
(
_settingsManager
->
appSettings
()
->
offlineEditingCruiseSpeed
()
->
rawValue
().
toDouble
())
,
_defaultHoverSpeed
(
_settingsManager
->
appSettings
()
->
offlineEditingHoverSpeed
()
->
rawValue
().
toDouble
())
,
_defaultHoverSpeed
(
_settingsManager
->
appSettings
()
->
offlineEditingHoverSpeed
()
->
rawValue
().
toDouble
())
,
_mavlinkProtocolRequestComplete
(
true
)
,
_maxProtoVersion
(
200
)
,
_vehicleCapabilitiesKnown
(
true
)
,
_vehicleCapabilitiesKnown
(
true
)
,
_capabilityBits
(
_firmwareType
==
MAV_AUTOPILOT_ARDUPILOTMEGA
?
0
:
MAV_PROTOCOL_CAPABILITY_MISSION_FENCE
|
MAV_PROTOCOL_CAPABILITY_MISSION_RALLY
)
,
_capabilityBits
(
MAV_PROTOCOL_CAPABILITY_MISSION_FENCE
|
MAV_PROTOCOL_CAPABILITY_MISSION_RALLY
)
,
_highLatencyLink
(
false
)
,
_highLatencyLink
(
false
)
,
_receivingAttitudeQuaternion
(
false
)
,
_receivingAttitudeQuaternion
(
false
)
,
_cameras
(
nullptr
)
,
_cameras
(
nullptr
)
...
@@ -574,12 +576,6 @@ void Vehicle::_offlineFirmwareTypeSettingChanged(QVariant value)
...
@@ -574,12 +576,6 @@ void Vehicle::_offlineFirmwareTypeSettingChanged(QVariant value)
_firmwareType
=
static_cast
<
MAV_AUTOPILOT
>
(
value
.
toInt
());
_firmwareType
=
static_cast
<
MAV_AUTOPILOT
>
(
value
.
toInt
());
_firmwarePlugin
=
_firmwarePluginManager
->
firmwarePluginForAutopilot
(
_firmwareType
,
_vehicleType
);
_firmwarePlugin
=
_firmwarePluginManager
->
firmwarePluginForAutopilot
(
_firmwareType
,
_vehicleType
);
emit
firmwareTypeChanged
();
emit
firmwareTypeChanged
();
if
(
_firmwareType
==
MAV_AUTOPILOT_ARDUPILOTMEGA
)
{
_capabilityBits
=
0
;
}
else
{
_capabilityBits
=
MAV_PROTOCOL_CAPABILITY_MISSION_FENCE
|
MAV_PROTOCOL_CAPABILITY_MISSION_RALLY
;
}
emit
capabilityBitsChanged
(
_capabilityBits
);
}
}
void
Vehicle
::
_offlineVehicleTypeSettingChanged
(
QVariant
value
)
void
Vehicle
::
_offlineVehicleTypeSettingChanged
(
QVariant
value
)
...
...
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