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
6e1232db
Commit
6e1232db
authored
Apr 24, 2017
by
Don Gagne
Committed by
GitHub
Apr 24, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5053 from DonLakeFlyer/FlightTesting
Fixes from flight testing
parents
59a15139
c929855e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+1
-4
CameraSection.FactMetaData.json
src/MissionManager/CameraSection.FactMetaData.json
+2
-2
MissionController.cc
src/MissionManager/MissionController.cc
+2
-2
PlanToolBar.qml
src/PlanView/PlanToolBar.qml
+1
-1
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
6e1232db
...
...
@@ -167,11 +167,8 @@ QGCView {
message
:
qsTr
(
"
Do you want to remove the mission from the vehicle?
"
)
function
accept
()
{
_missionController
.
removeAllFromVehicle
()
_geoFenceController
.
removeAllFromVehicle
()
_rallyPointController
.
removeAllFromVehicle
()
_planMasterController
.
removeAllFromVehicle
()
hideDialog
()
}
}
}
...
...
src/MissionManager/CameraSection.FactMetaData.json
View file @
6e1232db
...
...
@@ -40,8 +40,8 @@
"shortDescription"
:
"Gimbal yaw rotation."
,
"type"
:
"double"
,
"units"
:
"deg"
,
"min"
:
0.0
,
"max"
:
36
0.0
,
"min"
:
-18
0.0
,
"max"
:
18
0.0
,
"decimalPlaces"
:
0
,
"defaultValue"
:
0
}
...
...
src/MissionManager/MissionController.cc
View file @
6e1232db
...
...
@@ -321,7 +321,7 @@ int MissionController::insertComplexMissionItem(QString itemName, QGeoCoordinate
CameraSection
*
cameraSection
=
settingsItem
->
cameraSection
();
if
(
!
cameraSection
->
specifyGimbal
())
{
cameraSection
->
setSpecifyGimbal
(
true
);
cameraSection
->
gimbal
Yaw
()
->
setRawValue
(
-
90.0
);
cameraSection
->
gimbal
Pitch
()
->
setRawValue
(
-
90.0
);
}
}
}
else
if
(
itemName
==
_fwLandingMissionItemName
)
{
...
...
@@ -371,7 +371,7 @@ void MissionController::removeMissionItem(int index)
if
(
_controllerVehicle
->
firmwarePlugin
()
->
hasGimbal
(
_controllerVehicle
,
rollSupported
,
pitchSupported
,
yawSupported
)
&&
pitchSupported
)
{
MissionSettingsItem
*
settingsItem
=
_visualItems
->
value
<
MissionSettingsItem
*>
(
0
);
CameraSection
*
cameraSection
=
settingsItem
->
cameraSection
();
if
(
cameraSection
->
specifyGimbal
()
&&
cameraSection
->
gimbal
Yaw
()
->
rawValue
().
toDouble
()
==
-
90.0
&&
cameraSection
->
gimbalPitch
()
->
rawValue
().
toDouble
()
==
0.0
)
{
if
(
cameraSection
->
specifyGimbal
()
&&
cameraSection
->
gimbal
Pitch
()
->
rawValue
().
toDouble
()
==
-
90.0
&&
cameraSection
->
gimbalYaw
()
->
rawValue
().
toDouble
()
==
0.0
)
{
cameraSection
->
setSpecifyGimbal
(
false
);
}
}
...
...
src/PlanView/PlanToolBar.qml
View file @
6e1232db
...
...
@@ -132,7 +132,7 @@ Rectangle {
id
:
progressBar
anchors.left
:
parent
.
left
anchors.bottom
:
parent
.
bottom
height
:
2
height
:
4
width
:
_controllerProgressPct
*
parent
.
width
color
:
qgcPal
.
colorGreen
visible
:
false
...
...
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