From 7b2f3ee3635c1b4ede70bd21a2aa4bfe9e6300a9 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Tue, 9 Jan 2024 19:58:46 +0900 Subject: [PATCH 1/4] jsk_pr2eus is released on noetic --- .travis.rosinstall.noetic | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.rosinstall.noetic b/.travis.rosinstall.noetic index 844302aec..e1bee1b6a 100644 --- a/.travis.rosinstall.noetic +++ b/.travis.rosinstall.noetic @@ -76,11 +76,6 @@ local-name: catkin_virtualenv uri: https://github.com/locusrobotics/catkin_virtualenv.git version: 24ab7433e3e98a3ad4c7f3b29960026d858b73bf -# jsk_pr2eus is not released yet -- git: - local-name: jsk_pr2eus - uri: https://github.com/jsk-ros-pkg/jsk_pr2eus - version: master # https://github.com/astuff/ml_classifiers/pull/6 - git: local-name: ml_classifiers From 9d24fca435e5db4e0d1b7691c51ea41b9351d40b Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Tue, 9 Jan 2024 19:59:00 +0900 Subject: [PATCH 2/4] Add fc.rosinstall.noetic --- fc.rosinstall.noetic | 103 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 fc.rosinstall.noetic diff --git a/fc.rosinstall.noetic b/fc.rosinstall.noetic new file mode 100644 index 000000000..5dfa4ee91 --- /dev/null +++ b/fc.rosinstall.noetic @@ -0,0 +1,103 @@ +- git: + local-name: jsk-ros-pkg/jsk_common + uri: https://github.com/jsk-ros-pkg/jsk_common.git + version: master +- git: + local-name: jsk-ros-pkg/jsk_demos + uri: https://github.com/jsk-ros-pkg/jsk_demos.git + version: master +- git: + local-name: jsk-ros-pkg/jsk_recognition + uri: https://github.com/jsk-ros-pkg/jsk_recognition.git + version: master +- git: + local-name: jsk-ros-pkg/jsk_robot + uri: https://github.com/jsk-ros-pkg/jsk_robot.git + version: master +- git: + local-name: FOR_ASTRA/openni2_camera + uri: https://github.com/ros-drivers/openni2_camera.git + version: indigo-devel +- git: + local-name: start-jsk/jsk_apc + uri: https://github.com/start-jsk/jsk_apc.git + version: master +- git: + local-name: RethinkRobotics/baxter_common + uri: https://github.com/knorth55/baxter_common.git + version: jsk_apc +- git: + local-name: RethinkRobotics/baxter_interface + uri: https://github.com/wkentaro/baxter_interface.git + version: jsk_apc +- git: + local-name: RethinkRobotics/baxter_examples + uri: https://github.com/RethinkRobotics/baxter_examples.git + version: v1.2.0 +- git: + local-name: RethinkRobotics/baxter_tools + uri: https://github.com/RethinkRobotics/baxter_tools.git + version: v1.2.0 +- git: + local-name: RethinkRobotics/baxter_simulator + # https://github.com/RethinkRobotics/baxter_simulator/pull/132 + uri: https://github.com/k-okada/baxter_simulator.git + version: fix_noetic +- git: + local-name: FOR_GRIPPER_V5/dynamixel_motor + uri: https://github.com/pazeshun/dynamixel_motor.git + version: gripper-v6-devel +- git: + local-name: FA-I-sensor/force_proximity_ros + uri: https://github.com/RoboticMaterials/FA-I-sensor.git + version: master +- git: + local-name: ros-planning/moveit_robots + uri: https://github.com/ros-planning/moveit_robots.git + version: kinetic-devel +- git: + local-name: turtlebot/turtlebot_description + uri: https://github.com/turtlebot-release/turtlebot-release.git + version: release/kinetic/turtlebot_description +- git: + local-name: yujinrobot/kobuki_description + uri: https://github.com/yujinrobot-release/kobuki-release.git + version: release/kinetic/kobuki_description +- git: + local-name: turtlebot/create_description + uri: https://github.com/turtlebot-release/turtlebot_create-release.git + version: release/kinetic/create_description +- tar: + local-name: jsk_planning/pddl_planner + uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz + version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1 +- tar: + local-name: jsk_planning/pddl_msgs + uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz + version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1 +# waiting for release in noetic +- git: + local-name: ros-drivers/openni_camera + uri: https://github.com/ros-drivers/openni_camera.git + version: indigo-devel +- git: + local-name: PR2/pr2_gripper_sensor + uri: https://github.com/PR2/pr2_gripper_sensor.git + version: hydro-devel +# https://github.com/astuff/ml_classifiers/pull/6 +- git: + local-name: ml_classifiers + uri: https://github.com/pazeshun/ml_classifiers.git + version: add-noetic-test +# find_package(collada_urdf) failed due to wrong collada_urdfConfig.cmake +# - https://github.com/ros/collada_urdf/issues/43 +# - https://github.com/ros/collada_urdf/pull/44 +- git: + local-name: collada_urdf + uri: https://github.com/werner291/collada_urdf.git + version: patch-1 +# https://github.com/jsk-ros-pkg/jsk_visualization/pull/882, https://github.com/jsk-ros-pkg/jsk_visualization/pull/867 +- git: + local-name: jsk_visualization + uri: https://github.com/pazeshun/jsk_visualization.git + version: fix-for-noetic From d521321ece34dedde408e9fc5ea41b7f5b0092c2 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Thu, 11 Jan 2024 21:33:49 +0900 Subject: [PATCH 3/4] Remove released packages from .rosinstall.noetic & add missing prefixes to local-names --- .travis.rosinstall.noetic | 17 ----------------- fc.rosinstall.noetic | 23 +++-------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/.travis.rosinstall.noetic b/.travis.rosinstall.noetic index e1bee1b6a..7de364b22 100644 --- a/.travis.rosinstall.noetic +++ b/.travis.rosinstall.noetic @@ -12,14 +12,6 @@ local-name: baxter_tools uri: https://github.com/RethinkRobotics-release/baxter_tools-release/archive/release/indigo/baxter_tools/1.2.0-0.tar.gz version: baxter_tools-release-release-indigo-baxter_tools-1.2.0-0 -- tar: - local-name: jsk_planning/pddl_planner - uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz - version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1 -- tar: - local-name: jsk_planning/pddl_msgs - uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz - version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1 - tar: local-name: jsk_demos/jsk_demo_common uri: https://github.com/tork-a/jsk_demos-release/archive/release/indigo/jsk_demo_common/0.0.4-0.tar.gz @@ -62,15 +54,6 @@ local-name: dynamixel_motor uri: https://github.com/pazeshun/dynamixel_motor.git version: gripper-v6-devel -# waiting for release in noetic -- git: - local-name: openni_camera - uri: https://github.com/ros-drivers/openni_camera.git - version: indigo-devel -- git: - local-name: pr2_gripper_sensor - uri: https://github.com/PR2/pr2_gripper_sensor.git - version: hydro-devel # https://github.com/locusrobotics/catkin_virtualenv/pull/85 - git: local-name: catkin_virtualenv diff --git a/fc.rosinstall.noetic b/fc.rosinstall.noetic index 5dfa4ee91..fdcb94a26 100644 --- a/fc.rosinstall.noetic +++ b/fc.rosinstall.noetic @@ -67,37 +67,20 @@ local-name: turtlebot/create_description uri: https://github.com/turtlebot-release/turtlebot_create-release.git version: release/kinetic/create_description -- tar: - local-name: jsk_planning/pddl_planner - uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz - version: jsk_planning-release-release-melodic-pddl_planner-0.1.12-1 -- tar: - local-name: jsk_planning/pddl_msgs - uri: https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz - version: jsk_planning-release-release-melodic-pddl_msgs-0.1.12-1 -# waiting for release in noetic -- git: - local-name: ros-drivers/openni_camera - uri: https://github.com/ros-drivers/openni_camera.git - version: indigo-devel -- git: - local-name: PR2/pr2_gripper_sensor - uri: https://github.com/PR2/pr2_gripper_sensor.git - version: hydro-devel # https://github.com/astuff/ml_classifiers/pull/6 - git: - local-name: ml_classifiers + local-name: astuff/ml_classifiers uri: https://github.com/pazeshun/ml_classifiers.git version: add-noetic-test # find_package(collada_urdf) failed due to wrong collada_urdfConfig.cmake # - https://github.com/ros/collada_urdf/issues/43 # - https://github.com/ros/collada_urdf/pull/44 - git: - local-name: collada_urdf + local-name: ros/collada_urdf uri: https://github.com/werner291/collada_urdf.git version: patch-1 # https://github.com/jsk-ros-pkg/jsk_visualization/pull/882, https://github.com/jsk-ros-pkg/jsk_visualization/pull/867 - git: - local-name: jsk_visualization + local-name: jsk-ros-pkg/jsk_visualization uri: https://github.com/pazeshun/jsk_visualization.git version: fix-for-noetic From 4506a2cea5ce9600a4da11ddecfb8d29b721000d Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Fri, 12 Jan 2024 14:14:24 +0900 Subject: [PATCH 4/4] Avoid image format error on noetic PC when playing rosbag of melodic robots --- fc.rosinstall.noetic | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fc.rosinstall.noetic b/fc.rosinstall.noetic index fdcb94a26..e28bb041b 100644 --- a/fc.rosinstall.noetic +++ b/fc.rosinstall.noetic @@ -84,3 +84,8 @@ local-name: jsk-ros-pkg/jsk_visualization uri: https://github.com/pazeshun/jsk_visualization.git version: fix-for-noetic +# Wait https://github.com/ros-perception/image_transport_plugins/pull/64 to be released +- git: + local-name: ros-perception/image_transport_plugins + uri: https://github.com/ros-perception/image_transport_plugins.git + version: noetic-devel