Skip to content

Commit

Permalink
Additional needed modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmrad committed Jan 10, 2025
1 parent 3dd34e9 commit dddd2af
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 24 deletions.
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ If the bug fix you need isn't in a released version or If you want to build this
If you plan on simulating the robot with Gazebo, make sure to pull the additional simulation packages.
If you're on ROS 2 Humble, run
```
vcs import src --skip-existing --input src/ros2_kortex/simulation.humble.repos
vcs import src --skip-existing --input src/ros2_kortex/simulation.jazzy.repos
```

otherwise
Expand All @@ -125,13 +125,11 @@ If the bug fix you need isn't in a released version or If you want to build this
```

If you plan on using MoveIt, you must make sure that you have it already [installed](https://moveit.ros.org/install-moveit2/binary/) either from binaries or by building it from source.


If you plan on simulating the Gen3 7Dof robot mounted on the Husky mobile robot from clearpath, make sure to pull the additional related packages. On ROS2 Humble, run
```
vcs import src --skip-existing --input src/ros2_kortex/clearpath.repos
```
4. Follow the instructions to install [Gazebo Harmonic](https://gazebosim.org/docs/harmonic/getstarted/)

4. Install dependencies, compile, and source the workspace:
5. Install dependencies, compile, and source the workspace:
```
rosdep install --ignore-src --from-paths src -y -r
colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release
Expand All @@ -141,7 +139,7 @@ If the bug fix you need isn't in a released version or If you want to build this
```
colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --parallel-workers 3
```
5. Source the previously built workspace using the following command:
6. Source the previously built workspace using the following command:
```
echo 'source ~/workspace/ros2_kortex_ws/install/setup.bash' >> ~/.bashrc
```
Expand Down Expand Up @@ -216,7 +214,7 @@ You can specify the following arguments if you wish to change your arm configura

* `robot_type`: Your robot model. Default value (and only one) is `gen3`.

* `gripper` : Gripper to use. Possible values for the Gen3 are either `robotiq_2f_85`, `robotiq_2f_140` or `""`. Default is `robotiq_2f_85`. An empty string will not initialise any gripper.
* `gripper` : Gripper to use. Possible values for the Gen3 are either `robotiq_2f_85`, `robotiq_2f_140` or `""`. Default is `""`. An empty string will not initialise any gripper.

* `gripper_joint_name` : Name of the controlled joint of the gripper attached to the arm. Default value is `robotiq_85_left_knuckle_joint`.

Expand Down Expand Up @@ -326,7 +324,7 @@ ros2 launch kortex_bringup kortex_sim_control.launch.py \
* `description_file` : URDF/XACRO description file with the robot. Default value is `kinova.urdf.xacro`.
* `prefix` : Prefix of the joint names, useful for multi-robot setup. If changed, then also joint names in the controllers' configuration have to be updated. Default value is `""` (none).
* `use_sim_time` : Use simulated clock. Default value is `true`.
* `gripper` : Gripper to use. Possible values for the Gen3 are either `robotiq_2f_85`, `robotiq_2f_140` or `""`. Default is `robotiq_2f_85`. An empty string will not initialise any gripper.
* `gripper` : Gripper to use. Possible values for the Gen3 are: `robotiq_2f_85`, `robotiq_2f_140`, `""` and `gen3_lite_2f`. Default is `robotiq_2f_85`. An empty string will not initialise any gripper.

#### MoveIt 2

Expand Down
2 changes: 1 addition & 1 deletion kortex_bringup/launch/gen3_lite.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def generate_launch_description():
declared_arguments.append(
DeclareLaunchArgument(
"robot_controller",
default_value="gen3_lite_joint_trajectory_controller",
default_value="joint_trajectory_controller",
description="Robot controller to start.",
)
)
Expand Down
6 changes: 3 additions & 3 deletions kortex_bringup/launch/kortex_sim_control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def generate_launch_description():
declared_arguments.append(
DeclareLaunchArgument(
"robot_controller",
default_value="gen3_lite_joint_trajectory_controller",
default_value="joint_trajectory_controller",
description="Robot controller to start.",
)
)
Expand Down Expand Up @@ -367,8 +367,8 @@ def generate_launch_description():
declared_arguments.append(
DeclareLaunchArgument(
"gripper",
default_value="robotiq_2f_85",
choices=["robotiq_2f_85", "robotiq_2f_140", "gen3_lite_2f"],
default_value="",
choices=["robotiq_2f_85", "robotiq_2f_140", "gen3_lite_2f", ""],
description="Gripper to use",
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ controller_manager:
joint_state_broadcaster:
type: joint_state_broadcaster/JointStateBroadcaster

gen3_lite_joint_trajectory_controller:
joint_trajectory_controller:
type: joint_trajectory_controller/JointTrajectoryController

twist_controller:
Expand All @@ -17,7 +17,7 @@ controller_manager:
gen3_lite_2f_gripper_controller:
type: position_controllers/GripperActionController

gen3_lite_joint_trajectory_controller:
joint_trajectory_controller:
ros__parameters:
joints:
- joint_1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ repositories:
ros2_robotiq_gripper:
type: git
url: https://github.com/picknikrobotics/ros2_robotiq_gripper.git
version: humble
version: main
serial:
type: git
url: https://github.com/tylerjw/serial.git
version: ros2
gz_ros2_control:
type: git
url: https://github.com/ros-controls/gz_ros2_control.git
version: humble
version: jazzy
10 changes: 5 additions & 5 deletions ros2_kortex.humble.repos → ros2_kortex.jazzy.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ repositories:
control_msgs:
type: git
url: https://github.com/ros-controls/control_msgs.git
version: humble
version: master
ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: humble
version: master
ros2_controllers:
type: git
url: https://github.com/ros-controls/ros2_controllers.git
version: humble
version: master
ros2_robotiq_gripper:
type: git
url: https://github.com/picknikrobotics/ros2_robotiq_gripper.git
version: humble
version: main
gz_ros2_control:
type: git
url: https://github.com/ros-controls/gz_ros2_control.git
version: humble
version: jazzy
4 changes: 2 additions & 2 deletions simulation.humble.repos → simulation.jazzy.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ repositories:
ros_gz:
type: git
url: https://github.com/gazebosim/ros_gz.git
version: humble
version: jazzy
gz_ros2_control:
type: git
url: https://github.com/ros-controls/gz_ros2_control.git
version: humble
version: jazzy

0 comments on commit dddd2af

Please sign in to comment.