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

Humble ignition gazebo #117

Merged
merged 33 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
66e9995
initial ignition gazebo changes
mhubii Sep 7, 2023
325447d
added sim run arg
mhubii Sep 7, 2023
000f4b5
added dep
mhubii Sep 7, 2023
173253b
added empty world
mhubii Sep 7, 2023
66feb9a
updated name argument
mhubii Sep 7, 2023
a8962b0
added classic mixin
mhubii Sep 7, 2023
5f40de3
added classic mixin
mhubii Sep 7, 2023
1633d06
Merge branch 'humble' into dev-humble-ignition-gazebo
mhubii Sep 8, 2023
7dc29c5
simplified urdfs
mhubii Sep 8, 2023
865fec7
fixed names
mhubii Sep 8, 2023
dfdf21e
updated ros2 control effort reject
mhubii Sep 8, 2023
d9a4065
updated tests
mhubii Sep 8, 2023
b0dfd9b
simplified gazebo xacro
mhubii Sep 8, 2023
2756ce9
renamed controller
mhubii Sep 8, 2023
b362ba5
removed robot name
mhubii Sep 8, 2023
0d67770
Merge branch 'humble' into dev-humble-ignition-gazebo
mhubii Oct 18, 2023
1e2746d
Merge branch 'humble' into dev-humble-ignition-gazebo
mhubii Jan 2, 2024
dcaa1c2
re-add position limits to system interface
mhubii Jan 2, 2024
3418768
fixed ign ros2 control dependency
mhubii Jan 2, 2024
fd6c748
updated launch
mhubii Jan 2, 2024
50fd8d5
added unless sim condition for parameters
mhubii Jan 2, 2024
4850fbd
fixed ign gazebo
mhubii Jan 3, 2024
ce194c8
simplified namespace
mhubii Jan 3, 2024
c6e94a2
use ign_ packages for humble
mhubii Jan 3, 2024
13809ea
use gz_sim instead of ign_gazebo
mhubii Jan 3, 2024
1322d3b
remvoed robot description parameter
mhubii Jan 3, 2024
910343d
controller manager: read robot description from state pub
mhubii Jan 3, 2024
0710ce6
added a remapping
mhubii Jan 3, 2024
6eb8a41
updated re-mappings
mhubii Jan 3, 2024
56db45d
Merge branch 'humble' into dev-humble-ignition-gazebo
mhubii Sep 27, 2024
833ed94
added time bridge
mhubii Sep 27, 2024
13ef9e5
bump version: 2.1.0 -> 2.1.1
mhubii Sep 27, 2024
febbf5c
2.1.1 notes
mhubii Sep 27, 2024
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
1 change: 1 addition & 0 deletions lbr_bringup/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<exec_depend>robot_state_publisher</exec_depend>
<exec_depend>gazebo_ros</exec_depend>
<exec_depend>gazebo_ros2_control</exec_depend>
<exec_depend>ign_ros_control</exec_depend>
mhubii marked this conversation as resolved.
Show resolved Hide resolved
<exec_depend>rviz2</exec_depend>
<exec_depend>rclpy</exec_depend>

Expand Down
2 changes: 1 addition & 1 deletion lbr_description/gazebo/lbr.gazebo.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- ros_control-plugin -->
<gazebo>
<plugin name="gazebo_ros2_control" filename="libgazebo_ros2_control.so">
<plugin name="ign_ros2_control::IgnitionROS2ControlPlugin" filename="ign_ros2_control-system">
mhubii marked this conversation as resolved.
Show resolved Hide resolved
<parameters>$(find lbr_hardware_interface)/config/lbr_controllers.yml</parameters>
<robotNamespace>/${robot_name}</robotNamespace>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion lbr_description/lbr_description.dsv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
prepend-non-duplicate;GAZEBO_MODEL_PATH;share
mhubii marked this conversation as resolved.
Show resolved Hide resolved
prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;share
14 changes: 8 additions & 6 deletions lbr_description/lbr_description/launch_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,20 @@


class GazeboMixin:
# https://answers.gazebosim.org//question/28813/how-to-spawn-a-urdf-robot-into-a-ignition-gazebo-world-from-ros2/
@staticmethod
def include_gazebo(**kwargs) -> IncludeLaunchDescription:
return IncludeLaunchDescription(
PythonLaunchDescriptionSource(
PathJoinSubstitution(
[
FindPackageShare("gazebo_ros"),
FindPackageShare("ros_gz_sim"),
"launch",
"gazebo.launch.py",
"gz_sim.launch.py",
]
)
),
),
launch_arguments={"gz_args": "-r empty.sdf"}.items(),
**kwargs
)

Expand All @@ -35,12 +37,12 @@ def node_spawn_entity(
if robot_name is None:
robot_name = LaunchConfiguration("robot_name")
return Node(
package="gazebo_ros",
executable="spawn_entity.py",
package="ros_gz_sim",
executable="create",
arguments=[
"-topic",
"robot_description",
"-entity",
"-name",
LaunchConfiguration("robot_name"),
],
output="screen",
Expand Down
2 changes: 1 addition & 1 deletion lbr_description/ros2_control/lbr.ros2_control.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- define hardware including parameters, also gazebo -->
<xacro:if value="${sim}">
<hardware>
<plugin>gazebo_ros2_control/GazeboSystem</plugin>
mhubii marked this conversation as resolved.
Show resolved Hide resolved
<plugin>ign_ros2_control/IgnitionSystem</plugin>
</hardware>
</xacro:if>
<xacro:unless value="${sim}">
Expand Down