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
868adb9e
Commit
868adb9e
authored
Jul 22, 2017
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typos and updating mavlink.
parent
25d43fd7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
v2.0
libs/mavlink/include/mavlink/v2.0
+1
-1
MavCmdInfoCommon.json
src/MissionManager/MavCmdInfoCommon.json
+5
-5
SurveyItemEditor.qml
src/PlanView/SurveyItemEditor.qml
+3
-3
Vehicle.cc
src/Vehicle/Vehicle.cc
+1
-1
Vehicle.h
src/Vehicle/Vehicle.h
+2
-2
No files found.
v2.0
@
47d2375d
Subproject commit
0b8811377674320acd37d6b8e1a2945133528f14
Subproject commit
47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553
src/MissionManager/MavCmdInfoCommon.json
View file @
868adb9e
...
...
@@ -974,7 +974,7 @@
"description"
:
"Set camera photo, video, audio modes."
,
"category"
:
"Camera"
,
"param1"
:
{
"label"
:
"Rserved"
,
"label"
:
"R
e
served"
,
"default"
:
0
,
"decimalPlaces"
:
0
},
...
...
@@ -992,7 +992,7 @@
"description"
:
"Start taking one or more photos."
,
"category"
:
"Camera"
,
"param1"
:
{
"label"
:
"Rserved"
,
"label"
:
"R
e
served"
,
"default"
:
0
,
"decimalPlaces"
:
0
},
...
...
@@ -1015,7 +1015,7 @@
"description"
:
"Stop taking photos."
,
"category"
:
"Camera"
,
"param1"
:
{
"label"
:
"Rserved"
,
"label"
:
"R
e
served"
,
"default"
:
0
,
"decimalPlaces"
:
0
}
...
...
@@ -1028,7 +1028,7 @@
"description"
:
"Start video capture."
,
"category"
:
"Camera"
,
"param1"
:
{
"label"
:
"Rserved"
,
"label"
:
"R
e
served"
,
"default"
:
0
,
"decimalPlaces"
:
0
}
...
...
@@ -1040,7 +1040,7 @@
"description"
:
"Stop video capture."
,
"category"
:
"Camera"
,
"param1"
:
{
"label"
:
"Rserved"
,
"label"
:
"R
e
served"
,
"default"
:
0
,
"decimalPlaces"
:
0
}
...
...
src/PlanView/SurveyItemEditor.qml
View file @
868adb9e
...
...
@@ -30,15 +30,15 @@ Rectangle {
property
real
_fieldWidth
:
ScreenTools
.
defaultFontPixelWidth
*
10.5
property
var
_cameraList
:
[
qsTr
(
"
Manual Grid (no camera specs)
"
),
qsTr
(
"
Custom Camera Grid
"
)
]
property
var
_vehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
?
QGroundControl
.
multiVehicleManager
.
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
offlineEditingVehicle
property
var
_vehicleCameraList
:
_vehicle
.
staticC
c
ameraList
property
var
_vehicleCameraList
:
_vehicle
.
staticCameraList
readonly
property
int
_gridTypeManual
:
0
readonly
property
int
_gridTypeCustomCamera
:
1
readonly
property
int
_gridTypeCamera
:
2
Component.onCompleted
:
{
for
(
var
i
=
0
;
i
<
_vehicle
.
staticC
c
ameraList
.
length
;
i
++
)
{
_cameraList
.
push
(
_vehicle
.
staticC
c
ameraList
[
i
].
name
)
for
(
var
i
=
0
;
i
<
_vehicle
.
staticCameraList
.
length
;
i
++
)
{
_cameraList
.
push
(
_vehicle
.
staticCameraList
[
i
].
name
)
}
gridTypeCombo
.
model
=
_cameraList
if
(
missionItem
.
manualGrid
.
value
)
{
...
...
src/Vehicle/Vehicle.cc
View file @
868adb9e
...
...
@@ -2584,7 +2584,7 @@ const QVariantList& Vehicle::toolBarIndicators()
return
emptyList
;
}
const
QVariantList
&
Vehicle
::
staticC
c
ameraList
(
void
)
const
const
QVariantList
&
Vehicle
::
staticCameraList
(
void
)
const
{
if
(
_firmwarePlugin
)
{
return
_firmwarePlugin
->
cameraList
(
this
);
...
...
src/Vehicle/Vehicle.h
View file @
868adb9e
...
...
@@ -311,7 +311,7 @@ public:
Q_PROPERTY
(
int
telemetryLNoise
READ
telemetryLNoise
NOTIFY
telemetryLNoiseChanged
)
Q_PROPERTY
(
int
telemetryRNoise
READ
telemetryRNoise
NOTIFY
telemetryRNoiseChanged
)
Q_PROPERTY
(
QVariantList
toolBarIndicators
READ
toolBarIndicators
CONSTANT
)
Q_PROPERTY
(
QVariantList
staticC
cameraList
READ
staticCcameraList
CONSTANT
)
Q_PROPERTY
(
QVariantList
staticC
ameraList
READ
staticCameraList
CONSTANT
)
Q_PROPERTY
(
QGCCameraManager
*
dynamicCameras
READ
dynamicCameras
NOTIFY
dynamicCamerasChanged
)
/// true: Vehicle is flying, false: Vehicle is on ground
...
...
@@ -673,7 +673,7 @@ public:
QString
vehicleImageCompass
()
const
;
const
QVariantList
&
toolBarIndicators
();
const
QVariantList
&
staticC
cameraList
(
void
)
const
;
const
QVariantList
&
staticC
ameraList
(
void
)
const
;
QGCCameraManager
*
dynamicCameras
()
{
return
_cameras
;
}
...
...
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