Merge branch 'dev' into 'master'

M300

See merge request vvaradharajan/mist_ws!1

.gitignore

@@ -0,0 +1,51 @@
+devel/
+logs/
+build/
+bin/
+lib/
+msg_gen/
+srv_gen/
+msg/*Action.msg
+msg/*ActionFeedback.msg
+msg/*ActionGoal.msg
+msg/*ActionResult.msg
+msg/*Feedback.msg
+msg/*Goal.msg
+msg/*Result.msg
+msg/_*.py
+build_isolated/
+devel_isolated/
+
+# Generated by dynamic reconfigure
+*.cfgc
+/cfg/cpp/
+/cfg/*.py
+
+# Ignore generated docs
+*.dox
+*.wikidoc
+
+# eclipse stuff
+.project
+.cproject
+
+# qcreator stuff
+CMakeLists.txt.user
+
+srv/_*.py
+*.pcd
+*.pyc
+qtcreator-*
+*.user
+
+/planning/cfg
+/planning/docs
+/planning/src
+
+*~
+
+# Emacs
+.#*
+
+# Catkin custom files
+CATKIN_IGNORE

README.md

@@ -1,34 +1,55 @@
-# gbplanner_ws
+### Clone the package
-This workspace includes relevant packages to run with the [gbplanner_ros](https://github.com/unr-arl/gbplanner_ros).
+```
-
+git clone http://git.mistlab.ca/vvaradharajan/mist_ws.git
-The workspace has been tested in Ubuntu 16.04 and ROS Kinetic. If you are using Ubuntu18 and ROS Melodic (or Gazebo 9), please use the branch [melodic](https://github.com/unr-arl/gbplanner_ws/tree/melodic).
+```
-
-Note: Only packages_https_no_sim.rosinstall is upto date.
-
-For the explorer use packages_https_no_sim.rosinstall at wstool merge, i.e. `wstool merge packages_https_no_sim.rosinstall`
-For the minion use packages_https_minion.rosinstall at wstool merge, i.e. `wstool merge packages_https_minion.rosinstall`
 
 # Dependencies to install
 ```
 sudo apt-get install python-catkin-tools python-wstool ros-kinetic-cmake-modules protobuf-compiler autoconf ros-kinetic-mavros* ros-kinetic-tf* \
-ros-kinetic-rviz ros-kinetic-cv-bridge ros-kinetic-image-geometry ros-kinetic-pcl-* ros-kinetic-octomap* ros-kinetic-image-proc
+ros-kinetic-rviz ros-kinetic-cv-bridge ros-kinetic-image-geometry ros-kinetic-pcl-* ros-kinetic-octomap* ros-kinetic-image-proc \
+ros-kinetic-nmea-comms ffmpeg libusb-1.0-0-dev libsdl2-dev
 ```
+# Setting up the bat0 phy interface
+PLEASE SET THIS UP BEFORE ATTEMPTING TO USE BATMAN NODE.
+Please refer to batman-README.md
 
-### Clone the package
+# DJI M300
-```
+This workspace includes relevant packages to run [rosbuzz](https://github.com/MISTLab/ROSBuzz) with the [DJI OSDK](https://github.com/dji-sdk/Onboard-SDK-ROS) on the M300 drones.
-git clone http://git.mistlab.ca/vvaradharajan/gbplanner_ws.git
+
-```
+The workspace has been tested in Ubuntu 16.04 and ROS Kinetic.
 
 ### Setup the workspace
 ```
-cd gbplanner_ws
+cd mist_ws
 wstool init
-wstool merge packages_https_no_sim.rosinstall
+wstool merge packages_https_m300_batman.rosinstall
 wstool update
 ```
 
+### Troubleshooting
+* In case of permission error, make sure to follow the [permission](https://github.com/dji-sdk/Onboard-SDK-ROS#3permission) section to have read/write access for the uart communication.
+
+
+# Spiri
+
+### Setup the workspace
+```
+cd mist_ws
+wstool init
+wstool merge packages_https_spiri_batman.rosinstall
+wstool update
+```
+
+# DJI M100
+
+# Khepera IV
+
+# Spot
+
+
 ### Build the whole workspace
 ```
-catkin config -DCMAKE_BUILD_TYPE=Release -DSIM=1 -DKIN=1
+catkin config -DCMAKE_BUILD_TYPE=Release -DSIM=0 -DKIN=1
 catkin build
 ````
+

packages_https_m300_batman.rosinstall

@@ -0,0 +1,22 @@
+#Control
+- git:
+    local-name: src/control/rosbuzz
+    uri: http://git.mistlab.ca/dasto/ROSBuzz.git
+    version: dev
+
+- git:
+    local-name: src/control/osdk-ros
+    uri: https://github.com/dji-sdk/Onboard-SDK-ROS.git
+    version: 4.1
+
+- git:
+    local-name: src/control/mist_launch
+    uri: http://git.mistlab.ca/ulrich/mist_launch.git
+    version: master
+
+#Communication
+- git:
+    local-name: src/comm/batman_dwq
+    uri: http://git.mistlab.ca/dwenqiang/poly_ws.git
+    version: sendto
+

packages_https_spiri_batman.rosinstall

@@ -3,10 +3,6 @@
     local-name: src/control/rosbuzz
     uri: http://git.mistlab.ca/dasto/ROSBuzz.git
     version: dev
-- git:
-    local-name: src/control/kh4_adapter
-    uri: http://git.mistlab.ca/vvaradharajan/kh4_adapter.git
-
 
 #Communication
 - git: