From 5469237604c180d117ea5c8bdce93e63f10686a9 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 21 Oct 2022 19:05:38 +0900 Subject: [PATCH 1/3] add missing import in smach_to_mail --- jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py b/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py index 47619b04f1..17da309778 100755 --- a/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py +++ b/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py @@ -6,6 +6,7 @@ import base64 import cv2 import datetime +import os import pickle import rospy import sys From 334dfdebcf9629a0dbb3f1c9dfe820c2a4cade9c Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 21 Oct 2022 20:04:33 +0900 Subject: [PATCH 2/3] add finish-success and finish-failure in smach_to_mail --- jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py b/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py index 47619b04f1..9783c5915b 100755 --- a/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py +++ b/jsk_robot_common/jsk_robot_startup/scripts/smach_to_mail.py @@ -143,7 +143,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)) From 3cdbda0669e62e340af8c60796e1625bf5171f95 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Sat, 22 Oct 2022 18:19:46 +0900 Subject: [PATCH 3/3] update jsk_fetch.rosinstall.indigo --- jsk_fetch_robot/jsk_fetch.rosinstall.indigo | 57 +++++++++++++-------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/jsk_fetch_robot/jsk_fetch.rosinstall.indigo b/jsk_fetch_robot/jsk_fetch.rosinstall.indigo index bae0cdd09b..189d65d616 100644 --- a/jsk_fetch_robot/jsk_fetch.rosinstall.indigo +++ b/jsk_fetch_robot/jsk_fetch.rosinstall.indigo @@ -4,29 +4,32 @@ - git: local-name: PR2/app_manager uri: https://github.com/PR2/app_manager.git - version: 1.1.0 -# For fetch to use twitter + version: kinetic-devel - git: - local-name: furushchev/image_pipeline - uri: https://github.com/furushchev/image_pipeline.git - version: develop -# To send lifelog data to musca + local-name: RobotWebTools/rosbridge_suite + uri: https://github.com/RobotWebTools/rosbridge_suite.git + version: 0.11.9 - git: - local-name: strands-project/mongodb_store - uri: https://github.com/strands-project/mongodb_store.git - version: 0.4.4 -# to install jsk_robot_startup/lifelog/common_logger.launch -# remove after current master is released + local-name: RoboticMaterials/FA-I-sensor + uri: https://github.com/RoboticMaterials/FA-I-sensor.git +- git: + local-name: fetchrobotics/fetch_ros + uri: https://github.com/fetchrobotics/fetch_ros.git + version: indigo-devel - git: - local-name: jsk-ros-pkg/jsk_robot - uri: https://github.com/jsk-ros-pkg/jsk_robot.git + local-name: fetchrobotics/robot_controllers + uri: https://github.com/fetchrobotics/robot_controllers.git + version: indigo-devel +- git: + local-name: jsk-ros-pkg/jsk_3rdparty + uri: https://github.com/jsk-ros-pkg/jsk_3rdparty.git version: master # to pass build of jsk_robot -# remove after 2.2.10 is released +# remove after 2.2.11 is released - git: local-name: jsk-ros-pkg/jsk_common uri: https://github.com/jsk-ros-pkg/jsk_common.git - version: 2.2.10 + version: 799fd309c1519801fcb3a37c9094814004d78594 # to avoid volume 0 problem # remove after 0.3.14 (https://github.com/jsk-ros-pkg/jsk_pr2eus/commit/41183fe3401d742bbec0edd13b67cb909a6968bd) is released - git: @@ -39,7 +42,12 @@ - git: local-name: jsk-ros-pkg/jsk_demos uri: https://github.com/jsk-ros-pkg/jsk_demos.git - version: 810acc7 + version: 7c429715d0adf12c5dd34459ceb4b0a5b11dec6c +# need to build from source because of nodelet version +- git: + local-name: jsk-ros-pkg/jsk_recognition + uri: https://github.com/jsk-ros-pkg/jsk_recognition.git + version: acb7e7dc5b549f8663dec403abdb80cbac36edf1 # jsk_topic_tools requires nodelet gte 1.9.11 # remove after 1.9.11 is released by apt - git: @@ -51,20 +59,20 @@ - git: local-name: ros-drivers/audio_common uri: https://github.com/ros-drivers/audio_common.git - version: 0.3.3 + version: master # to install nodelet_plugins.xml # remove after 1.3.10 is released by apt - git: local-name: ros-perception/slam_gmapping uri: https://github.com/ros-perception/slam_gmapping.git version: 1.3.10 -# indigo is already EOL and 2.1.13 is never released. +# indigo is already EOL and 2.1.15 is never released. # set the same version as https://github.com/jsk-ros-pkg/jsk_robot/blob/master/.travis.rosinstall.indigo#L7-L11 -# change to 2.1.14 when it is released. +# change to 2.1.15 when it is released. - git: local-name: jsk-ros-pkg/jsk_3rdparty uri: https://github.com/jsk-ros-pkg/jsk_3rdparty.git - version: 82e897dcbdcd6aa0cbd126fa122d4dbdc9df67c9 + version: ffbd7b0592d7dd2f830f185636a1dd1695d8cb44 # Use joy/joy_remap.py - git: local-name: ros-drivers/joystick_drivers @@ -103,3 +111,12 @@ local-name: fetchrobotics/fetch_open_auto_dock uri: https://github.com/fetchrobotics/fetch_open_auto_dock.git version: 0.1.2 +# indigo is already EOL and visualization_msgs is never released +- 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 +- git: + local-name: locusrobotics/catkin_virtualenv + uri: https://github.com/locusrobotics/catkin_virtualenv.git + version: 0.5.0