-
Notifications
You must be signed in to change notification settings - Fork 8
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
Kuka sim support package added depends on #12. #15
base: rolling
Are you sure you want to change the base?
Conversation
…ka_lbr_iiwa_support'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Except sim_support
package we also need ros2_control_support
package. So when we are using robot on the HW we don't need to install the simulators. This is dependency management thing.
Also, I have added some small comment to optimize files.
<xacro:include filename="$(find kuka_resources)/urdf/common_materials.xacro"/> | ||
<xacro:include filename="$(find kuka_resources)/urdf/common_properties.xacro"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those two files are also not needed here. They should be in the simulation xacro files
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These were already here in some of the other base files, here only common_properties.xacro should have been added extra for getting gazebo to work, I can add it to simulation .xacro files this part as i added it for gazebo specific purpose. But the traces of the default_inertial tags will be there any way in the base files. If someone wants to use these base files alone without gazebo or ros2_control support, then they will get error as common_properties.xacro is not included in the base_macro that is using them instead in the simulation xacro.
I am not sure if every other simulator out there needs inertial tags. some of the base files had inertial tags defined, i just added default_inertial wherever it was needed. I created this PR #13 ,assuming default_inertial are needed in the base files.
i thin it should be included in the base_macro.xacro files instead of simulation .xacro files what do you think? @destogl
@@ -12,7 +12,7 @@ | |||
<visual> | |||
<origin xyz="0 0 0" rpy="${-radians(90)} 0 0"/> | |||
<geometry> | |||
<mesh filename="package://kuka_kr210_support/meshes/kr210l150/visual/base_link.dae"/> | |||
<mesh filename="file://$(find kuka_kr210_support)/meshes/kr210l150/visual/base_link.dae"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is here no default_intertial
used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because it already had inertial tags defined
@@ -3,114 +3,122 @@ | |||
<xacro:macro name="kuka_lbr_iiwa_14_r820" params="prefix"> | |||
<!-- link list --> | |||
<link name="${prefix}base_link"> | |||
<xacro:default_inertial/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should include file for default intertials here where we are also using it. Otherwise we have always add this in the file that is including this.
kuka_ros2_control_sim_support/launch/test_common_gazebo_classic_ros2_control.launch.py
Show resolved
Hide resolved
from launch_ros.actions import Node | ||
from launch_ros.substitutions import FindPackageShare | ||
|
||
def generate_launch_description(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apply the same comments as for gazebo classic file
|
||
<buildtool_depend>ament_cmake</buildtool_depend> | ||
|
||
<test_depend>roslaunch</test_depend> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be dependency anymore in ROS2
@@ -1,14 +1,31 @@ | |||
<?xml version="1.0"?> | |||
<robot xmlns:xacro="http://www.ros.org/wiki/xacro"> | |||
|
|||
<xacro:macro name="kuka_common_ros2_control_macro" params="name prefix use_mock_hardware:=^|false"> | |||
<xacro:macro name="kuka_common_sim_ros2_control_macro" params=" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would put this into *_ros2_control_*
package and sim package can use that one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i put both files separately as we dont want traces of the gazebo in the ros2_control only support package. they have their default values set in launch files, but still, for someone looking at ros2_control support package seeing gazebo related flags might be distracting, i thought @destogl
|
Co-authored-by: Dr. Denis <[email protected]>
…c_ros2_control.launch.py Co-authored-by: Dr. Denis <[email protected]>
@@ -183,4 +191,4 @@ | |||
<origin xyz="0 0 0" rpy="0 ${radians(90)} 0"/> | |||
</joint> | |||
</xacro:macro> | |||
</robot> | |||
</robot> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
</robot> | |
</robot> | |
@@ -284,4 +284,4 @@ | |||
</joint> | |||
|
|||
</xacro:macro> | |||
</robot> | |||
</robot> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
</robot> | |
</robot> | |
kuka_ros2_control_sim_support/launch/test_common_gazebo_sim_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
kuka_ros2_control_sim_support/launch/test_common_gazebo_sim_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
kuka_ros2_control_sim_support/launch/test_common_gazebo_classic_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
kuka_ros2_control_sim_support/launch/test_common_gazebo_classic_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
Please also add manual into README.md on how this repository can be used, dependencies installed and robot, mock hardware and simulation can be started. |
Co-authored-by: Dr. Denis <[email protected]>
…s2_control.launch.py Co-authored-by: Dr. Denis <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
kuka_ros2_control_sim_support/launch/test_common_gazebo_classic_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
kuka_ros2_control_sim_support/launch/test_common_gazebo_classic_ros2_control.launch.py
Outdated
Show resolved
Hide resolved
…c_ros2_control.launch.py Co-authored-by: muritane <[email protected]>
…c_ros2_control.launch.py Co-authored-by: muritane <[email protected]>
@muritane you had script to test this PR. Can we upload this for now? |
contains launch file for gazebo classic and gazebo simulators, base models independent of ros2_control support