Skip to content

Commit c332df5

Browse files
committed
removed tasksets from launch files
used `rg -n -i --glob '**/*.launch' 'task[ _-]*set' .` command to find and check for term
1 parent c143e7e commit c332df5

19 files changed

Lines changed: 32 additions & 80 deletions

File tree

src/bitbots_behavior/bitbots_body_behavior/launch/behavior.launch

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
<arg name="tf_prefix" default=""/>
44
<arg name="sim" default="false" />
55

6-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 2"/>
7-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
86

9-
<node pkg="bitbots_body_behavior" exec="body_behavior" output="screen" launch-prefix="$(var taskset)" respawn="true">
7+
<node pkg="bitbots_body_behavior" exec="body_behavior" output="screen" respawn="true">
108
<param name="dsd_file" value="$(var dsd_file)"/>
119
<param name="actionlib_client_sub_queue_size" value="-1"/>
1210
<param name="actionlib_client_sub_queue_size" value="-1"/>

src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
<arg name="only_pressure" default="false"/>
77
<arg name="tts" default="true" description="Whether to speak" />
88

9-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 0"/>
10-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
11-
12-
<node pkg="bitbots_ros_control" exec="ros_control" output="screen" launch-prefix="$(var taskset)">
9+
<node pkg="bitbots_ros_control" exec="ros_control" output="screen" >
1310
<param from="$(find-pkg-share bitbots_ros_control)/config/wolfgang.yaml" />
1411
<param name="torqueless_mode" value="$(var torqueless_mode)"/>
1512
<param name="only_imu" value="$(var only_imu)"/>

src/bitbots_misc/bitbots_basler_camera/launch/basler_camera.launch

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<launch>
3-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 7"/>
4-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
53

6-
<node pkg="bitbots_basler_camera" exec="basler_camera" name="basler_camera_driver" output="screen" launch-prefix="$(var taskset)">
4+
<node pkg="bitbots_basler_camera" exec="basler_camera" name="basler_camera_driver" output="screen" >
75
<param name="device_user_id" value="$(env ROBOT_NAME default)" />
86
<param name="camera_info_url" value="package://bitbots_basler_camera/config/camera_calibration_$(env ROBOT_NAME default).yaml" />
97
</node>

src/bitbots_misc/bitbots_ceiling_cam/launch/ceiling_cam.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<node pkg="tf2_ros" exec="static_transform_publisher" name="field_mount" args="--x -0.051 --y -0.113 --z 3.370 --qx -0.997 --qy -0.012 --qz 0.070 --qw 0.026 --frame-id ceiling_cam --child-frame-id field" />
44

55
<!-- camera driver -->
6-
<node pkg="bitbots_basler_camera" exec="basler_camera" name="ceiling_cam_publisher" output="screen" launch-prefix="$(var taskset)">
6+
<node pkg="bitbots_basler_camera" exec="basler_camera" name="ceiling_cam_publisher" output="screen" >
77
<param from="$(find-pkg-share bitbots_ceiling_cam)/config/camera_settings_ceiling_cam.yaml">
88
<remap from="/camera/image_proc" to="/ceiling_cam/ceiling_cam_publisher/image_proc"/>
99
<remap from="/camera/camera_info" to="/ceiling_cam/ceiling_cam_publisher/camera_info"/>
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<launch>
22
<arg name="sim" default="false" description="Disables some checks for hardware, since we are in simulation."/>
3-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
4-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
53

6-
<node pkg="bitbots_animation_server" exec="animation_node" output="screen" launch-prefix="$(var taskset)">
4+
<node pkg="bitbots_animation_server" exec="animation_node" output="screen" >
75
<param name="use_sim_time" value="$(var sim)" />
86
</node>
9-
</launch>
7+
</launch>
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<launch>
22
<arg name="sim" default="false"/>
3-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
4-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
53

64
<group unless="$(var sim)">
75
<include file="$(find-pkg-share bitbots_ros_control)/launch/ros_control.launch" />
@@ -10,6 +8,6 @@
108
<include file="$(find-pkg-share bitbots_parameter_blackboard)/launch/parameter_blackboard.launch" />
119
<include file="$(find-pkg-share bitbots_robot_description)/launch/load_robot_description.launch" />
1210

13-
<node pkg="bitbots_animation_server" exec="animation_node" output="screen" launch-prefix="$(var taskset)"/>
14-
<node name="animation_hcm_bridge" pkg="bitbots_animation_server" exec="animation_hcm_bridge.py" output="screen" launch-prefix="$(var taskset)"/>
11+
<node pkg="bitbots_animation_server" exec="animation_node" output="screen"/>
12+
<node name="animation_hcm_bridge" pkg="bitbots_animation_server" exec="animation_hcm_bridge.py" output="screen" />
1513
</launch>

src/bitbots_motion/bitbots_dynamic_kick/launch/dynamic_kick.launch

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
<arg name="viz" default="false"/>
44
<let name="tf_prefix" value="$(eval '\'$(env ROS_NAMESPACE not_defined)\' if \'$(env ROS_NAMESPACE not_defined)\' != \'not_defined\' else \'\'')"/>
55

6-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
7-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
8-
9-
<group unless="$(var sim)">
10-
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" launch-prefix="$(var taskset)">
6+
<group unless="$(var sim)"
7+
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" >
118
<param from="$(find-pkg-share bitbots_dynamic_kick)/config/kick_config.yaml" />
129
</node>
1310
</group>
1411

1512
<group if="$(var sim)">
16-
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" launch-prefix="$(var taskset)">
13+
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" >
1714
<param from="$(find-pkg-share bitbots_dynamic_kick)/config/kick_sim_config.yaml" />
1815
<param name="use_sim_time" value="true"/>
1916
</node>

src/bitbots_motion/bitbots_dynamic_kick/launch/test.launch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<arg name="sim" default="false"/>
44
<arg name="viz" default="false"/>
55

6-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
7-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
86

97
<include file="$(find-pkg-share bitbots_parameter_blackboard)/launch/parameter_blackboard.launch" >
108
<arg name="sim" value="$(var sim)"/>
@@ -29,22 +27,22 @@
2927
<group unless="$(var sim)">
3028
<group unless="$(var viz)">
3129
<include file="$(find-pkg-share bitbots_ros_control)/launch/ros_control.launch" />
32-
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" launch-prefix="$(var taskset)">
30+
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" >
3331
<remap from="/kick_motor_goals" to="/DynamixelController/command"/>
3432
<param from="$(find-pkg-share bitbots_dynamic_kick)/config/kick_config.yaml" />
3533
</node>
3634
</group>
3735
</group>
3836

3937
<group if="$(var sim)">
40-
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" launch-prefix="$(var taskset)">
38+
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" >
4139
<remap from="/kick_motor_goals" to="/DynamixelController/command"/>
4240
<param from="$(find-pkg-share bitbots_dynamic_kick)/config/kick_sim_config.yaml" />
4341
</node>
4442
</group>
4543

4644
<group if="$(var viz)">
47-
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" launch-prefix="$(var taskset)">
45+
<node pkg="bitbots_dynamic_kick" exec="KickNode" output="screen" >
4846
<param from="$(find-pkg-share bitbots_dynamic_kick)/config/kick_sim_config.yaml" />
4947
</node>
5048
<node pkg="bitbots_utils" exec="motor_goals_viz_helper.py" output="screen" args="--kick" />

src/bitbots_motion/bitbots_dynup/launch/dynup.launch

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<launch>
22
<let name="tf_prefix" value="$(eval '\'$(env ROS_NAMESPACE not_defined)\' if \'$(env ROS_NAMESPACE not_defined)\' != \'not_defined\' else \'\'')"/>
33
<arg name="sim" default="false"/>
4-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
5-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
64

75
<group unless="$(var sim)">
8-
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" launch-prefix="$(var taskset)">
6+
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" >
97
<param name="base_link_frame" value="$(var tf_prefix)base_link"/>
108
<param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
119
<param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>
@@ -14,7 +12,7 @@
1412
</node>
1513
</group>
1614
<group if="$(var sim)">
17-
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" launch-prefix="$(var taskset)">
15+
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" >
1816
<param name="base_link_frame" value="$(var tf_prefix)base_link"/>
1917
<param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
2018
<param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>

src/bitbots_motion/bitbots_dynup/launch/test.launch

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<arg name="viz" default="false"/>
66
<arg name="robot_type" default="wolfgang"/>
77

8-
<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 3,4"/>
9-
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
10-
118
<include file="$(find-pkg-share bitbots_parameter_blackboard)/launch/parameter_blackboard.launch" >
129
<arg name="sim" value="$(var sim)"/>
1310
</include>
@@ -20,7 +17,7 @@
2017
<group unless="$(var sim)">
2118
<group unless="$(var viz)">
2219
<include file="$(find-pkg-share bitbots_ros_control)/launch/ros_control.launch" />
23-
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" launch-prefix="$(var taskset)">
20+
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" >
2421
<param name="base_link_frame" value="$(var tf_prefix)base_link"/>
2522
<param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
2623
<param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>
@@ -33,7 +30,7 @@
3330
</group>
3431

3532
<group if="$(var sim)">
36-
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" launch-prefix="$(var taskset)">
33+
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" >
3734
<param name="base_link_frame" value="$(var tf_prefix)base_link"/>
3835
<param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
3936
<param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>
@@ -46,7 +43,7 @@
4643

4744
<group if="$(var viz)">
4845
<node pkg="bitbots_utils" exec="motor_goals_viz_helper.py" args="--all" />
49-
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" launch-prefix="$(var taskset)">
46+
<node pkg="bitbots_dynup" exec="DynupNode" output="screen" >
5047
<param name="base_link_frame" value="$(var tf_prefix)base_link"/>
5148
<param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
5249
<param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>

0 commit comments

Comments
 (0)