Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create unified structure for all support packages #30

Merged
merged 21 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from 12 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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# kuka_robot_descriptions

This package contains resources that can be used with real KUKA robots as well as with simulations.
This package contains support packages that can be used with real KUKA robots as well as with simulations.
Svastits marked this conversation as resolved.
Show resolved Hide resolved

Github CI
------------
[![Build Status](https://github.com/kroshu/kuka_simulators/workflows/CI/badge.svg?branch=main)](https://github.com/kroshu/kuka_simulators/actions)
[![Build Status](https://github.com/kroshu/kuka_robot_descriptions/workflows/CI/badge.svg?branch=main)](https://github.com/kroshu/kuka_robot_descriptions/actions)

## What is included?

Expand All @@ -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
245 changes: 0 additions & 245 deletions kuka_agilus_support/config/agilus_urdf.rviz

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,17 @@ def generate_launch_description():
" ",
PathJoinSubstitution(
[FindPackageShare("kuka_agilus_support"),
"urdf", "kr6_r700_sixx.urdf.xacro"]
"urdf", "kr6_r700-sixx.urdf.xacro"]
Svastits marked this conversation as resolved.
Show resolved Hide resolved
),
" ",
"use_fake_hardware:=true",
]
)
robot_description = {'robot_description': robot_description_content}

# RViz
rviz_config_file = PathJoinSubstitution([FindPackageShare(
'kuka_agilus_support'), "config", "agilus_urdf.rviz"])
'kuka_resources'), "config", "view_6_axis_urdf.rviz"])
rviz_node = Node(package='rviz2',
executable='rviz2',
name='rviz2_launch',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,17 @@ def generate_launch_description():
" ",
PathJoinSubstitution(
[FindPackageShare("kuka_agilus_support"),
"urdf", "kr6_r700_sixx.urdf.xacro"]
"urdf", "kr6_r700-sixx.urdf.xacro"]
),
" ",
"use_fake_hardware:=true",
]
)
robot_description = {'robot_description': robot_description_content}

# RViz
rviz_config_file = PathJoinSubstitution([FindPackageShare(
'kuka_agilus_support'), "config", "agilus_urdf.rviz"])
'kuka_resources'), "config", "view_6_axis_urdf.rviz"])
rviz_node = Node(package='rviz2',
executable='rviz2',
name='rviz2_launch',
Expand Down
10 changes: 10 additions & 0 deletions kuka_agilus_support/urdf/kr6_r700-sixx.urdf.xacro
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="kr6_r700-sixx">
<!-- Import urdf file -->
<xacro:include filename="$(find kuka_agilus_support)/urdf/kr6_r700-sixx_macro.xacro"/>

<!-- Read additional arguments -->
<xacro:arg name="use_fake_hardware" default="false" />

<xacro:kuka_kr6_r700-sixx_robot prefix="" use_fake_hardware="$(arg use_fake_hardware)"/>
</robot>
Loading
Loading