Skip to content

Commit 4d99864

Browse files
Drop version distinction from the launch file
Also use the topic-based `controller_manager` configuration.
1 parent 8e78b61 commit 4d99864

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

cartesian_controller_simulation/launch/simulation.launch.py

+5-12
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@
4646
from launch_ros.actions import Node
4747
from launch_ros.substitutions import FindPackageShare
4848

49-
import os
50-
51-
distro = os.environ["ROS_DISTRO"]
52-
if distro in ["galactic", "humble", "iron"]:
53-
spawner = "spawner"
54-
else: # foxy
55-
spawner = "spawner.py"
56-
5749

5850
def generate_launch_description():
5951
# Declare arguments
@@ -98,10 +90,11 @@ def generate_launch_description():
9890
control_node = Node(
9991
package="controller_manager",
10092
executable="ros2_control_node",
101-
parameters=[robot_description, robot_controllers],
102-
# prefix="screen -d -m gdb -command=/home/scherzin/.ros/my_debug_log --ex run --args", # noqa: E501
93+
parameters=[robot_controllers],
94+
# prefix="screen -d -m gdb -command=/home/stefan/.gdb_debug_config --ex run --args", # noqa E501
10395
output="both",
10496
remappings=[
97+
("~/robot_description", "/robot_description"),
10598
("motion_control_handle/target_frame", "target_frame"),
10699
("cartesian_motion_controller/target_frame", "target_frame"),
107100
("cartesian_compliance_controller/target_frame", "target_frame"),
@@ -116,7 +109,7 @@ def generate_launch_description():
116109
def controller_spawner(name, *args):
117110
return Node(
118111
package="controller_manager",
119-
executable=spawner,
112+
executable="spawner",
120113
output="screen",
121114
arguments=[name] + [a for a in args],
122115
)
@@ -137,7 +130,7 @@ def controller_spawner(name, *args):
137130
"invalid_cartesian_compliance_controller",
138131
"invalid_cartesian_force_controller",
139132
]
140-
state = "--inactive" if distro in ["humble", "iron"] else "--stopped"
133+
state = "--inactive"
141134
inactive_spawners = [
142135
controller_spawner(controller, state) for controller in inactive_list
143136
]

0 commit comments

Comments
 (0)