Skip to content

Commit e6801c2

Browse files
authored
Configuration params for ModbusRTU serial communication (#1)
* ADD: connection params * ADD: parameter config * FIX: formatting * FIX: initial velocity state value * FIX: tty string * CHG: put params in conditional statement * FIX: formatting xacro * ADD: changelog
1 parent 52de37c commit e6801c2

File tree

4 files changed

+69
-7
lines changed

4 files changed

+69
-7
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Changelog
2+
3+
All notable changes to the `robotiq_hande_driver` package will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## [Unreleased]
9+
10+
### Added
11+
* [PR-1](https://github.com/AGH-CEAI/robotiq_hande_description/pull/1) - Configuration parameters for ModbusRTU
12+
13+
### Changed
14+
15+
### Deprecated
16+
17+
### Removed
18+
19+
### Fixed
20+
21+
### Security

urdf/robotiq_hande_gripper.ros2_control.xacro

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<robot xmlns:xacro="http://www.ros.org/wiki/xacro">
3-
<xacro:macro name="robotiq_hande_ros2_control" params="name prefix tty use_fake_hardware:=false">
3+
<xacro:macro name="robotiq_hande_ros2_control" params="name prefix grip_pos_min grip_pos_max tty baudrate parity data_bits stop_bit slave_id use_fake_hardware:=false">
44
<ros2_control name="${name}" type="system">
55
<hardware>
66
<xacro:if value="${use_fake_hardware}">
@@ -9,7 +9,14 @@
99

1010
<xacro:unless value="${use_fake_hardware}">
1111
<plugin>robotiq_hande_driver/RobotiqHandeHardwareInterface</plugin>
12-
<param name="tty">${tty}</param>
12+
<param name="grip_pos_min">"${grip_pos_min}"</param>
13+
<param name="grip_pos_max">"${grip_pos_max}"</param>
14+
<param name="tty">"${tty}"</param>
15+
<param name="baudrate">"${baudrate}"</param>
16+
<param name="parity">"${parity}"</param>
17+
<param name="data_bits">"${data_bits}"</param>
18+
<param name="stop_bit">"${stop_bit}"</param>
19+
<param name="slave_id">"${slave_id}"</param>
1320
</xacro:unless>
1421
</hardware>
1522

@@ -22,7 +29,9 @@
2229
<state_interface name="position">
2330
<param name="initial_value">0.025</param>
2431
</state_interface>
25-
<state_interface name="velocity"/>
32+
<state_interface name="velocity">
33+
<param name="initial_value">0</param>
34+
</state_interface>
2635
</joint>
2736
</ros2_control>
2837
</xacro:macro>
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
11
<?xml version="1.0"?>
22
<robot xmlns:xacro="http://ros.org/wiki/xacro" name="robotiq_hande_gripper">
33
<xacro:arg name="parent" default="tool0"/>
4-
<xacro:arg name="tty" default="/dev/ttyXXX"/>
4+
<xacro:arg name="grip_pos_min" default="0"/>
5+
<xacro:arg name="grip_pos_max" default="0.025"/>
6+
<xacro:arg name="tty" default="/tmp/ttyUR"/>
7+
<xacro:arg name="baudrate" default="115200"/>
8+
<xacro:arg name="parity" default="N"/>
9+
<xacro:arg name="data_bits" default="8"/>
10+
<xacro:arg name="stop_bit" default="1"/>
11+
<xacro:arg name="slave_id" default="9"/>
512
<xacro:arg name="use_fake_hardware" default="true"/>
613

714
<xacro:include filename="$(find robotiq_hande_description)/urdf/robotiq_hande_gripper.xacro"/>
815

916
<link name="$(arg parent)"/>
10-
<xacro:robotiq_hande_gripper name="robotiq_hande_gripper" prefix="" parent="$(arg parent)" tty="$(arg tty)" use_fake_hardware="$(arg use_fake_hardware)"/>
17+
<xacro:robotiq_hande_gripper
18+
name="robotiq_hande_gripper"
19+
prefix=""
20+
parent="$(arg parent)"
21+
grip_pos_min="$(arg grip_pos_min)"
22+
grip_pos_max="$(arg grip_pos_max)"
23+
tty="$(arg tty)"
24+
baudrate="$(arg baudrate)"
25+
parity="$(arg parity)"
26+
data_bits="$(arg data_bits)"
27+
stop_bit="$(arg stop_bit)"
28+
slave_id="$(arg slave_id)"
29+
use_fake_hardware="$(use_fake_hardware)"
30+
/>
1131
</robot>

urdf/robotiq_hande_gripper.xacro

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,21 @@
77
<xacro:include filename="$(find robotiq_hande_description)/urdf/materials.xacro"/>
88
<xacro:include filename="$(find robotiq_hande_description)/urdf/robotiq_hande_gripper.ros2_control.xacro"/>
99

10-
<xacro:macro name="robotiq_hande_gripper" params="name prefix parent tty use_fake_hardware">
10+
<xacro:macro name="robotiq_hande_gripper" params="name prefix parent grip_pos_min grip_pos_max tty baudrate parity data_bits stop_bit slave_id use_fake_hardware">
1111
<!-- ros2_control parameters -->
12-
<xacro:robotiq_hande_ros2_control name="${name}" prefix="${prefix}" tty="${tty}" use_fake_hardware="${use_fake_hardware}"/>
12+
<xacro:robotiq_hande_ros2_control
13+
name="${name}"
14+
prefix="${prefix}"
15+
grip_pos_min="${grip_pos_min}"
16+
grip_pos_max="${grip_pos_max}"
17+
tty="${tty}"
18+
baudrate="${baudrate}"
19+
parity="${parity}"
20+
data_bits="${data_bits}"
21+
stop_bit="${stop_bit}"
22+
slave_id="${slave_id}"
23+
use_fake_hardware="${use_fake_hardware}"
24+
/>
1325

1426
<!-- Robotiq Coupler -->
1527
<!-- + Height added by the coupler (13.9mm) -->

0 commit comments

Comments
 (0)