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
64cda494
Commit
64cda494
authored
Jun 01, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3434 from thedevleon/enable_roi_and_mount_for_px4
Enable ROI and MOUNT support for PX4
parents
c29de21a
c52af71b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
5 deletions
+42
-5
PX4FirmwarePlugin.cc
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+3
-0
MavCmdInfoCommon.json
src/MissionManager/MavCmdInfoCommon.json
+39
-5
No files found.
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
View file @
64cda494
...
...
@@ -233,6 +233,9 @@ QList<MAV_CMD> PX4FirmwarePlugin::supportedMissionCommands(void)
<<
MAV_CMD_DO_SET_CAM_TRIGG_DIST
<<
MAV_CMD_DO_SET_SERVO
<<
MAV_CMD_DO_CHANGE_SPEED
<<
MAV_CMD_DO_SET_ROI
<<
MAV_CMD_DO_MOUNT_CONFIGURE
<<
MAV_CMD_DO_MOUNT_CONTROL
<<
MAV_CMD_NAV_PATHPLANNING
;
return
list
;
...
...
src/MissionManager/MavCmdInfoCommon.json
View file @
64cda494
...
...
@@ -661,13 +661,47 @@
"decimalPlaces"
:
0
}
},
{
"id"
:
204
,
"rawName"
:
"MAV_CMD_DO_MOUNT_CONFIGURE", "friendlyName"
:
"Mount configure"
},
{
"id"
:
204
,
"rawName"
:
"MAV_CMD_DO_MOUNT_CONFIGURE"
,
"friendlyName"
:
"Configure Mount"
,
"description"
:
"Configure the vehicle mount (e.g. gimbal)."
,
"category"
:
"Advanced"
,
"param1"
:
{
"label"
:
"Mode:"
,
"default"
:
0
,
"decimalPlaces"
:
0
,
"enumStrings"
:
"Retract,Neutral,Mavlink Targetting,RC Targetting,GPS Point"
,
"enumValues"
:
"0,1,2,3,4"
},
"param2"
:
{
"label"
:
"Stabilize Roll:"
,
"default"
:
0
,
"decimalPlaces"
:
0
,
"enumStrings"
:
"No,Yes"
,
"enumValues"
:
"0,1"
},
"param3"
:
{
"label"
:
"Stabilize Pitch:"
,
"default"
:
0
,
"decimalPlaces"
:
0
,
"enumStrings"
:
"No,Yes"
,
"enumValues"
:
"0,1"
},
"param4"
:
{
"label"
:
"Stabilize Yaw:"
,
"default"
:
0
,
"decimalPlaces"
:
0
,
"enumStrings"
:
"No,Yes"
,
"enumValues"
:
"0,1"
}
},
{
"id"
:
205
,
"rawName"
:
"MAV_CMD_DO_MOUNT_CONTROL"
,
"friendlyName"
:
"
Mount config
"
,
"description"
:
"Control
antenna mount or camera
."
,
"category"
:
"
Camera
"
,
"friendlyName"
:
"
Control Mount
"
,
"description"
:
"Control
the vehicle mount (e.g. gimbal)
."
,
"category"
:
"
Advanced
"
,
"param1"
:
{
"label"
:
"Lat/Pitch:"
,
"default"
:
0
,
...
...
@@ -687,7 +721,7 @@
"label"
:
"Mode:"
,
"default"
:
0
,
"decimalPlaces"
:
0
,
"enumStrings"
:
"Retract,Neutral,Mavlink Target
ting,RC Targetting,
GPS Point"
,
"enumStrings"
:
"Retract,Neutral,Mavlink Target
ing,RC Targeting,
GPS Point"
,
"enumValues"
:
"0,1,2,3,4"
}
},
...
...
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