Skip to content

Commit

Permalink
start iiwa renamings (not working yet)
Browse files Browse the repository at this point in the history
  • Loading branch information
Svastits committed Nov 9, 2023
1 parent 74fdd37 commit 4fdda0f
Show file tree
Hide file tree
Showing 37 changed files with 219 additions and 315 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Github CI
- **kuka_lbr_iisy_support** contains urdf, config and mesh files for KUKA iisy robots.
- **kuka_lbr_iisy_moveit_config** contains configuration files for KUKA iisy robots necessary for planning with moveit.
- **kuka_agilus_support** contains urdf, config and mesh files for KUKA Agilus robots, it is copied from [kuka_experimental](https://github.com/ros-industrial/kuka_experimental) and ported to ROS2.
- **kuka_lbr_iiwa7_support** contains urdf, config and mesh files for KUKA LBR iiwa 7 robots
- **kuka_lbr_iiwa_support** contains urdf, config and mesh files for KUKA LBR iiwa 7 robots
- **kuka_rsi_simulator** implements a basic RSI simulator. It is also copied from [kuka_experimental](https://github.com/ros-industrial/kuka_experimental) and is ported to ROS2. It implements a UDP socket, and recieves the commands from an RSI interface and sends back the actual position of the robot (as it is a simulation, it is a simple closed loop, it sends what it recieved).

## Running the RSI simulator
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy11_r1300.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<xacro:property name="timeframe_ms" value="${qos_config_dict['rt_packet_loss_profile']['timeframe_ms']}" />


<xacro:kuka_lbr11_r1300_robot prefix=""
<xacro:kuka_lbr_iisy11_r1300_robot prefix=""
client_ip="${client_ip}"
controller_ip="${controller_ip}"
control_mode="${control_mode}"
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy11_r1300_macro.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<xacro:include filename="$(find kuka_resources)/urdf/common_materials.xacro"/>
<xacro:include filename="$(find kuka_lbr_iisy_support)/urdf/lbr_iisy_transmission.xacro" />

<xacro:macro name="kuka_lbr11_r1300_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms">
<xacro:macro name="kuka_lbr_iisy11_r1300_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms">
<!-- ros2 control instance -->
<xacro:kuka_lbr_iisy_ros2_control
name="lbr_iisy11_r1300"
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy15_r930.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<xacro:property name="timeframe_ms" value="${qos_config_dict['rt_packet_loss_profile']['timeframe_ms']}" />


<xacro:kuka_lbr15_r930_robot prefix=""
<xacro:kuka_lbr_iisy15_r930_robot prefix=""
client_ip="${client_ip}"
controller_ip="${controller_ip}"
control_mode="${control_mode}"
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy15_r930_macro.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<xacro:include filename="$(find kuka_resources)/urdf/common_materials.xacro"/>
<xacro:include filename="$(find kuka_lbr_iisy_support)/urdf/lbr_iisy_transmission.xacro" />

<xacro:macro name="kuka_lbr15_r930_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms">
<xacro:macro name="kuka_lbr_iisy15_r930_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms">
<!-- ros2 control instance -->
<xacro:kuka_lbr_iisy_ros2_control
name="lbr_iisy15_r930"
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy3_r760.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- Read additional arguments -->
<xacro:arg name="use_fake_hardware" default="false" />

<xacro:kuka_lbr3_r760_robot prefix=""
<xacro:kuka_lbr_iisy3_r760_robot prefix=""
client_ip="${client_ip}"
controller_ip="${controller_ip}"
control_mode="${control_mode}"
Expand Down
2 changes: 1 addition & 1 deletion kuka_lbr_iisy_support/urdf/lbr_iisy3_r760_macro.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<xacro:include filename="$(find kuka_resources)/urdf/common_materials.xacro"/>
<xacro:include filename="$(find kuka_lbr_iisy_support)/urdf/lbr_iisy_transmission.xacro" />

<xacro:macro name="kuka_lbr3_r760_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms use_fake_hardware:=false">
<xacro:macro name="kuka_lbr_iisy3_r760_robot" params="prefix client_ip controller_ip control_mode consequent_lost_packets lost_packets_in_timeframe timeframe_ms use_fake_hardware:=false">
<!-- ros2 control instance -->
<xacro:kuka_lbr_iisy_ros2_control
name="lbr_iisy3_r760"
Expand Down
94 changes: 0 additions & 94 deletions kuka_lbr_iiwa7_support/launch/full.launch.py

This file was deleted.

76 changes: 0 additions & 76 deletions kuka_lbr_iiwa7_support/launch/rviz.launch.py

This file was deleted.

5 changes: 0 additions & 5 deletions kuka_lbr_iiwa7_support/urdf/lbriiwa7.xacro

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(kuka_lbr_iiwa7_support)
project(kuka_lbr_iiwa_support)

# Default to C99
if(NOT CMAKE_C_STANDARD)
Expand Down
Loading

0 comments on commit 4fdda0f

Please sign in to comment.