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
eb16ba20
Commit
eb16ba20
authored
Oct 28, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #909 from ndousse/cmdMessageUpdate
Cmd message update
parents
3e0cd207
15486a23
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
2 deletions
+25
-2
v1.0
libs/mavlink/include/mavlink/v1.0
+1
-1
QGCCommandButton.cc
src/ui/designer/QGCCommandButton.cc
+24
-1
No files found.
v1.0
@
4192f101
Subproject commit
2423e47b4f9169e77f7194b36fa2118e018c94e2
Subproject commit
4192f101c1a8092245794b62a7f5af6e7758714a
src/ui/designer/QGCCommandButton.cc
View file @
eb16ba20
...
...
@@ -62,6 +62,9 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_NAV_TAKEOFF"
,
MAV_CMD_NAV_TAKEOFF
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_NAV_ROI"
,
MAV_CMD_NAV_ROI
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_NAV_PATHPLANNING"
,
MAV_CMD_NAV_PATHPLANNING
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_NAV_SPLINE_WAYPOINT"
,
MAV_CMD_NAV_SPLINE_WAYPOINT
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_NAV_GUIDED_ENABLE"
,
MAV_CMD_NAV_GUIDED_ENABLE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_CONDITION_DELAY"
,
MAV_CMD_CONDITION_DELAY
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_CONDITION_CHANGE_ALT"
,
MAV_CMD_CONDITION_CHANGE_ALT
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_CONDITION_DISTANCE"
,
MAV_CMD_CONDITION_DISTANCE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_CONDITION_YAW"
,
MAV_CMD_CONDITION_YAW
);
...
...
@@ -75,7 +78,23 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_REPEAT_RELAY"
,
MAV_CMD_DO_REPEAT_RELAY
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_SET_SERVO"
,
MAV_CMD_DO_SET_SERVO
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_REPEAT_SERVO"
,
MAV_CMD_DO_REPEAT_SERVO
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_FLIGHTTERMINATION"
,
MAV_CMD_DO_FLIGHTTERMINATION
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_LAND_START"
,
MAV_CMD_DO_LAND_START
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_RALLY_LAND"
,
MAV_CMD_DO_RALLY_LAND
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_GO_AROUND"
,
MAV_CMD_DO_GO_AROUND
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_CONTROL_VIDEO"
,
MAV_CMD_DO_CONTROL_VIDEO
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_SET_ROI"
,
MAV_CMD_DO_SET_ROI
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_DIGICAM_CONFIGURE"
,
MAV_CMD_DO_DIGICAM_CONFIGURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_DIGICAM_CONTROL"
,
MAV_CMD_DO_DIGICAM_CONTROL
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_MOUNT_CONFIGURE"
,
MAV_CMD_DO_MOUNT_CONFIGURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_MOUNT_CONTROL"
,
MAV_CMD_DO_MOUNT_CONTROL
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_SET_CAM_TRIGG_DIST"
,
MAV_CMD_DO_SET_CAM_TRIGG_DIST
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_FENCE_ENABLE"
,
MAV_CMD_DO_FENCE_ENABLE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_PARACHUTE"
,
MAV_CMD_DO_PARACHUTE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_INVERTED_FLIGHT"
,
MAV_CMD_DO_INVERTED_FLIGHT
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_MOUNT_CONTROL_QUAT"
,
MAV_CMD_DO_MOUNT_CONTROL_QUAT
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_GUIDED_MASTER"
,
MAV_CMD_DO_GUIDED_MASTER
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_GUIDED_LIMITS"
,
MAV_CMD_DO_GUIDED_LIMITS
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PREFLIGHT_CALIBRATION"
,
MAV_CMD_PREFLIGHT_CALIBRATION
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS"
,
MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PREFLIGHT_STORAGE"
,
MAV_CMD_PREFLIGHT_STORAGE
);
...
...
@@ -84,7 +103,11 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) :
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_MISSION_START"
,
MAV_CMD_MISSION_START
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_COMPONENT_ARM_DISARM"
,
MAV_CMD_COMPONENT_ARM_DISARM
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_START_RX_PAIR"
,
MAV_CMD_START_RX_PAIR
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_DO_FLIGHTTERMINATION"
,
MAV_CMD_DO_FLIGHTTERMINATION
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_IMAGE_START_CAPTURE"
,
MAV_CMD_IMAGE_START_CAPTURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_IMAGE_STOP_CAPTURE"
,
MAV_CMD_IMAGE_STOP_CAPTURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_VIDEO_START_CAPTURE"
,
MAV_CMD_VIDEO_START_CAPTURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_VIDEO_STOP_CAPTURE"
,
MAV_CMD_VIDEO_STOP_CAPTURE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PANORAMA_CREATE"
,
MAV_CMD_PANORAMA_CREATE
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PAYLOAD_PREPARE_DEPLOY"
,
MAV_CMD_PAYLOAD_PREPARE_DEPLOY
);
ui
->
editCommandComboBox
->
addItem
(
"MAV_CMD_PAYLOAD_CONTROL_DEPLOY"
,
MAV_CMD_PAYLOAD_CONTROL_DEPLOY
);
ui
->
editCommandComboBox
->
setEditable
(
true
);
...
...
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