Merge pull request mavlink#6017 from DonLakeFlyer/NewROI

Update to new mavlink ROI commands
sfnana · Jan 15, 2018 · 67b428f · 67b428f
2 parents 8e16b26 + f830ce5
commit 67b428f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 8 deletions.
diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0
diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
@@ -290,7 +290,7 @@ QList<MAV_CMD> PX4FirmwarePlugin::supportedMissionCommands(void)
          << MAV_CMD_DO_SET_SERVO
          << MAV_CMD_DO_CHANGE_SPEED
          << MAV_CMD_DO_LAND_START
-         << MAV_CMD_DO_SET_ROI
+         << MAV_CMD_DO_SET_ROI_LOCATION << MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET << MAV_CMD_DO_SET_ROI_NONE
          << MAV_CMD_DO_MOUNT_CONFIGURE
          << MAV_CMD_DO_MOUNT_CONTROL
          << MAV_CMD_SET_CAMERA_MODE

diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json
@@ -624,6 +624,52 @@
                 "default":          0
             }
         },
+        {
+            "id":                   195,
+            "rawName":              "MAV_CMD_DO_SET_ROI_LOCATION",
+            "friendlyName":         "Region of interest (ROI)" ,
+            "description":          "Sets the region of interest for cameras.",
+            "specifiesCoordinate":  true,
+            "standaloneCoordinate": true,
+            "friendlyEdit":         true,
+            "category":             "Camera"
+        },
+        {
+            "id":                   196,
+            "rawName":              "MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET",
+            "friendlyName":         "ROI to next waypoint" ,
+            "description":          "Sets the region of interest to point towards the next waypoint with optional offsets.",
+            "specifiesCoordinate":  false,
+            "friendlyEdit":         true,
+            "category":             "Camera",
+            "param5": {
+                "label":            "Pitch offset",
+                "default":          0,
+                "units":            "deg",
+                "decimalPlaces":    0
+            },
+            "param6": {
+                "label":            "Roll offset",
+                "default":          0,
+                "units":            "deg",
+                "decimalPlaces":    0
+            },
+            "param7": {
+                "label":            "Yaw offset",
+                "default":          0,
+                "units":            "deg",
+                "decimalPlaces":    0
+            }
+        },
+        {
+            "id":                   197,
+            "rawName":              "MAV_CMD_DO_SET_ROI_NONE",
+            "friendlyName":         "Cancel ROI" ,
+            "description":          "Cancels the region of interest.",
+            "specifiesCoordinate":  false,
+            "friendlyEdit":         true,
+            "category":             "Camera"
+        },
         { "id": 200, "rawName": "MAV_CMD_DO_CONTROL_VIDEO", "friendlyName": "Control video" },
         {
             "id":                   201,

diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
@@ -914,12 +914,8 @@ void MockLink::_respondWithAutopilotVersion(void)
                                             (uint8_t *)&customVersion,       // os_custom_version,
                                             0,                               // vendor_id,
                                             0,                               // product_id,
-                                            0                                // uid
-#if defined(NO_ARDUPILOT_DIALECT)
-                                            //-- Once the MAVLink module is updated, this should show up. In the mean time, it's disabled.
-                                            ,0                               // uid2
-#endif
-                                            );
+                                            0,                               // uid
+                                            0);                              // uid2
     respondWithMavlinkMessage(msg);
 }
+16 −13		ASLUAV/ASLUAV.h
+1 −1		ASLUAV/version.h
+54 −15		ardupilotmega/ardupilotmega.h
+263 −0		ardupilotmega/mavlink_msg_aoa_ssa.h
+438 −0		ardupilotmega/mavlink_msg_deepstall.h
+121 −0		ardupilotmega/testsuite.h
+1 −1		ardupilotmega/version.h
+16 −13		autoquad/autoquad.h
+1 −1		autoquad/version.h
+71 −21		common/common.h
+42 −16		common/mavlink_msg_autopilot_version.h
+5 −5		common/mavlink_msg_distance_sensor.h
+5 −5		common/mavlink_msg_gps2_rtk.h
+5 −5		common/mavlink_msg_gps_rtk.h
+10 −10		common/mavlink_msg_hil_state.h
+10 −10		common/mavlink_msg_hil_state_quaternion.h
+10 −10		common/mavlink_msg_mission_item.h
+10 −10		common/mavlink_msg_mission_item_int.h
+10 −10		common/mavlink_msg_nav_controller_output.h
+330 −0		common/mavlink_msg_obstacle_distance.h
+5 −5		common/mavlink_msg_param_ext_ack.h
+5 −5		common/mavlink_msg_param_ext_set.h
+5 −5		common/mavlink_msg_param_ext_value.h
+10 −10		common/mavlink_msg_position_target_global_int.h
+10 −10		common/mavlink_msg_set_attitude_target.h
+5 −5		common/mavlink_msg_set_gps_global_origin.h
+10 −10		common/mavlink_msg_set_position_target_global_int.h
+65 −4		common/testsuite.h
+1 −1		common/version.h
+16 −13		matrixpilot/matrixpilot.h
+1 −1		matrixpilot/version.h
+97 −7		message_definitions/ardupilotmega.xml
+167 −60		message_definitions/common.xml
+1 −1		message_definitions/minimal.xml
+1 −1		minimal/minimal.h
+1 −1		minimal/version.h
+16 −13		slugs/slugs.h
+1 −1		slugs/version.h
+3 −3		standard/standard.h
+1 −1		standard/version.h
+1 −1		test/version.h
+1 −1		uAvionix/version.h