Merge remote-tracking branch 'origin/ros2-docking' into ros2-docking-…

…lifecycle-node
husarion · Dec 6, 2024 · 5c76315 · 5c76315
2 parents 040f41f + 0e70171
commit 5c76315
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/panther/panther_hardware.repos b/panther/panther_hardware.repos
@@ -14,7 +14,7 @@ repositories:
   ros_components_description:
     type: git
     url: https://github.com/husarion/ros_components_description.git
-    version: 0813c3eebec410c2635b1db3ab87b094c38658c6
+    version: 517350ac672b7383c3377e63244353a104096c39
   ros2_controllers: # Caused by two error: 1. https://github.com/ros-controls/ros2_controllers/pull/1104 2. There is no nice way to change `sensor_name` imu_bradcaster param when spawning multiple robots -> ros2_control refer only to single imu entity
     type: git
     url: https://github.com/husarion/ros2_controllers/

diff --git a/panther/panther_simulation.repos b/panther/panther_simulation.repos
@@ -14,7 +14,7 @@ repositories:
   ros_components_description:
     type: git
     url: https://github.com/husarion/ros_components_description.git
-    version: 0813c3eebec410c2635b1db3ab87b094c38658c6
+    version: 517350ac672b7383c3377e63244353a104096c39
   ros2_controllers: # Caused by two error: 1. https://github.com/ros-controls/ros2_controllers/pull/1104 2. There is no nice way to change `sensor_name` imu_bradcaster param when spawning multiple robots -> ros2_control refer only to single imu entity
     type: git
     url: https://github.com/husarion/ros2_controllers/

diff --git a/panther_docking/README.md b/panther_docking/README.md
@@ -31,7 +31,7 @@ The package contains a `PantherChargingDock` plugin for the [opennav_docking](ht
 
 - `fixed_frame` [*string*, default: **odom**]: A fixed frame id of a robot.
 - `<dock_name>.type` [*string*, default: **panther_charging_dock**]: It checks if this dock with name `dock_name` is a type of  `panther_charging_dock`.
-- `<dock_name>.frame` [*string*, default: **main_wibotic_receiver_requested_pose_link** ]: Then look for transformation between `fixed_frame` and `<dock_name>.frame`  to publish `dock_pose`. A frame id of a wireless transmitter.
+- `<dock_name>.frame` [*string*, default: **main_wibotic_transmitter_link** ]: Then look for transformation between `fixed_frame` and `<dock_name>.frame`  to publish `dock_pose`. A frame id of a wireless transmitter.
 
 ### PantherChargingDock