* upstream/3.1: (51 commits)
  Added doxygen compliant updates to the code. Refere to the previous commit for more information
  Mobile-OSDK comm support and bug fix release. For specific changes refer to the release notes  https://developer.dji.com/onboard-sdk/documentation/appendix/releaseNotes.html. Please see the documentation link to take a look at the new Mobile-OSDK communication  https://developer.dji.com/onboard-sdk/documentation/quick-start/index.html. This release is tagged 3.1.8
  Added Documentation related changes for cleanup release of the Core library. For specific changes please refer to the Release notes at: https://developer.dji.com/onboard-sdk/documentation/appendix/releaseNotes.html. Refer to previous commit for more information
  Cleanup release of the Core library. For specific changes please refer to the Release notes at: https://developer.dji.com/onboard-sdk/documentation/appendix/releaseNotes.html. Improvements in example programs in ROS - Draw a Circle example now uses Movement Control Open Protocol implementation(Position based closed loop control). Latest Documentation avaialble at the DJI Developer website at: https://developer.dji.com/onboard-sdk/documentation/quick-start/index.html. In order to be in sync with the main OnboardSDK library, this release will be tagged 3.1.7
  deprecate documentation and refer to DJI Developer Website
  0.1.9
  fix bd bug
  0.1.8
  update new lib
  Update README.md
  Update README.md
  Update README.md
  Update DJI_Type.h
  Update dji_drone.h
  Update dji_sdk_node_main.cpp
  Update A3GPS.msg
  Update A3RTK.msg
  Update README.md
  Update README.md
  Update sdk_osx.launch
  ...

Conflicts:
	.gitignore
	dji_sdk/include/dji_sdk/dji_sdk_node.h
	dji_sdk/launch/sdk_manifold.launch
	dji_sdk/src/modules/dji_sdk_node_main.cpp
	dji_sdk/src/modules/dji_sdk_node_services.cpp

* commit 'bfb66345150f3ff2822e1a83639d7bba589d7b11': (39 commits)
  Hotfix release: Updated movement control services + flight status enums updated for M100
  amended the miss of spelling [attitude_conrol] to [attitude_control]
  Hotfix Release for 3.2.1 Movement control, Vertical Position control bug. User is not required to add home point altitude to Z desired position after this fix. Z desired position may be entered directly. Home point altitude is handled internally
  ENH: update python code: add activation/datatransfer API
  fix deadlock with memory mutex
  OSDK 3.2.1: Fix for a bug in M600/pro FW package 1.0.0.80's veriosning
  OSDK 3.2.1 commit - versioning system overhauled. See Release Notes on the website.
  fix for an IF-expression that is always true
  Please refer to the previous commit for release 3.2. GTest set to OFF by default.
  Major release 3.2.0! This release brings support for LiDAR collision avoidance and LiDAR Mapping. A number of bugfixes and improvements are also added. See Release notes for more!
  Hotfix 3.1.9.1 for A3 firmware 1.5.0.0. Fixes for SDK Version query and Obtain Control RC mode errors
  Merge conflicts resolved. Please refer to the previous commit for details of this release
  Sync with onboardSDK Core library commit which has improvements. Refer to OnboardSDK documentation for details at https://developer.dji.com/onboard-sdk/documentation/quick-start/index.html. No new features added
  Carried over changes that were in Core lib into ROS core lib. No change in functionality, manually tested
  Changes in ROS only - handle string inputs and some clean up
  Non blocking thread limited to single queue. Added comments
  Updated ROS with latest Core API. Change to DJI_Hardriver to implement default Getdevicestatus
  Replaced type.h and Local, Global and Hotpoint now works
  Added missing headers for the ROS files
  Fixed bug realted to Mobile Protocol
  ...

Conflicts:
	dji_sdk/launch/sdk_manifold.launch

# Conflicts:
#	dji_sdk/CMakeLists.txt
#	dji_sdk/action/GlobalPositionNavigation.action
#	dji_sdk/action/LocalPositionNavigation.action
#	dji_sdk/include/dji_sdk/dji_drone.h
#	dji_sdk/include/dji_sdk/dji_sdk.h
#	dji_sdk/include/dji_sdk/dji_sdk_node.h
#	dji_sdk/launch/sdk_manifold.launch
#	dji_sdk/src/dji_sdk_node.cpp
#	dji_sdk/src/modules/dji_sdk_node_actions.cpp
#	dji_sdk/src/modules/dji_sdk_node_main.cpp
#	dji_sdk_demo/src/client.cpp
#	dji_sdk_dji2mav/src/dji2mav_bringup.cpp
#	dji_sdk_web_groundstation/src/map_nav_srv.cpp
#	package.xml

This reverts commit 378db43.

…publisher

Bb 875/add relative position publisher

Bb 876/sdk package name

This reverts commit 98fe559.

copied cmake-modules to workspace AM-332/package

Am 332/package

fix: mark headers for installation

Update package

fix for onboard control status issue

Finding UserConfig.txt in installation dir

…_0_1

* commit 'ab451ce6022f6f4d0ee3ddf54f4213c42f2ed6f1': (48 commits)
  docs:update readme.md about 4.0.1
  docs:add note about waypoint mission just adapt to M210V2
  feat:add event and state push in waypointV2
  fixed:fixed main camera don't take photo when doing waypointV2
  fix:fix compile issue
  fix:remote useless log
  fix:fix camera_stream_node
  docs:add printf information for waypointV2
  fixed:change hotpoint's is_clockwise and yaw_mode
  fixed:deleted stereo_vision_depth_perception_node
  docs:update readme and notes in dji_vehicle_node
  fixed:fixed vtkXOpenGLRenderWindow problem of roslaunch dji_vehicle_node by ssh
  feat:add waypointV2 interfaces and sample
  fixed:fixed failture of getting m300 params in stereo_vision_depth_perception_node
  fixed:fixed failture of getting image in camera_stream_node
  fixed:fixed core dump of  stereo flitered disparity
  fixed:fix dji_vehicle_node's build problem without opencv
  fixed:replace aircraft type
  feat:add mission interfaces and samples
  fixed:fix problems of variable defination in stereo_vision_object_depth_perception
  ...

# Conflicts:
#	src/dji_osdk_ros_obsoleted/modules/dji_sdk_node.cpp

rename of package
BREAKING CHANGE: dji_sdk now dji_osdk_ros AM-604/4_0_1

4.0.1001 means ours is 001 AM-604/4_0_1

…d-SDK-ROS into AM-604/4_0_1 AM-604/4_0_1

Updated to DJI 4.0.1

no longer we do resize

…-stream

…y/Onboard-SDK-ROS into AM-682/camera-stream AM-682/camera-stream