diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml index 3fda1219..45655a4e 100644 --- a/.github/workflows/rolling-binary-build.yml +++ b/.github/workflows/rolling-binary-build.yml @@ -21,6 +21,8 @@ jobs: - {ROS_DISTRO: rolling, ROS_REPO: testing} env: UPSTREAM_WORKSPACE: ros2_kortex-not-released.${{ matrix.env.ROS_DISTRO }}.repos + # This is available in the main Rolling repo, but not the testing repo. Otherwise, this can be installed from binaries. + ROSDEP_SKIP_KEYS: gz_ros2_control CCACHE_DIR: ${{ github.workspace }}/.ccache BASEDIR: ${{ github.workspace }}/.work CACHE_PREFIX: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} diff --git a/README.md b/README.md index dbff9a15..338447ee 100644 --- a/README.md +++ b/README.md @@ -309,7 +309,8 @@ The `kortex_sim_control.launch.py` launch file is designed to simulate all of ou ```bash ros2 launch kortex_bringup kortex_sim_control.launch.py \ use_sim_time:=true \ - launch_rviz:=false + launch_rviz:=false \ + robot_controller:=joint_trajectory_controller ``` * `sim_gazebo` : Use Gazebo for simulation. Default value is `false`. diff --git a/ros2_kortex-not-released.rolling.repos b/ros2_kortex-not-released.rolling.repos index 76a9cfea..b8c95918 100644 --- a/ros2_kortex-not-released.rolling.repos +++ b/ros2_kortex-not-released.rolling.repos @@ -6,8 +6,14 @@ repositories: ros2_robotiq_gripper: type: git url: https://github.com/picknikrobotics/ros2_robotiq_gripper.git - version: main + version: 27ecc36c1fa0db53a14f814d3b1008ae2874c039 serial: type: git url: https://github.com/tylerjw/serial.git version: ros2 + # This is available in the main Rolling repo, but not the testing repo. + # Otherwise, this can be installed from binaries. + gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: rolling diff --git a/ros2_kortex.repos b/ros2_kortex.repos index fd089dd8..1dc8afd2 100644 --- a/ros2_kortex.repos +++ b/ros2_kortex.repos @@ -14,4 +14,4 @@ repositories: ros2_robotiq_gripper: type: git url: https://github.com/picknikrobotics/ros2_robotiq_gripper.git - version: main + version: 27ecc36c1fa0db53a14f814d3b1008ae2874c039