Skip to content

Commit 3fc8b5a

Browse files
authored
Merge pull request #15 from AGH-CEAI/bugfix/fix_typo
Fix typo
1 parent b687bc5 commit 3fc8b5a

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Changed
1515

16+
* [PR-15](https://github.com/AGH-CEAI/robotiq_hande_description/pull/15) - Renamed `ip_adress` to `socat_ip_address` and `port` to `socat_port`.
17+
1618
* [PR-14](https://github.com/AGH-CEAI/robotiq_hande_description/pull/14) - Updated CMake version from `3.8` to `3.16`; changed ros2_control param name `tty` to `tty_port`.
1719

1820

urdf/robotiq_hande_gripper.ros2_control.xacro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<robot xmlns:xacro="http://www.ros.org/wiki/xacro">
33
<xacro:macro
44
name="robotiq_hande_ros2_control"
5-
params="name prefix grip_pos_min grip_pos_max tty_port baudrate parity data_bits stop_bit slave_id frequency_hz create_socat_tty ip_adress port use_fake_hardware"
5+
params="name prefix grip_pos_min grip_pos_max tty_port baudrate parity data_bits stop_bit slave_id frequency_hz create_socat_tty socat_ip_address socat_port use_fake_hardware"
66
>
77
<ros2_control name="${name}" type="system">
88
<hardware>
@@ -24,8 +24,8 @@
2424
<param name="frequency_hz">${frequency_hz}</param>
2525

2626
<param name="create_socat_tty">${create_socat_tty}</param>
27-
<param name="ip_adress">${ip_adress}</param>
28-
<param name="port">${port}</param>
27+
<param name="socat_ip_address">${socat_ip_address}</param>
28+
<param name="socat_port">${socat_port}</param>
2929
</xacro:unless>
3030
</hardware>
3131

urdf/robotiq_hande_gripper.urdf.xacro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<xacro:arg name="frequency_hz" default="10"/>
1313

1414
<xacro:arg name="create_socat_tty" default="false"/>
15-
<xacro:arg name="ip_adress" default="192.168.100.10"/>
16-
<xacro:arg name="port" default="54321"/>
15+
<xacro:arg name="socat_ip_address" default="192.168.100.10"/>
16+
<xacro:arg name="socat_port" default="54321"/>
1717

1818
<xacro:arg name="use_fake_hardware" default="true"/>
1919

@@ -34,8 +34,8 @@
3434
slave_id="$(arg slave_id)"
3535
frequency_hz="$(arg frequency_hz)"
3636
create_socat_tty="$(arg create_socat_tty)"
37-
ip_adress="$(arg ip_adress)"
38-
port="$(arg port)"
37+
socat_ip_address="$(arg socat_ip_address)"
38+
socat_port="$(arg socat_port)"
3939
use_fake_hardware="$(arg use_fake_hardware)"
4040
/>
4141
</robot>

urdf/robotiq_hande_gripper.xacro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
use_fake_hardware
2424
frequency_hz:=10
2525
create_socat_tty:=false
26-
ip_adress:=192.168.100.10
27-
port:=54321
26+
socat_ip_address:=192.168.100.10
27+
socat_port:=54321
2828
coupler_mass:=0.119
2929
xyz:='0 0 0'
3030
rpy:='0 0 0'"
@@ -43,8 +43,8 @@
4343
slave_id="${slave_id}"
4444
frequency_hz="${frequency_hz}"
4545
create_socat_tty="${create_socat_tty}"
46-
ip_adress="${ip_adress}"
47-
port="${port}"
46+
socat_ip_address="${socat_ip_address}"
47+
socat_port="${socat_port}"
4848
use_fake_hardware="${use_fake_hardware}"
4949
/>
5050

0 commit comments

Comments
 (0)