Support ROS Kinetic

Makefile

@@ -5,7 +5,7 @@ ifeq ($(strip $(FILE_EXISTS)),)
 else
     UNINSTALL_FILES:=$(shell cat install.record)
 endif
- 
+
 
 help:
 	@echo "Local Build"
@@ -58,6 +58,7 @@ source_deb:
 deb:
 	rm -rf dist deb_dist
 	python setup.py --command-packages=stdeb.command bdist_deb
+	cp deb_dist/*.deb .
 
 register:
 	python setup.py register
@@ -74,4 +75,3 @@ clean:  clean_dist
 	-sudo rm -f install.record
 	-sudo rm -rf build
 	-sudo rm -rf yujin_tools.egg-info
-

rosinstalls/indigo/gopher_bootstrap-devel.rosinstall

@@ -19,9 +19,13 @@
 # and gopher simulations.
 - git: { local-name: 'gopher_common',         version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_common.git'}
 
+# The robot site-configuration
+- git: { local-name: 'gopher_siteconf',       version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_siteconf.git'}
+
 # ROSWeb client nodes
 - git: { local-name: 'gopher_jobbroker',      version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_jobbroker.git'}
 - git: { local-name: 'gopher_iot_webclient',  version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_iot_webclient.git'}
+- git: { local-name: 'gopher_webclients',     version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_webclients.git'}
 
 # The robot web application
 - git: { local-name: 'gopher_web_ui',         version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_web_ui.git'}
@@ -30,21 +34,35 @@
 
 # Out gopher behaviours and behaviour trees
 - git: { local-name: 'gopher_crazy_hospital', version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_crazy_hospital.git'}
+- git: { local-name: 'gopher_cns',            version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/gopher_cns.git'}
 # The fundamental behaviour trees modules
 - git: { local-name: 'py_trees_suite',        version: 'devel',        uri: 'https://github.com/yujinrobot/py_trees_suite'}
 
+# Intelligence modules
+- git: { local-name: 'gopher_failure_detector', version: 'devel',      uri: 'https://bitbucket.org/yujinrobot/gopher_failure_detector.git'}
+
 # Ros 2 Rest
-- git: { local-name: 'rostful',               version: 'gopher_hotfix', uri: 'https://github.com/asmodehn/rostful.git'}
+#- git: { local-name: 'rostful',               version: 'gopher-devel', uri: 'https://github.com/asmodehn/rostful.git'}
+- git: { local-name: 'rostful',               version: 'release/0.2-indigo', uri: 'https://github.com/yujinrobot/rostful.git'}
+
 # Only in case of testing before package release
-- git: { local-name: 'catkin_pip',            version: 'devel', uri: 'https://github.com/asmodehn/catkin_pip.git'}
-- git: { local-name: 'pyros_interfaces_ros',  version: 'master', uri: 'https://github.com/asmodehn/pyros-rosinterface.git'}
-- git: { local-name: 'pyros_schemas',         version: 'master', uri: 'https://github.com/asmodehn/pyros-schemas.git'}
-- git: { local-name: 'pyros_msgs',            version: 'master', uri: 'https://github.com/asmodehn/pyros-msgs.git'}
+#- git: { local-name: 'catkin_pip',            version: 'devel', uri: 'https://github.com/asmodehn/catkin_pip.git'}
+#- git: { local-name: 'pyros_interfaces_ros',  version: 'master', uri: 'https://github.com/asmodehn/pyros-rosinterface.git'}
+#- git: { local-name: 'pyros_schemas',         version: 'master', uri: 'https://github.com/yujinrobot/pyros-schemas.git'}
+#- git: { local-name: 'pyros_msgs',            version: 'master', uri: 'https://github.com/yujinrobot/pyros-msgs.git'}
+- git: { local-name: 'catkin_pip',            version: 'release/0.3-indigo', uri: 'https://github.com/yujinrobot/catkin_pip.git'}
+- git: { local-name: 'pyros_interfaces_ros',  version: 'release/0.6-indigo', uri: 'https://github.com/yujinrobot/pyros-rosinterface.git'}
+- git: { local-name: 'pyros_schemas',         version: 'release/0.1.2-indigo', uri: 'https://github.com/yujinrobot/pyros-schemas.git'}
+- git: { local-name: 'pyros_msgs',            version: 'release/0.1.0-indigo', uri: 'https://github.com/yujinrobot/pyros-msgs.git'}
+
 # for python packages, we need the patches from the rosrelease repo, but we should report fixes upstream...
 # And be aware of https://github.com/asmodehn/catkin_pip/issues/106
 # - git: { local-name: 'pyros',                 version: 'release/indigo/pyros', uri: 'https://github.com/asmodehn/pyros-rosrelease.git'}
 # - git: { local-name: 'pyros_config',        version: 'release/indigo/pyros_config', uri: 'https://github.com/asmodehn/pyros-config-rosrelease.git'}
 
+# Robot software messages
+- git: { local-name: 'rs_msgs',               version: 'devel', uri: 'https://bitbucket.org/yujinrobot/rs_msgs.git'}
+
 # Deployment
 - git: { local-name: 'yujin_ansible',     version: 'devel',        uri: 'https://bitbucket.org/yujinrobot/yujin_ansible'}
 
@@ -56,7 +74,7 @@
 # Until https://github.com/ros-infrastructure/rosdoc_lite/pull/70 is in
 - git: { local-name: 'rosdoc_lite',           version: 'master',       uri: 'https://github.com/yujinrobot/rosdoc_lite.git'}
 # Until we've moved off of indigo (our upstream changes are in, but not in indigo release)
-- git: { local-name: 'audio_common',          version: 'volume_fix_branch',       uri: 'https://github.com/yujinrobot/audio_common.git'}
+- git: { local-name: 'audio_common',          version: 'master',       uri: 'https://github.com/yujinrobot/audio_common.git'}
 # until we have fixes for the service unloading problem - https://github.com/ros/diagnostics/issues/50
 - git: { local-name: 'diagnostics',           version: 'handling_unloading_properly', uri: 'https://github.com/yujinrobot/diagnostics.git'}
 

rosinstalls/kinetic.yaml

@@ -0,0 +1,111 @@
+###############################################################################
+# Yujin's Rosinstall Index
+###############################################################################
+#
+# Why
+# ===
+#
+# We have rosinstalls everywhere...easy to forget/lose track of them.
+#
+# Quick Start
+# ===========
+#
+# At it's simplest, this is just a key to a url where a rosinstall can be
+# found. You can then install the sources into a catkin environment.
+#
+# e.g. for the ecl key-value pair
+#
+#     ecl: 'https://raw.github.com/stonier/ecl_core/indigo/ecl.rosinstall'
+#
+# e.g. to download and compile ecl from key-value pair
+#
+#     yujin_init_workspace ~/ecl ecl
+#     cd ~/ecl
+#     yujin_init_build .
+#     yujin_make
+#
+# Mixins
+# ======
+#
+# When you use a key-value pair multiply, combine them in a list to form new workspaces.
+# Downloading and compiling works in the same way.
+#
+# e.g. arm_bootstrap:
+#
+#    arm_bootstrap: [_catkin, _dslam_bootstrap, yaml_cpp, respawn]
+#
+# Adding Index Key-Value Pairs
+# ============================
+# 
+# Just make a pull request and poke Daniel to look at it.
+#
+###############################################################################
+
+# rosinstalls indexed multiply below
+_dslam: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/dslam.rosinstall'
+_dslam_bootstrap: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/dslam_bootstrap.rosinstall'
+_catkin: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/catkin.rosinstall'
+
+# ros core
+catkin: [_catkin]
+ecto-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/ecto-devel.rosinstall'
+ecto-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/ecto-stable.rosinstall'
+yaml_cpp: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/yaml_cpp.rosinstall'
+
+# yujin general
+dslam_desktop: [_dslam, 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/dslam_desktop.rosinstall']
+ecl: [ecl-devel]
+ecl-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/ecl-devel.rosinstall'
+ecl-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/ecl-stable.rosinstall'
+hello: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/hello.rosinstall'
+qt_ros: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/qt_ros.rosinstall'
+respawn: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/respawn.rosinstall'
+system_deb_builder: 'https://bitbucket.org/yujinrobot/system_deb_builder/raw/kinetic/system_deb_builder.rosinstall'
+
+# android
+android_complete: [android_core, android_interactions]
+android_core: 'https://raw.githubusercontent.com/rosjava/rosjava/indigo/android_core.rosinstall'
+android_interactions: 'https://raw.githubusercontent.com/rosjava/rosjava/indigo/android_interactions.rosinstall'
+
+# arm (mostly cleaning robot)
+arm_3rdparty: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/arm_3rdparty.rosinstall'
+arm_bootstrap: [_catkin, _dslam_bootstrap, yaml_cpp, respawn]
+arm_dslam_cubie: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/arm_dslam_cubie.rosinstall'
+pluto: 'https://bitbucket.org/yujinrobot/pluto/raw/hydro-devel/pluto.rosinstall'
+
+# gopher
+gopher-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher-devel.rosinstall'
+gopher-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher-stable.rosinstall'
+gopher_concert-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_concert-devel.rosinstall'
+gopher_concert-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_concert-stable.rosinstall'
+gopher_bootstrap-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_bootstrap-devel.rosinstall'
+gopher_bootstrap-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_bootstrap-stable.rosinstall'
+gopher_desktop-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_desktop-devel.rosinstall'
+gopher_desktop-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_desktop-stable.rosinstall'
+gopher_messages-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_messages-devel.rosinstall'
+gopher_messages-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_messages-stable.rosinstall'
+gopher_navigation-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_navigation-devel.rosinstall'
+gopher_navigation-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_navigation-stable.rosinstall'
+gopher_dslam-devel: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_dslam-devel.rosinstall'
+gopher_dslam-stable: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/gopher_dslam-stable.rosinstall'
+
+# kobuki/turtlebot
+kobuki: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/kobuki.rosinstall'
+kobuki-core: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/kobuki_core.rosinstall'
+turtlebot: 'https://raw.github.com/yujinrobot/yujin_tools/kinetic-devel/rosinstalls/kinetic/turtlebot.rosinstall'
+
+# graveyarding
+ecto: [ecto-devel]
+gopher_dslam: [gopher_dslam-devel]
+gopher_navigation: [gopher_navigation-devel]
+gopher_bootstrap: [gopher_bootstrap-devel]
+gopher: [gopher-devel]
+gopher_concert: [gopher_concert-devel]
+gopher_desktop: [gopher_desktop-devel]
+rocon: 'https://raw.github.com/robotics-in-concert/rocon/release/indigo/rocon.rosinstall'
+rocon_devel: 'https://raw.github.com/robotics-in-concert/rocon/release/indigo/rocon.rosinstall'
+rosjava: 'https://raw.github.com/rosjava/rosjava/indigo/rosjava.rosinstall'
+rosjava_minimal: 'https://raw.github.com/rosjava/rosjava/indigo/rosjava_minimal.rosinstall'
+rosjava_messages: 'https://raw.github.com/rosjava/rosjava/indigo/rosjava_messages.rosinstall'
+world_canvas: 'https://raw.github.com/yujinrobot/yujin_tools/master/rosinstalls/indigo/world_canvas.rosinstall'
+

rosinstalls/kinetic/ecl-devel.rosinstall

@@ -0,0 +1,12 @@
+# The ecl is our open source and fundamental c++ library supporting all of our other software
+# This includes things like timers, statistics, wrappers for Eigen and Sophus, serial devices, etc etc.
+#
+#   Permissions: open to all - these are open source third party forks.
+#
+[
+{'git': {'local-name': 'ecl_tools',        'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_tools.git'}},
+{'git': {'local-name': 'ecl_lite',         'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_lite.git'}},
+{'git': {'local-name': 'ecl_core',         'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_core.git'}},
+{'git': {'local-name': 'ecl_navigation',   'version': 'release/0.60-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_navigation.git'}},
+{'git': {'local-name': 'ecl_manipulation', 'version': 'release/0.60-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_manipulation.git'}},
+]

rosinstalls/kinetic/ecl-stable.rosinstall

@@ -0,0 +1,12 @@
+# The ecl is our open source and fundamental c++ library supporting all of our other software
+# This includes things like timers, statistics, wrappers for Eigen and Sophus, serial devices, etc etc.
+#
+#   Permissions: open to all - these are open source third party forks.
+#
+[
+{'git': {'local-name': 'ecl_tools',        'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_tools.git'}},
+{'git': {'local-name': 'ecl_lite',         'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_lite.git'}},
+{'git': {'local-name': 'ecl_core',         'version': 'release/0.61-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_core.git'}},
+{'git': {'local-name': 'ecl_navigation',   'version': 'release/0.60-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_navigation.git'}},
+{'git': {'local-name': 'ecl_manipulation', 'version': 'release/0.60-indigo-kinetic', 'uri':'https://github.com/stonier/ecl_manipulation.git'}},
+]

rosinstalls/kinetic/ecto-devel.rosinstall

@@ -0,0 +1,13 @@
+# Forks of the open source ecto pipeline
+# 
+#   Permissions: open to all - these are open source third party forks.
+#
+
+# - git: {local-name: ecto,        version: master, uri: 'https://github.com/plasmodic/ecto.git'}
+- git: {local-name: ecto_ros,    version: kinetic-devel, uri: 'https://github.com/yujinrobot/ecto_ros.git'}
+- git: {local-name: ecto_opencv, version: kinetic-devel, uri: 'https://github.com/yujinrobot/ecto_opencv.git'}
+
+- git: {local-name: cv_backports, version: kinetic-devel, uri: 'https://github.com/yujinrobot/cv_backports.git'}
+- git: {local-name: opencv_candidate, version: kinetic-devel, uri: 'https://github.com/yujinrobot/opencv_candidate.git'}
+- git: {local-name: vision_opencv, version: kinetic-devel, uri: 'https://github.com/yujinrobot/vision_opencv.git'}
+- git: {local-name: xdot, version: master, uri: 'https://github.com/jbohren/xdot.git'}

rosinstalls/kinetic/ecto-stable.rosinstall

@@ -0,0 +1,5 @@
+- git: {local-name: ecto,        version: release/0.6-indigo, uri: 'https://github.com/stonier/ecto.git'}
+- git: {local-name: ecto_ros,    version: release/0.4-indigo, uri: 'https://github.com/stonier/ecto_ros.git'}
+- git: {local-name: ecto_opencv, version: release/0.5-indigo, uri: 'https://github.com/stonier/ecto_opencv.git'}
+
+- git: {local-name: cv_backports, version: indigo, uri: 'https://github.com/stonier/cv_backports.git'}

rosinstalls/kinetic/gopher-devel.rosinstall

@@ -0,0 +1,25 @@
+# Description
+# 
+# Software that specifically runs on a gopher robot. This software is not intended and typically unusable on the desktop.
+#
+#   Permissions: open to all gopher developers - primarily so they all have access to gopher_robot (launchers and params)
+#
+
+# Mostly for gopher_robot which contains all launchers and parameterisations for bringing up a gopher robot.
+# Also includes a few other essentials such as the remote gopher utilities.
+- git: { local-name: 'gopher',             version: 'devel', uri: 'https://bitbucket.org/yujinrobot/gopher.git'}
+
+# Calibration software (mostly for the 2d/3d sensors)
+- git: { local-name: 'gopher_calibration', version: 'kinetic-devel',         uri: 'https://bitbucket.org/yujinrobot/gopher_calibration.git'}
+
+# Drivers
+- git: { local-name: 'somanet_driver',     version: 'devel',         uri: 'https://bitbucket.org/yujinrobot/somanet_driver.git'}
+- git: { local-name: 'rplidar_ros',        version: 'devel',         uri: 'https://github.com/yujinrobot/rplidar_ros.git'}
+- git: { local-name: 'rplidar_extras',     version: 'devel',         uri: 'https://github.com/yujinrobot/rplidar_extras.git'}
+- git: { local-name: 'astra_camera',       version: 'filter_library_custom', uri: 'https://github.com/yujinrobot/ros_astra_camera.git'}
+- git: { local-name: 'tim510_ros',         version: 'devel',         uri: 'https://bitbucket.org/yujinrobot/tim510_ros.git'}
+
+# Used to enable retrieval of the 'recommended' firmware version that should be run with this gopher sdk
+- git: { local-name: 'somanet_firmware',   version: 'devel', uri: 'https://bitbucket.org/yujinrobot/somanet_firmware.git'}
+
+

rosinstalls/kinetic/gopher-stable.rosinstall

@@ -0,0 +1,22 @@
+# Description
+#
+# Software that specifically runs on a gopher robot. This software is not intended and typically unusable on the desktop.
+#
+#   Permissions: open to all gopher developers - primarily so they all have access to gopher_robot (launchers and params)
+#
+
+# Mostly for gopher_robot which contains all launchers and parameterisations for bringing up a gopher robot.
+# Also includes a few other essentials such as the remote gopher utilities.
+- git: { local-name: 'gopher',             version: 'release/0.7-indigo',         uri: 'https://bitbucket.org/yujinrobot/gopher.git'}
+
+# Calibration software (mostly for the 2d/3d sensors)
+- git: { local-name: 'gopher_calibration', version: 'release/0.3-indigo',         uri: 'https://bitbucket.org/yujinrobot/gopher_calibration.git'}
+
+# Drivers
+- git: { local-name: 'somanet_driver',     version: 'release/0.3-indigo',         uri: 'https://bitbucket.org/yujinrobot/somanet_driver.git'}
+- git: { local-name: 'rplidar_ros',        version: 'release/1.6-indigo',         uri: 'https://github.com/yujinrobot/rplidar_ros.git'}
+- git: { local-name: 'rplidar_extras',     version: 'release/1.1-indigo',         uri: 'https://github.com/yujinrobot/rplidar_extras.git'}
+- git: { local-name: 'astra_camera',       version: 'filter_library_frozen', uri: 'https://github.com/yujinrobot/ros_astra_camera.git'}
+
+# Used to enable retrieval of the 'recommended' firmware version that should be run with this gopher sdk
+- git: { local-name: 'somanet_firmware',   version: 'devel', uri: 'https://bitbucket.org/yujinrobot/somanet_firmware.git'}