Merge remote-tracking branch 'origin/master' into develop/fetch

Author: knorth55

jsk_fetch_robot/jsk_fetch.rosinstall.melodic

@@ -1,13 +1,15 @@
 # This is rosinstall file for melodic PC inside fetch.
 # $ ln -s $(rospack find jsk_fetch_startup)/../jsk_fetch.rosinstall.$ROS_DISTRO $HOME/ros/$ROS_DISTRO/src/.rosinstall
+
+# This PR fix bug in multimaster connection mode.
+# https://github.com/PR2/app_manager/pull/50
+# In order to run multiple app_managers in one master, we need this PR
+# https://github.com/PR2/app_manager/pull/54
 - git:
     local-name: PR2/app_manager
     uri: https://github.com/knorth55/app_manager.git
     version: fetch15
-- git:
-    local-name: RobotWebTools/rosbridge_suite
-    uri: https://github.com/RobotWebTools/rosbridge_suite.git
-    version: 0.11.9
+# we need this for proximity sensors
 - git:
     local-name: RoboticMaterials/FA-I-sensor
     uri: https://github.com/RoboticMaterials/FA-I-sensor.git
@@ -25,10 +27,22 @@
     local-name: fetchrobotics/robot_controllers
     uri: https://github.com/fetchrobotics/robot_controllers.git
     version: melodic-devel
+# We need this PR to text dialogflow interface.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/291
+# We need this PR to support key from dialogflow.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/292
+# We need this PR to enable google chat.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/323
+# We need this PR to enable voicevox.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/337
+# We need this PR to publish multichannel from respeaker.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/350
+# We need this PR to post tweets with image.
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/375
 - git:
     local-name: jsk-ros-pkg/jsk_3rdparty
     uri: https://github.com/jsk-ros-pkg/jsk_3rdparty.git
-    version: develop/fetch 
+    version: develop/fetch
 # we need to use the development branch until PR below are merged.
 #  - https://github.com/jsk-ros-pkg/jsk_common/pull/1719
 #  - https://github.com/jsk-ros-pkg/jsk_common/pull/1746
@@ -46,36 +60,28 @@
     local-name: jsk-ros-pkg/jsk_demos
     uri: https://github.com/jsk-ros-pkg/jsk_demos.git
     version: master
+# we need to use the development branch until the next release.
 - git:
     local-name: jsk-ros-pkg/jsk_pr2eus
     uri: https://github.com/jsk-ros-pkg/jsk_pr2eus.git
     version: master
-# we need to use the development branch until PR below are merged.
-#  - https://github.com/jsk-ros-pkg/jsk_recognition/pull/2642
-# Restore jsk-ros-pkg/jsk_recognition master branch when the PRs are merged.
-# - git:
-#     local-name: jsk-ros-pkg/jsk_recognition
-#     uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
-#     version: master
+# we need to use the development branch until the next release.
 - git:
     local-name: jsk-ros-pkg/jsk_recognition
-    uri: https://github.com/sktometometo/jsk_recognition.git
-    version: develop/fetch
+    uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
+    version: master
 # we need to use the development branch (fetch15 branch in knorth55's fork)
 # until it is merged to master
 - git:
     local-name: jsk-ros-pkg/jsk_robot
     uri: https://github.com/jsk-ros-pkg/jsk_robot.git
     version: develop/fetch
+# we need to use the development branch until the next release.
 - git:
     local-name: knorth55/app_manager_utils
     uri: https://github.com/knorth55/app_manager_utils
     version: master
-- git:
-    local-name: mikeferguson/robot_calibration
-    uri: https://github.com/mikeferguson/robot_calibration.git
-    version: 0.5.5
-# https://github.com/ros-drivers/audio_common/pull/173
+# we need to use the development branch until the next release.
 - git:
     local-name: ros-drivers/audio_common
     uri: https://github.com/ros-drivers/audio_common.git
@@ -88,14 +94,6 @@
     local-name: ros-drivers/rosserial
     uri: https://github.com/708yamaguchi/rosserial.git
     version: fetch15
-- git:
-    local-name: ros-perception/slam_gmapping
-    uri: https://github.com/ros-perception/slam_gmapping.git
-    version: 1.3.10
-- tar:
-    local-name: ros/common_msgs/visualization_msgs
-    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/kinetic/visualization_msgs/1.12.7-0.tar.gz
-    version: common_msgs-release-release-kinetic-visualization_msgs-1.12.7-0
 # Following error is output at about 25Hz for about 4 hours
 # [ERROR] [1653231340.987602] [/replicator_node:rosout]: [mongorestore] - E11000 duplicate key error collection: jsk_robot_lifelog.fetch1075 index: _id_ dup key: { : ObjectId('6243af9651998d10f0c7787c') }
 # Errors are now output once per hour
@@ -152,35 +150,38 @@
     local-name: jsk-ros-pkg/coral_usb_ros
     uri: https://github.com/jsk-ros-pkg/coral_usb_ros.git
     version: master
-# headless smach_viewer
-# https://github.com/ros-visualization/executive_smach_visualization/pull/46
+# we need melodic-devel branch for headless visualization
 - git:
     local-name: ros-visualization/executive_smach_visualization
-    uri: https://github.com/knorth55/executive_smach_visualization.git
-    version: develop/fetch
-# eus10 and roseus_resume
+    uri: https://github.com/ros-visualization/executive_smach_visualization.git
+    version: melodic-devel
+# we need this for eus10 and roseus_resume
 - git:
     local-name: euslisp/Euslisp
     uri: https://github.com/Affonso-Gui/EusLisp.git
     version: eus10
+# we need this for eus10 and roseus_resume
 - git:
     local-name: jsk-ros-pkg/jsk_roseus
     uri: https://github.com/knorth55/jsk_roseus.git
     version: fetch15
+# we need this for eus10 and roseus_resume
 - git:
     local-name: euslisp/jskeus
     uri: https://github.com/euslisp/jskeus.git
     version: master
+# we need this for eus10 and roseus_resume
 - git:
     local-name: jsk-ros-pkg/geneus
     uri: https://github.com/jsk-ros-pkg/geneus.git
     version: master
+# we need this for eus10 and roseus_resume
 - git:
-    local-name: roseus_resume
+    local-name: Affonso-Gui/roseus_resume
     uri: https://github.com/Affonso-Gui/roseus_resume.git
     version: eus10
-# roseus_bt
+# we need this for roseus_bt
 - git:
-    local-name: BehaviorTree.ROS
+    local-name: BehaviorTree/BehaviorTree.ROS
     uri: https://github.com/BehaviorTree/BehaviorTree.ROS
     version: master

jsk_pr2_robot/jsk_pr2_startup/jsk_pr2.rosinstall

@@ -1,64 +1,174 @@
+# This PR fix bug in multimaster connection mode.
+# https://github.com/PR2/app_manager/pull/50
+# In order to run multiple app_managers in one master, we need this PR
+# https://github.com/PR2/app_manager/pull/54
 - git:
     local-name: PR2/app_manager
-    uri: https://github.com/furushchev/app_manager
-    version: indigo
-- git:
-    local-name: PR2/pr2_navigation
-    uri: https://github.com/PR2/pr2_navigation.git
-    version: hydro-devel
+    uri: https://github.com/knorth55/app_manager
+    version: pr1040
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: PR2/pr2_common
+    uri: https://github.com/PR2/pr2_common.git
+    version: melodic-devel
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: PR2/pr2_controllers
+    uri: https://github.com/PR2/pr2_controllers.git
+    version: melodic-devel
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: PR2/pr2_self_test
+    uri: https://github.com/PR2/pr2_self_test.git
+    version: kinetic-devel
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: RobotWebTools/rosbridge_suite
+    uri: https://github.com/RobotWebTools/rosbridge_suite.git
+    version: 0.11.9
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: code-iai/iai_common_msgs
+    uri: https://github.com/code-iai/iai_common_msgs.git
+    version: 0.0.6
+# we need to install from source because pr2 is indigo
 - git:
     local-name: code-iai/snap_map_icp
     uri: https://github.com/code-iai/snap_map_icp.git
-    version: hydro-devel
-- git:
-    local-name: iai_common_msgs
-    uri: https://github.com/code-iai/iai_common_msgs.git
-    version: 0.0.6
+    version: da2d590c5b4923c0776d990bb3ba9ec8e9122ecf
+# we need this PR to publish multi channel audio
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/350
+# we need this PR to tweets with image
+# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/375
 - git:
     local-name: jsk-ros-pkg/jsk_3rdparty
     uri: https://github.com/jsk-ros-pkg/jsk_3rdparty.git
-    version: 2.1.6
+    version: develop/pr2
+# we need this PR for audible warning.
+# https://github.com/jsk-ros-pkg/jsk_common/pull/1607
 - git:
     local-name: jsk-ros-pkg/jsk_common
     uri: https://github.com/jsk-ros-pkg/jsk_common.git
-    version: 2.2.6
-- git:
-    local-name: jsk-ros-pkg/jsk_common_msgs
-    uri: https://github.com/jsk-ros-pkg/jsk_common_msgs.git
-    version: 4.3.1
-- git:
-    local-name: jsk-ros-pkg/jsk_control
-    uri: https://github.com/jsk-ros-pkg/jsk_control.git
-    version: 0.1.14
+    version: develop/pr2
+# we need this PR for update map
+# https://github.com/jsk-ros-pkg/jsk_demos/pull/1277
+# we need this PR to fix bug in rwt_teleop
+# https://github.com/jsk-ros-pkg/jsk_demos/pull/1368
+# we need this PR for gazebo empty world
+# https://github.com/jsk-ros-pkg/jsk_demos/pull/1371
+# we need this PR for fridge demo with smach notification
+# https://github.com/jsk-ros-pkg/jsk_demos/pull/1374
 - git:
     local-name: jsk-ros-pkg/jsk_demos
-    uri: https://github.com/jsk-ros-pkg/jsk_demos.git
-    version: 0.0.4
-- git:
-    local-name: jsk-ros-pkg/jsk_model_tools
-    uri: https://github.com/jsk-ros-pkg/jsk_model_tools.git
-    version: 0.3.5
+    uri: https://github.com/knorth55/jsk_demos.git
+    version: develop/pr2
+# we need to install from source because pr2 is indigo
 - git:
     local-name: jsk-ros-pkg/jsk_planning
     uri: https://github.com/jsk-ros-pkg/jsk_planning.git
-    version: 0.1.10
+    version: master
+# we need this for eus10 and roseus_resume
+- git:
+    local-name: euslisp/Euslisp
+    uri: https://github.com/Affonso-Gui/EusLisp.git
+    version: eus10
+# we need this for eus10 and roseus_resume
+- git:
+    local-name: euslisp/jskeus
+    uri: https://github.com/euslisp/jskeus.git
+    version: master
+# we need this for eus10 and roseus_resume
+- git:
+    local-name: jsk-ros-pkg/geneus
+    uri: https://github.com/jsk-ros-pkg/geneus.git
+    version: master
+# we need this for eus10 and roseus_resume
 - git:
     local-name: jsk-ros-pkg/jsk_pr2eus
-    uri: https://github.com/jsk-ros-pkg/jsk_pr2eus.git
-    version: 0.3.13
+    uri: https://github.com/knorth55/jsk_pr2eus.git
+    version: pr1040
+# we need to install from source because pr2 is indigo
 - git:
     local-name: jsk-ros-pkg/jsk_recognition
     uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
-    version: 1.2.4
+    version: master
+# we need development branch for pr2
+- git:
+    local-name: jsk-ros-pkg/jsk_robot
+    uri: https://github.com/jsk-ros-pkg/jsk_robot.git
+    version: develop/pr2
+# we need this for eus10 and roseus_resume
 - git:
     local-name: jsk-ros-pkg/jsk_roseus
-    uri: https://github.com/jsk-ros-pkg/jsk_roseus.git
-    version: 1.6.3
+    uri: https://github.com/knorth55/jsk_roseus.git
+    version: pr1040
+# we need this for eus10 and roseus_resume
+- git:
+    local-name: Affonso-Gui/roseus_resume
+    uri: https://github.com/Affonso-Gui/roseus_resume.git
+    version: eus10
+# we need to install from source because pr2 is indigo
 - git:
     local-name: jsk-ros-pkg/jsk_smart_apps
     uri: https://github.com/jsk-ros-pkg/jsk_smart_apps.git
-    version: 0.0.2
+    version: 57a355333a4f001d219003b52ecefdb0ff5b0acf
+# we need to install from source because pr2 is indigo
 - git:
     local-name: jsk-ros-pkg/jsk_visualization
     uri: https://github.com/jsk-ros-pkg/jsk_visualization.git
-    version: 2.1.3
+    version: master
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: knorth55/app_manager_utils
+    uri: https://github.com/knorth55/app_manager_utils
+    version: master
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: locusrobotics/catkin_virtualenv
+    uri: https://github.com/locusrobotics/catkin_virtualenv.git
+    version: 0.5.2
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: ros-drivers/audio_common
+    uri: https://github.com/ros-drivers/audio_common.git
+    version: master
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: ros-drivers/prosilica_driver
+    uri: https://github.com/ros-drivers/prosilica_driver
+    version: 3991df761ce0400b9993166c09a2529ef684cdc1
+# we need to install from source because pr2 is indigo
+- tar:
+    local-name: ros/common_msgs/visualization_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/kinetic/visualization_msgs/1.12.7-0.tar.gz
+    version: common_msgs-release-release-kinetic-visualization_msgs-1.12.7-0
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: ros-visualization/interactive_markers
+    uri: https://github.com/ros-visualization/interactive_markers.git
+    version: noetic-devel
+# we need to install from source because pr2 is indigo
+- tar:
+    local-name: ros/ros_comm/message_filters
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/message_filters/1.12.14-0.tar.gz
+    version: ros_comm-release-release-kinetic-message_filters-1.12.14-0
+# we need to install from source because pr2 is indigo
+- tar:
+    local-name: ros/ros_comm/topic_tools
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/kinetic/topic_tools/1.12.14-0.tar.gz
+    version: ros_comm-release-release-kinetic-topic_tools-1.12.14-0
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: strands-project/mongodb_store
+    uri: https://github.com/strands-project/mongodb_store
+    version: 0.4.5
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: tork-a/roswww
+    uri: https://github.com/tork-a/roswww.git
+    version: develop
+# we need to install from source because pr2 is indigo
+- git:
+    local-name: tork-a/visualization_rwt
+    uri: https://github.com/tork-a/visualization_rwt.git
+    version: kinetic-devel

jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py

@@ -168,7 +168,7 @@ def _status_cb(self, msg):
             self.smach_state_list[caller_id].append(status_dict)
 
         # If we received END/FINISH status, send email, etc...
-        if status_str in ["END", "FINISH"]:
+        if status_str in ["END", "FINISH", "FINISH-SUCCESS", "FINISH-FAILURE"]:
             if (caller_id not in self.smach_state_list) or self.smach_state_list[caller_id] is None:
                 rospy.logwarn("received END node, but we did not find START node")
                 rospy.logwarn("failed to send {}".format(status_dict))