Skip to content

Commit

Permalink
Squashed 'src/external_dependencies/ros2_robotiq_gripper/' changes fr…
Browse files Browse the repository at this point in the history
…om 77e6092..2ff8545

2ff8545 update urdf mesh filenames to use package path (#50) (#68)
93ecde7 Replace fake_sensor_commands with 'mock_sensor_commands (#62)
REVERT: 77e6092 update urdf mesh filenames to use package path (#50)
REVERT: 27ecc36 Replace fake_sensor_commands with 'mock_sensor_commands (#61)
REVERT: 5f0c39a Remove mimic tags and rename `sim_ignition` to `sim_gazebo` (#54)

git-subtree-dir: src/external_dependencies/ros2_robotiq_gripper
git-subtree-split: 2ff85455d4b9f973c4b0bab1ce95fb09367f0d26
  • Loading branch information
MikeWrock committed Nov 1, 2024
1 parent 38e1489 commit cc5b41c
Show file tree
Hide file tree
Showing 24 changed files with 361 additions and 75 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
coverage:
name: coverage build
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
env:
Expand Down Expand Up @@ -39,12 +39,12 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v3.1.0
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3.1.0
with:
name: colcon-logs-coverage-rolling
path: ros_ws/log
26 changes: 26 additions & 0 deletions .github/workflows/humble-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Humble Binary Build - main
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: humble
ros_repo: main
upstream_workspace: ros2_robotiq_gripper-not-released.humble.repos
ref_for_scheduled_build: main
26 changes: 26 additions & 0 deletions .github/workflows/humble-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Humble Binary Build - testing
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: ros2_robotiq_gripper-not-released.humble.repos
ref_for_scheduled_build: main
25 changes: 25 additions & 0 deletions .github/workflows/humble-semi-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Humble Semi-Binary Build - main
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: humble
ros_repo: main
upstream_workspace: ros2_robotiq_gripper.humble.repos
ref_for_scheduled_build: main
25 changes: 25 additions & 0 deletions .github/workflows/humble-semi-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Humble Semi-Binary Build - testing
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: humble
ros_repo: testing
upstream_workspace: ros2_robotiq_gripper.humble.repos
ref_for_scheduled_build: main
19 changes: 19 additions & 0 deletions .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Humble Source Build
on:
workflow_dispatch:
branches:
- main
push:
branches:
- main
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'

jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
with:
ros_distro: humble
ref: main
ros2_repo_branch: humble
26 changes: 26 additions & 0 deletions .github/workflows/iron-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Iron Binary Build - main
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_robotiq_gripper-not-released.iron.repos
ref_for_scheduled_build: main
26 changes: 26 additions & 0 deletions .github/workflows/iron-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Iron Binary Build - testing
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_robotiq_gripper-not-released.iron.repos
ref_for_scheduled_build: main
25 changes: 25 additions & 0 deletions .github/workflows/iron-semi-binary-build-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Iron Semi-Binary Build - main
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_robotiq_gripper.iron.repos
ref_for_scheduled_build: main
25 changes: 25 additions & 0 deletions .github/workflows/iron-semi-binary-build-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Iron Semi-Binary Build - testing
# description: 'Build & test that compiles the main dependencies from source.'

on:
workflow_dispatch:
branches:
- main
pull_request:
branches:
- main
push:
branches:
- main
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
with:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_robotiq_gripper.iron.repos
ref_for_scheduled_build: main
19 changes: 19 additions & 0 deletions .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Iron Source Build
on:
workflow_dispatch:
branches:
- main
push:
branches:
- main
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'

jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
with:
ros_distro: iron
ref: main
ros2_repo_branch: iron
2 changes: 1 addition & 1 deletion .github/workflows/reusable-ros-tooling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
https://raw.githubusercontent.com/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_robotiq_gripper.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v1
with:
name: colcon-logs-ubuntu-22.04
path: ros_ws/log
37 changes: 26 additions & 11 deletions robotiq_description/urdf/2f_140.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<xacro:macro name="robotiq_gripper_ros2_control" params="
name
prefix
sim_gazebo:=false
sim_ignition:=false
sim_isaac:=false
isaac_joint_commands:=/isaac_joint_commands
isaac_joint_states:=/isaac_joint_states
Expand All @@ -20,15 +20,15 @@
<param name="joint_commands_topic">${isaac_joint_commands}</param>
<param name="joint_states_topic">${isaac_joint_states}</param>
</xacro:if>
<xacro:if value="${sim_gazebo}">
<xacro:if value="${sim_ignition}">
<plugin>ign_ros2_control/IgnitionSystem</plugin>
</xacro:if>
<xacro:if value="${use_fake_hardware}">
<plugin>mock_components/GenericSystem</plugin>
<param name="mock_sensor_commands">${mock_sensor_commands}</param>
<param name="state_following_offset">0.0</param>
</xacro:if>
<xacro:unless value="${use_fake_hardware or sim_gazebo or sim_isaac}">
<xacro:unless value="${use_fake_hardware or sim_ignition or sim_isaac}">
<plugin>robotiq_driver/RobotiqGripperHardwareInterface</plugin>
<param name="gripper_closed_position">0.695</param>
<param name="COM_port">${com_port}</param>
Expand All @@ -38,7 +38,7 @@
</hardware>

<!-- Joint interfaces -->
<!-- With Gazebo or Hardware, they handle mimic joints, so we only need this command interface activated -->
<!-- With Ignition or Hardware, they handle mimic joints, so we only need this command interface activated -->
<joint name="${prefix}finger_joint">
<command_interface name="position" />
<state_interface name="position">
Expand All @@ -47,41 +47,56 @@
<state_interface name="velocity"/>
</joint>
<!-- When simulating we need to include the rest of the gripper joints -->
<xacro:if value="${use_fake_hardware or sim_isaac or sim_gazebo}">
<xacro:if value="${use_fake_hardware or sim_isaac or sim_ignition}">
<joint name="${prefix}left_inner_knuckle_joint">
<xacro:unless value="${sim_gazebo}">
<param name="mimic">${prefix}finger_joint</param>
<param name="multiplier">-1</param>
<xacro:unless value="${sim_ignition}">
<command_interface name="position"/>
<state_interface name="position"/>
<state_interface name="velocity"/>
</xacro:unless>
</joint>
<joint name="${prefix}left_inner_finger_joint">
<xacro:unless value="${sim_gazebo}">
<param name="mimic">${prefix}finger_joint</param>
<param name="multiplier">1</param>
<xacro:unless value="${sim_ignition}">
<command_interface name="position"/>
<state_interface name="position"/>
<state_interface name="velocity"/>
</xacro:unless>
</joint>
<joint name="${prefix}right_outer_knuckle_joint">
<xacro:unless value="${sim_gazebo}">
<param name="mimic">${prefix}finger_joint</param>
<param name="multiplier">-1</param>
<xacro:unless value="${sim_ignition}">
<command_interface name="position"/>
<state_interface name="position"/>
<state_interface name="velocity"/>
</xacro:unless>
</joint>
<joint name="${prefix}right_inner_knuckle_joint">
<xacro:unless value="${sim_gazebo}">
<param name="mimic">${prefix}finger_joint</param>
<param name="multiplier">-1</param>
<xacro:unless value="${sim_ignition}">
<command_interface name="position"/>
<state_interface name="position"/>
<state_interface name="velocity"/>
</xacro:unless>
</joint>
<joint name="${prefix}right_inner_finger_joint">
<xacro:unless value="${sim_gazebo}">
<param name="mimic">${prefix}finger_joint</param>
<param name="multiplier">1</param>
<xacro:unless value="${sim_ignition}">
<command_interface name="position"/>
<state_interface name="position"/>
<state_interface name="velocity"/>
</xacro:unless>
</joint>
</xacro:if>

<!-- Only add this with fake hardware mode -->
<xacro:unless value="${sim_gazebo or sim_isaac}">
<xacro:unless value="${sim_ignition or sim_isaac}">
<gpio name="reactivate_gripper">
<command_interface name="reactivate_gripper_cmd" />
<command_interface name="reactivate_gripper_response" />
Expand Down
Loading

0 comments on commit cc5b41c

Please sign in to comment.