Skip to content

Commit f6ccc9b

Browse files
rafal-goreckiKmakD
andauthored
Rename mecanum pkg dependency (#641)
* Rename mecanum pkg dependenciy * Update docs * Update ROS_API.md Co-authored-by: Dawid Kmak <73443304+KmakD@users.noreply.github.com> --------- Co-authored-by: Dawid Kmak <73443304+KmakD@users.noreply.github.com>
1 parent c578180 commit f6ccc9b

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

ROS_API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Below is information about the physical robot API. For the simulation, topics an
3434
| --- | --- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
3535
||| `battery_driver` | Publishes battery state read from ADC unit. <br/> [*panther_batter/battery_driver_node*](./husarion_ugv_battery/include/husarion_ugv_battery/battery_driver_node.hpp) |
3636
||| `controller_manager` | The Controller Manager performs two main functions. First, it manages controllers and their required interfaces, handling tasks like loading, activating, deactivating, and unloading. Second, it interacts with hardware components, ensuring access to their interfaces. This node manages the: `imu_broadcaster`, `joint_state_broadcaster`, `drive_controller`. <br/> *[controller_manager/controller_manager](https://github.com/ros-controls/ros2_control/blob/master/controller_manager)* |
37-
||| `drive_controller` | Manages mobile robots with a differential or mecanum drive depending on the configuration. It converts velocity commands for the robot body into wheel commands for the base. It also calculates odometry from hardware feedback and shares it. <br/> *[diff_drive_controller/diff_drive_controller](https://github.com/ros-controls/ros2_controllers/tree/master/diff_drive_controller) or [mecanum_drive_controller/mecanum_drive_controller](https://github.com/husarion/husarion_controllers/tree/main/mecanum_drive_controller)* |
37+
||| `drive_controller` | Manages mobile robots with a differential or mecanum drive depending on the configuration. It converts velocity commands for the robot body into wheel commands for the base. It also calculates odometry from hardware feedback and shares it. <br/> *[diff_drive_controller/diff_drive_controller](https://github.com/ros-controls/ros2_controllers/tree/master/diff_drive_controller) or [husarion_mecanum_drive_controller/husarion_mecanum_drive_controller](https://github.com/husarion/husarion_controllers/tree/jazzy/husarion_mecanum_drive_controller)* |
3838
||| `ekf_filter` | The Extended Kalman Filter node is designed to fuse odometry data from various sources, including wheel encoders, IMU, and GPS. <br/> *[robot_localization/ekf_filter](https://github.com/cra-ros-pkg/robot_localization)* |
3939
||| `gps` | Node responsible for parsing NMEA strings and publishing standard ROS NavSat message types. <br/> *[nmea_navsat_driver/nmea_navsat_driver](https://github.com/ros-drivers/nmea_navsat_driver/tree/ros2/src/libnmea_navsat_driver)* |
4040
||| `gz_bridge` | Convert and transmit data between ROS and Gazebo <br/> *[ros_gz_bridge/parameter_bridge](https://github.com/gazebosim/ros_gz/tree/ros2/ros_gz_bridge)* |

husarion_ugv/hardware_deps.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
husarion_controllers:
1111
type: git
1212
url: https://github.com/husarion/husarion_controllers
13-
version: 9916ab4e087930b3ff947efec321ab9f8df531c5
13+
version: 2b2b37a1579ae3968693a368ca7a7aaa351a41f4
1414
husarion_components_description:
1515
type: git
1616
url: https://github.com/husarion/husarion_components_description.git

husarion_ugv/simulation_deps.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
husarion_controllers:
1111
type: git
1212
url: https://github.com/husarion/husarion_controllers
13-
version: 9916ab4e087930b3ff947efec321ab9f8df531c5
13+
version: 2b2b37a1579ae3968693a368ca7a7aaa351a41f4
1414
husarion_gz_worlds:
1515
type: git
1616
url: https://github.com/husarion/husarion_gz_worlds.git

husarion_ugv_controller/CONFIGURATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Changing Velocity Smoothing Parameters
44

5-
The default drive controller is based on [diff_drive_controller](https://control.ros.org/master/doc/ros2_controllers/diff_drive_controller/doc/userdoc.html) from [ros2 control](https://control.ros.org/master/index.html) or [mecanum_drive_controller](https://github.com/husarion/husarion_controllers/tree/main/mecanum_drive_controller). This controller can be customized, among others: by modifying the robot's dynamic parameters (e.g. smooth the speed or limit the robot's speed and acceleration). Its parameters can be found in the [husarion_ugv_controller](https://github.com/husarion/husarion_ugv_ros/tree/ros2-devel/husarion_ugv_controller/config). By default, these values correspond to the upper limits of the robot's velocities and accelerations.
5+
The default drive controller is based on [diff_drive_controller](https://control.ros.org/master/doc/ros2_controllers/diff_drive_controller/doc/userdoc.html) from [ros2 control](https://control.ros.org/master/index.html) or [husarion_mecanum_drive_controller](https://github.com/husarion/husarion_controllers/tree/jazzy/husarion_mecanum_drive_controller). This controller can be customized, among others: by modifying the robot's dynamic parameters (e.g. smooth the speed or limit the robot's speed and acceleration). Its parameters can be found in the [husarion_ugv_controller](https://github.com/husarion/husarion_ugv_ros/tree/ros2-devel/husarion_ugv_controller/config). By default, these values correspond to the upper limits of the robot's velocities and accelerations.
66

77
## Changing Wheel Type
88

husarion_ugv_controller/config/WH02_controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
joint_state_broadcaster:
77
type: joint_state_broadcaster/JointStateBroadcaster
88
drive_controller:
9-
type: mecanum_drive_controller/MecanumDriveController
9+
type: husarion_mecanum_drive_controller/MecanumDriveController
1010
imu_broadcaster:
1111
type: imu_sensor_broadcaster/IMUSensorBroadcaster
1212
twist_mux_controller:

husarion_ugv_controller/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
<exec_depend>controller_manager</exec_depend>
2020
<exec_depend>diff_drive_controller</exec_depend>
21+
<exec_depend>husarion_mecanum_drive_controller</exec_depend>
2122
<exec_depend>husarion_ugv_description</exec_depend>
2223
<exec_depend condition="$HUSARION_ROS_BUILD_TYPE == hardware">husarion_ugv_hardware_interfaces</exec_depend>
2324
<exec_depend>husarion_ugv_utils</exec_depend>
2425
<exec_depend>imu_sensor_broadcaster</exec_depend>
2526
<exec_depend>joint_state_broadcaster</exec_depend>
2627
<exec_depend>launch</exec_depend>
2728
<exec_depend>launch_ros</exec_depend>
28-
<exec_depend>mecanum_drive_controller</exec_depend>
2929
<exec_depend>nav2_common</exec_depend>
3030
<exec_depend>robot_state_publisher</exec_depend>
3131
<exec_depend>twist_mux_controller</exec_depend>

0 commit comments

Comments
 (0)