Skip to content

Commit e295078

Browse files
committed
コントローラはNodeで起動。Nodeの引数の順序を整理。ruffで自動整形
1 parent 789dd4d commit e295078

File tree

4 files changed

+17
-26
lines changed

4 files changed

+17
-26
lines changed

raspimouse_gazebo/launch/raspimouse_with_color_objects.launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,4 @@ def generate_launch_description():
4444
launch_arguments={'world_name': world_file}.items(),
4545
)
4646

47-
return LaunchDescription(
48-
[SetParameter(name='use_sim_time', value=True), world_launch]
49-
)
47+
return LaunchDescription([SetParameter(name='use_sim_time', value=True), world_launch])

raspimouse_gazebo/launch/raspimouse_with_emptyworld.launch.py

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ def generate_launch_description():
5656
)
5757
declare_arg_world_name = DeclareLaunchArgument(
5858
'world_name',
59-
default_value=get_package_share_directory('raspimouse_gazebo')
60-
+ '/worlds/empty_world.sdf',
59+
default_value=get_package_share_directory('raspimouse_gazebo') + '/worlds/empty_world.sdf',
6160
description='Set world name.',
6261
)
6362
declare_arg_spawn_x = DeclareLaunchArgument(
@@ -120,9 +119,7 @@ def generate_launch_description():
120119
description_loader.use_rgb_camera = LaunchConfiguration('use_rgb_camera')
121120
description_loader.camera_downward = LaunchConfiguration('camera_downward')
122121
description_loader.gz_control_config_package = 'raspimouse_gazebo'
123-
description_loader.gz_control_config_file_path = (
124-
'config/raspimouse_controllers.yaml'
125-
)
122+
description_loader.gz_control_config_file_path = 'config/raspimouse_controllers.yaml'
126123

127124
robot_state_publisher = Node(
128125
package='robot_state_publisher',
@@ -131,54 +128,54 @@ def generate_launch_description():
131128
parameters=[{'robot_description': description_loader.load()}],
132129
)
133130

134-
spawn_joint_state_broadcaster = ExecuteProcess(
135-
cmd=['ros2 run controller_manager spawner joint_state_broadcaster'],
136-
shell=True,
131+
spawn_joint_state_broadcaster = Node(
132+
package='controller_manager',
133+
executable='spawner',
137134
output='screen',
135+
arguments=['joint_state_broadcaster'],
138136
)
139137

140-
spawn_diff_drive_controller = ExecuteProcess(
141-
cmd=['ros2 run controller_manager spawner diff_drive_controller'],
142-
shell=True,
138+
spawn_diff_drive_controller = Node(
139+
package='controller_manager',
140+
executable='spawner',
143141
output='screen',
142+
arguments=['diff_drive_controller'],
144143
)
145144

146-
rviz_config_file = (
147-
get_package_share_directory('raspimouse_gazebo') + '/config/config.rviz'
148-
)
145+
rviz_config_file = get_package_share_directory('raspimouse_gazebo') + '/config/config.rviz'
149146
rviz = Node(
147+
name='rviz2',
150148
package='rviz2',
151149
executable='rviz2',
152-
name='rviz2',
153150
output='screen',
154151
arguments=['-d', rviz_config_file],
155152
)
156153

157154
bridge = Node(
158155
package='ros_gz_bridge',
159156
executable='parameter_bridge',
157+
output='screen',
160158
arguments=[
161159
'/clock@rosgraph_msgs/msg/Clock[gz.msgs.Clock',
162160
'/scan@sensor_msgs/msg/[email protected]',
163161
'/camera/color/image_raw@sensor_msgs/msg/[email protected]',
164162
'/camera_info@sensor_msgs/msg/[email protected]',
165163
],
166-
output='screen',
167164
)
168165

169166
container = ComposableNodeContainer(
170167
name='fake_raspimouse_container',
171168
namespace='',
172169
package='rclcpp_components',
173170
executable='component_container_mt',
171+
output='screen',
174172
composable_node_descriptions=[
175173
ComposableNode(
176174
package='raspimouse_fake',
177175
plugin='fake_raspimouse::Raspimouse',
178176
name='raspimouse',
179177
),
180178
],
181-
output='screen',
182179
)
183180

184181
return LaunchDescription(

raspimouse_gazebo/launch/raspimouse_with_lakehouse.launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ def generate_launch_description():
4242
launch_arguments={'world_name': world_file}.items(),
4343
)
4444

45-
return LaunchDescription(
46-
[SetParameter(name='use_sim_time', value=True), world_launch]
47-
)
45+
return LaunchDescription([SetParameter(name='use_sim_time', value=True), world_launch])

raspimouse_gazebo/launch/raspimouse_with_line_follower_field.launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,4 @@ def generate_launch_description():
4949
}.items(),
5050
)
5151

52-
return LaunchDescription(
53-
[SetParameter(name='use_sim_time', value=True), world_launch]
54-
)
52+
return LaunchDescription([SetParameter(name='use_sim_time', value=True), world_launch])

0 commit comments

Comments
 (0)