Skip to content

Commit 14a27b5

Browse files
zulfaqar-azmi-t4zulfaqar-azmi-t4
committed
revert launcher changes
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
1 parent 281dd8a commit 14a27b5

File tree

2 files changed

+44
-47
lines changed

2 files changed

+44
-47
lines changed

‎launch/tier4_autoware_api_launch/launch/autoware_api.launch.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
</group>
3030

3131
<!-- rosbridge -->
32-
<!-- <group if="$(var rosbridge_enabled)"> -->
33-
<!-- <include file="$(find-pkg-share rosbridge_server)/launch/rosbridge_websocket_launch.xml"> -->
34-
<!-- <arg name="respawn" value="$(var rosbridge_respawn)"/> -->
35-
<!-- <arg name="max_message_size" value="$(var rosbridge_max_message_size)"/> -->
36-
<!-- </include> -->
37-
<!-- </group> -->
32+
<group if="$(var rosbridge_enabled)">
33+
<include file="$(find-pkg-share rosbridge_server)/launch/rosbridge_websocket_launch.xml">
34+
<arg name="respawn" value="$(var rosbridge_respawn)"/>
35+
<arg name="max_message_size" value="$(var rosbridge_max_message_size)"/>
36+
</include>
37+
</group>
3838
</launch>

‎launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml

+38-41
Original file line numberDiff line numberDiff line change
@@ -169,48 +169,45 @@
169169
/>
170170
<let name="behavior_velocity_planner_launch_modules" value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + '$(var launch_module_list_end)'&quot;)"/>
171171

172-
<node
173-
pkg="autoware_behavior_path_planner"
174-
exec="autoware_behavior_path_planner_node"
175-
name="behavior_path_planner"
176-
namespace=""
177-
launch-prefix="xterm -l -lf /home/zulfaqar/develop/aw.txt -e gdb -ex run --args"
178-
>
179-
<!-- topic remap -->
180-
<remap from="~/input/route" to="$(var input_route_topic_name)"/>
181-
<remap from="~/input/vector_map" to="$(var input_vector_map_topic_name)"/>
182-
<remap from="~/input/perception" to="/perception/object_recognition/objects"/>
183-
<remap from="~/input/occupancy_grid_map" to="/perception/occupancy_grid_map/map"/>
184-
<remap from="~/input/costmap" to="/planning/scenario_planning/parking/costmap_generator/occupancy_grid"/>
185-
<remap from="~/input/traffic_signals" to="$(var input_traffic_light_topic_name)"/>
186-
<remap from="~/input/odometry" to="/localization/kinematic_state"/>
187-
<remap from="~/input/accel" to="/localization/acceleration"/>
188-
<remap from="~/input/scenario" to="/planning/scenario_planning/scenario"/>
189-
<remap from="~/output/path" to="path_with_lane_id"/>
190-
<remap from="~/output/turn_indicators_cmd" to="/planning/turn_indicators_cmd"/>
191-
<remap from="~/output/hazard_lights_cmd" to="/planning/hazard_lights_cmd"/>
192-
<remap from="~/output/modified_goal" to="/planning/scenario_planning/modified_goal"/>
193-
<remap from="~/output/stop_reasons" to="/planning/scenario_planning/status/stop_reasons"/>
194-
<!-- params -->
195-
<param from="$(var common_param_path)"/>
196-
<param from="$(var vehicle_param_file)"/>
197-
<param from="$(var nearest_search_param_path)"/>
198-
<param name="launch_modules" value="$(var behavior_path_planner_launch_modules)"/>
199-
<param name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
200-
<param name="is_simulation" value="$(var is_simulation)"/>
201-
<param from="$(var behavior_path_planner_side_shift_module_param_path)"/>
202-
<param from="$(var behavior_path_planner_static_obstacle_avoidance_module_param_path)"/>
203-
<param from="$(var behavior_path_planner_avoidance_by_lc_module_param_path)"/>
204-
<param from="$(var behavior_path_planner_dynamic_obstacle_avoidance_module_param_path)"/>
205-
<param from="$(var behavior_path_planner_lane_change_module_param_path)"/>
206-
<param from="$(var behavior_path_planner_goal_planner_module_param_path)"/>
207-
<param from="$(var behavior_path_planner_start_planner_module_param_path)"/>
208-
<param from="$(var behavior_path_planner_sampling_planner_module_param_path)"/>
209-
<param from="$(var behavior_path_planner_drivable_area_expansion_param_path)"/>
210-
<param from="$(var behavior_path_planner_scene_module_manager_param_path)"/>
211-
<param from="$(var behavior_path_planner_common_param_path)"/>
212-
</node>
213172
<node_container pkg="rclcpp_components" exec="$(var container_type)" name="behavior_planning_container" namespace="" args="" output="both">
173+
<composable_node pkg="autoware_behavior_path_planner" plugin="autoware::behavior_path_planner::BehaviorPathPlannerNode" name="behavior_path_planner" namespace="">
174+
<!-- topic remap -->
175+
<remap from="~/input/route" to="$(var input_route_topic_name)"/>
176+
<remap from="~/input/vector_map" to="$(var input_vector_map_topic_name)"/>
177+
<remap from="~/input/perception" to="/perception/object_recognition/objects"/>
178+
<remap from="~/input/occupancy_grid_map" to="/perception/occupancy_grid_map/map"/>
179+
<remap from="~/input/costmap" to="/planning/scenario_planning/parking/costmap_generator/occupancy_grid"/>
180+
<remap from="~/input/traffic_signals" to="$(var input_traffic_light_topic_name)"/>
181+
<remap from="~/input/odometry" to="/localization/kinematic_state"/>
182+
<remap from="~/input/accel" to="/localization/acceleration"/>
183+
<remap from="~/input/scenario" to="/planning/scenario_planning/scenario"/>
184+
<remap from="~/output/path" to="path_with_lane_id"/>
185+
<remap from="~/output/turn_indicators_cmd" to="/planning/turn_indicators_cmd"/>
186+
<remap from="~/output/hazard_lights_cmd" to="/planning/hazard_lights_cmd"/>
187+
<remap from="~/output/modified_goal" to="/planning/scenario_planning/modified_goal"/>
188+
<remap from="~/output/stop_reasons" to="/planning/scenario_planning/status/stop_reasons"/>
189+
<!-- params -->
190+
<param from="$(var common_param_path)"/>
191+
<param from="$(var vehicle_param_file)"/>
192+
<param from="$(var nearest_search_param_path)"/>
193+
<param name="launch_modules" value="$(var behavior_path_planner_launch_modules)"/>
194+
<param name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
195+
<param name="is_simulation" value="$(var is_simulation)"/>
196+
<param from="$(var behavior_path_planner_side_shift_module_param_path)"/>
197+
<param from="$(var behavior_path_planner_static_obstacle_avoidance_module_param_path)"/>
198+
<param from="$(var behavior_path_planner_avoidance_by_lc_module_param_path)"/>
199+
<param from="$(var behavior_path_planner_dynamic_obstacle_avoidance_module_param_path)"/>
200+
<param from="$(var behavior_path_planner_lane_change_module_param_path)"/>
201+
<param from="$(var behavior_path_planner_goal_planner_module_param_path)"/>
202+
<param from="$(var behavior_path_planner_start_planner_module_param_path)"/>
203+
<param from="$(var behavior_path_planner_sampling_planner_module_param_path)"/>
204+
<param from="$(var behavior_path_planner_drivable_area_expansion_param_path)"/>
205+
<param from="$(var behavior_path_planner_scene_module_manager_param_path)"/>
206+
<param from="$(var behavior_path_planner_common_param_path)"/>
207+
<!-- composable node config -->
208+
<extra_arg name="use_intra_process_comms" value="false"/>
209+
</composable_node>
210+
214211
<composable_node pkg="autoware_behavior_velocity_planner" plugin="autoware::behavior_velocity_planner::BehaviorVelocityPlannerNode" name="behavior_velocity_planner" namespace="">
215212
<!-- topic remap -->
216213
<remap from="~/input/path_with_lane_id" to="path_with_lane_id"/>

0 commit comments

Comments
 (0)