Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

* [PR-14](https://github.com/AGH-CEAI/robotiq_hande_description/pull/14) - Adds new parameters for the ros2_control: `frequency_hz`, `create_socat_tty`, `ip_adress` and `port`.
* [PR-14](https://github.com/AGH-CEAI/robotiq_hande_description/pull/14) - Adds new parameters for the ros2_control: `frequency_hz`, `create_socat_tty`, `ip_address` and `port`.

### Changed

* [PR-15](https://github.com/AGH-CEAI/robotiq_hande_description/pull/15) - Renamed `ip_adress` to `ip_address`.

* [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`.


Expand Down
4 changes: 2 additions & 2 deletions urdf/robotiq_hande_gripper.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<robot xmlns:xacro="http://www.ros.org/wiki/xacro">
<xacro:macro
name="robotiq_hande_ros2_control"
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"
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_address port use_fake_hardware"
>
<ros2_control name="${name}" type="system">
<hardware>
Expand All @@ -24,7 +24,7 @@
<param name="frequency_hz">${frequency_hz}</param>

<param name="create_socat_tty">${create_socat_tty}</param>
<param name="ip_adress">${ip_adress}</param>
<param name="ip_address">${ip_address}</param>
<param name="port">${port}</param>
</xacro:unless>
</hardware>
Expand Down
4 changes: 2 additions & 2 deletions urdf/robotiq_hande_gripper.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<xacro:arg name="frequency_hz" default="10"/>

<xacro:arg name="create_socat_tty" default="false"/>
<xacro:arg name="ip_adress" default="192.168.100.10"/>
<xacro:arg name="ip_address" default="192.168.100.10"/>
<xacro:arg name="port" default="54321"/>

<xacro:arg name="use_fake_hardware" default="true"/>
Expand All @@ -34,7 +34,7 @@
slave_id="$(arg slave_id)"
frequency_hz="$(arg frequency_hz)"
create_socat_tty="$(arg create_socat_tty)"
ip_adress="$(arg ip_adress)"
ip_address="$(arg ip_address)"
port="$(arg port)"
use_fake_hardware="$(arg use_fake_hardware)"
/>
Expand Down
4 changes: 2 additions & 2 deletions urdf/robotiq_hande_gripper.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
use_fake_hardware
frequency_hz:=10
create_socat_tty:=false
ip_adress:=192.168.100.10
ip_address:=192.168.100.10
port:=54321
coupler_mass:=0.119
xyz:='0 0 0'
Expand All @@ -43,7 +43,7 @@
slave_id="${slave_id}"
frequency_hz="${frequency_hz}"
create_socat_tty="${create_socat_tty}"
ip_adress="${ip_adress}"
ip_address="${ip_address}"
port="${port}"
use_fake_hardware="${use_fake_hardware}"
/>
Expand Down