From 69743c5ad90240cee11922bfd472c1451bc72da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Tue, 23 Jan 2024 23:54:31 +0100 Subject: [PATCH 1/2] Fixed deprecation: multirobot.py (#329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- drake_ros_examples/examples/multirobot/multirobot.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drake_ros_examples/examples/multirobot/multirobot.py b/drake_ros_examples/examples/multirobot/multirobot.py index 2b2c6e5b..58322771 100755 --- a/drake_ros_examples/examples/multirobot/multirobot.py +++ b/drake_ros_examples/examples/multirobot/multirobot.py @@ -95,9 +95,11 @@ def main(): for y in range(NUM_COLS): # Load the model from the file and give it a name based on its X # and Y coordinates in the array - models[x].append(parser.AddModelFromFile( - model_file_path, - model_name + str(x) + '_' + str(y))) + (iiwa,) = parser.AddModels(model_file_path) + models[x].append(iiwa) + plant.RenameModelInstance(model_instance=iiwa, + name=model_name + str(x) + '_' + str(y)) + # Weld the robot to world so it doesn't fall through floor base_frame = plant.GetFrameByName("base", models[x][y]) From 9e975d90c5f0af119c2317bfe7d6a9256fbbcd44 Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Tue, 23 Jan 2024 14:56:35 -0800 Subject: [PATCH 2/2] [drake] Upgrade to v1.25.0 --- drake_ros/drake.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drake_ros/drake.bzl b/drake_ros/drake.bzl index 171aaaa7..46eb49c8 100644 --- a/drake_ros/drake.bzl +++ b/drake_ros/drake.bzl @@ -1,5 +1,5 @@ DRAKE_SUGGESTED_VERSION = struct( - url = "https://github.com/RobotLocomotion/drake/archive/refs/tags/v1.24.0.tar.gz", # noqa - sha256 = "35874238af2c0305525a6f32c28692e3fdbed0581055b0b491669f7534cf6cae", # noqa, - strip_prefix = "drake-1.24.0", + url = "https://github.com/RobotLocomotion/drake/archive/refs/tags/v1.25.0.tar.gz", # noqa + sha256 = "ebebd812c4f3644cf2fefbbf72835060cbd26e8896a0959ad0fcd2f3428a0547", # noqa, + strip_prefix = "drake-1.25.0", )