Merge branch 'master' into fetch15

Author: knorth55

.travis.rosinstall

@@ -1 +1,8 @@
-# see .travis.rosinstall.ROS_DISTRO
+# see also .travis.rosinstall.ROS_DISTRO
+# waiting for jsk_maps release
+# add keepout map for entire eng2 building
+# https://github.com/jsk-ros-pkg/jsk_demos/pull/1300
+- git:
+    local-name: jsk-ros-pkg/jsk_demos
+    uri: https://github.com/jsk-ros-pkg/jsk_demos.git
+    version: master

.travis.rosinstall.kinetic

@@ -21,10 +21,6 @@
 - git:
    uri: https://github.com/ros-naoqi/nao_interaction.git
    local-name: ros-naoqi/nao_interaction
-- git:
-   uri: https://github.com/tork-a/jsk_demos-release.git
-   local-name: jsk_maps
-   version: release/kinetic/jsk_maps
 # jsk_fetch_startup requires fetch_ros with following PRs.
 # https://github.com/fetchrobotics/fetch_ros/pull/144
 # https://github.com/fetchrobotics/fetch_ros/pull/146

.travis.rosinstall.melodic

@@ -19,10 +19,6 @@
    uri: https://github.com/ros-planning/moveit_robots.git
    local-name: ros-planning/moveit_robots
    version: kinetic-devel
-- git: # wait until releasing
-   uri: https://github.com/tork-a/jsk_demos-release.git
-   local-name: jsk_maps
-   version: release/kinetic/jsk_maps
 - git: # wait for melodic release https://github.com/ros-naoqi/pepper_robot/issues/50
    uri: https://github.com/ros-naoqi/pepper_robot.git
    local-name: pepper_robot
@@ -40,3 +36,9 @@
     local-name: fetchrobotics/fetch_ros
     uri: https://github.com/fetchrobotics/fetch_ros.git
     version: ba4bafdb802e474487d1e0d893aa25c9535dc55f
+# for drc_task_common in jsk_demos
+# jsk_control is not released in melodic
+- tar:
+    local-name: jsk_control/jsk_ik_server
+    uri: https://github.com/tork-a/jsk_control-release/archive/release/kinetic/jsk_ik_server/0.1.14-0.tar.gz
+    version: jsk_control-release-release-kinetic-jsk_ik_server-0.1.14-0

jsk_robot_common/jsk_robot_startup/README.md

@@ -116,5 +116,4 @@ The topic specified in the argument is subscribed.
 
 This launch file provides a set of nodes for safe teleoperation common to mobile robots. Robot-specific nodes such as `/joy`, `/teleop` or `/cable_warning` must be included in the teleop launch file for each robot, such as [safe_teleop.xml for PR2](https://github.com/jsk-ros-pkg/jsk_robot/blob/master/jsk_pr2_robot/jsk_pr2_startup/jsk_pr2_move_base/safe_teleop.xml) or [safe_teleop.xml for fetch](https://github.com/jsk-ros-pkg/jsk_robot/blob/master/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_teleop.xml).
 
-![JSK teleop_base system](https://user-images.githubusercontent.com/19769486/88371623-608d0380-cdcf-11ea-859e-f3eccac120b3.png)
-
+![JSK teleop_base system](images/jsk_safe_teleop_system.png)