Merge remote-tracking branch 'origin/main' into ahcorde/rgba_camera_s…

…ensor
RobotLocomotion · Jan 24, 2024 · 4798fda · 4798fda
2 parents cd08b79 + 9e975d9
commit 4798fda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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",
 )
diff --git 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])