Browse Source

Merge pull request #3434 from thedevleon/enable_roi_and_mount_for_px4

Enable ROI and MOUNT support for PX4
QGC4.4
Don Gagne 9 years ago
parent
commit
64cda494da
  1. 3
      src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
  2. 44
      src/MissionManager/MavCmdInfoCommon.json

3
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc

@ -233,6 +233,9 @@ QList<MAV_CMD> PX4FirmwarePlugin::supportedMissionCommands(void)
<< MAV_CMD_DO_SET_CAM_TRIGG_DIST << MAV_CMD_DO_SET_CAM_TRIGG_DIST
<< MAV_CMD_DO_SET_SERVO << MAV_CMD_DO_SET_SERVO
<< MAV_CMD_DO_CHANGE_SPEED << MAV_CMD_DO_CHANGE_SPEED
<< MAV_CMD_DO_SET_ROI
<< MAV_CMD_DO_MOUNT_CONFIGURE
<< MAV_CMD_DO_MOUNT_CONTROL
<< MAV_CMD_NAV_PATHPLANNING; << MAV_CMD_NAV_PATHPLANNING;
return list; return list;

44
src/MissionManager/MavCmdInfoCommon.json

@ -661,13 +661,47 @@
"decimalPlaces": 0 "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, "id": 205,
"rawName": "MAV_CMD_DO_MOUNT_CONTROL", "rawName": "MAV_CMD_DO_MOUNT_CONTROL",
"friendlyName": "Mount config", "friendlyName": "Control Mount",
"description": "Control antenna mount or camera.", "description": "Control the vehicle mount (e.g. gimbal).",
"category": "Camera", "category": "Advanced",
"param1": { "param1": {
"label": "Lat/Pitch:", "label": "Lat/Pitch:",
"default": 0, "default": 0,
@ -687,7 +721,7 @@
"label": "Mode:", "label": "Mode:",
"default": 0, "default": 0,
"decimalPlaces": 0, "decimalPlaces": 0,
"enumStrings": "Retract,Neutral,Mavlink Targetting,RC Targetting, GPS Point", "enumStrings": "Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point",
"enumValues": "0,1,2,3,4" "enumValues": "0,1,2,3,4"
} }
}, },

Loading…
Cancel
Save