Skip to content

Commit

Permalink
Rename some packages references (#157)
Browse files Browse the repository at this point in the history
  • Loading branch information
1222-takeshi authored Dec 16, 2021
1 parent 7315765 commit c391b46
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<node pkg="topic_tools" exec="relay" name="intersection_states">
<param name="input_topic" value="/api/autoware/set/intersection_states"/>
<param name="output_topic" value="/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/input/external_intersection_states"/>
<param name="type" value="autoware_api_msgs/msg/IntersectionStatus"/>
<param name="type" value="tier4_api_msgs/msg/IntersectionStatus"/>
</node>
<node pkg="topic_tools" exec="relay" name="crosswalk_states">
<param name="input_topic" value="/api/autoware/set/crosswalk_states"/>
<param name="output_topic" value="/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/input/external_crosswalk_states"/>
<param name="type" value="autoware_api_msgs/msg/CrosswalkStatus"/>
<param name="type" value="tier4_api_msgs/msg/CrosswalkStatus"/>
</node>
<!-- TODO(Takagi, Isamu): workaround for topic check -->
<node pkg="topic_tools" exec="relay" name="initial_pose_2d">
Expand Down
2 changes: 1 addition & 1 deletion autoware_launch/autoware_launch.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions autoware_launch/launch/autoware.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arg name="pointcloud_map_file" default="pointcloud_map.pcd" description="pointcloud map file name"/>

<!-- Global parameters -->
<include file="$(find-pkg-share autoware_global_parameter_loader)/launch/global_params.launch.py">
<include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
</include>

Expand Down Expand Up @@ -84,6 +84,6 @@
</node>

<!-- Web Controller -->
<include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" />
<include file="$(find-pkg-share web_controller)/launch/web_controller.launch.xml" />

</launch>
4 changes: 2 additions & 2 deletions autoware_launch/launch/logging_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<arg name="scenario_simulation" default="false" description="use scenario simulation"/>

<!-- Global parameters -->
<include file="$(find-pkg-share autoware_global_parameter_loader)/launch/global_params.launch.py">
<include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
<arg name="use_sim_time" value="true" />
<arg name="vehicle_model" value="$(var vehicle_model)"/>
</include>
Expand Down Expand Up @@ -118,7 +118,7 @@

<!-- Web Controller -->
<group>
<include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" />
<include file="$(find-pkg-share web_controller)/launch/web_controller.launch.xml" />
</group>

<!-- Simulator -->
Expand Down
4 changes: 2 additions & 2 deletions autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<arg name="vehicle_simulation" default="true" description="use vehicle simulation"/>

<!-- Global parameters -->
<include file="$(find-pkg-share autoware_global_parameter_loader)/launch/global_params.launch.py">
<include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
</include>

Expand Down Expand Up @@ -62,7 +62,7 @@
<node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)"/>

<!-- Web Controller -->
<include file="$(find-pkg-share autoware_web_controller)/launch/autoware_web_controller.launch.xml" unless="$(var scenario_simulation)"/>
<include file="$(find-pkg-share web_controller)/launch/web_controller.launch.xml" unless="$(var scenario_simulation)"/>

<!-- Simulator -->
<include file="$(find-pkg-share simulator_launch)/launch/simulator.launch.xml">
Expand Down
4 changes: 2 additions & 2 deletions autoware_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>

<exec_depend>autoware_api_launch</exec_depend>
<exec_depend>autoware_global_parameter_loader</exec_depend>
<exec_depend>autoware_web_controller</exec_depend>
<exec_depend>control_launch</exec_depend>
<exec_depend>global_parameter_loader</exec_depend>
<exec_depend>localization_launch</exec_depend>
<exec_depend>map_launch</exec_depend>
<exec_depend>perception_launch</exec_depend>
Expand All @@ -24,6 +23,7 @@
<exec_depend>simulator_launch</exec_depend>
<exec_depend>system_launch</exec_depend>
<exec_depend>vehicle_launch</exec_depend>
<exec_depend>web_controller</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion autoware_launch/rviz/autoware.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Panels:
Expanded: ~
Name: Views
Splitter Ratio: 0.5
- Class: autoware_localization_rviz_plugin/InitialPoseButtonPanel
- Class: tier4_localization_rviz_plugin/InitialPoseButtonPanel
Name: InitialPoseButtonPanel
- Class: rviz_common/Time
Experimental: false
Expand Down
2 changes: 1 addition & 1 deletion integration_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<license>Apache 2</license>
<buildtool_depend>ament_cmake_auto</buildtool_depend>

<exec_depend>autoware_web_controller</exec_depend>
<exec_depend>control_launch</exec_depend>
<exec_depend>localization_launch</exec_depend>
<exec_depend>map_launch</exec_depend>
Expand All @@ -20,6 +19,7 @@
<exec_depend>sensing_launch</exec_depend>
<exec_depend>system_launch</exec_depend>
<exec_depend>vehicle_launch</exec_depend>
<exec_depend>web_controller</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
12 changes: 6 additions & 6 deletions system_launch/launch/system.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
</group>

<!-- State Monitor -->
<let name="config_file" value="$(find-pkg-share autoware_state_monitor)/config/autoware_state_monitor.param.yaml" if="$(eval &quot;'$(var run_mode)'=='online'&quot;)"/>
<let name="config_file" value="$(find-pkg-share autoware_state_monitor)/config/autoware_state_monitor.planning_simulation.param.yaml" if="$(eval &quot;'$(var run_mode)'=='planning_simulation'&quot;)"/>
<include file="$(find-pkg-share autoware_state_monitor)/launch/autoware_state_monitor.launch.xml">
<let name="config_file" value="$(find-pkg-share ad_service_state_monitor)/config/ad_service_state_monitor.param.yaml" if="$(eval &quot;'$(var run_mode)'=='online'&quot;)"/>
<let name="config_file" value="$(find-pkg-share ad_service_state_monitor)/config/ad_service_state_monitor.planning_simulation.param.yaml" if="$(eval &quot;'$(var run_mode)'=='planning_simulation'&quot;)"/>
<include file="$(find-pkg-share ad_service_state_monitor)/launch/ad_service_state_monitor.launch.xml">
<arg name="config_file" value="$(var config_file)" />
</include>

<!-- Error Monitor -->
<let name="config_file" value="$(find-pkg-share autoware_error_monitor)/config/autoware_error_monitor.param.yaml" if="$(eval &quot;'$(var run_mode)'=='online'&quot;)"/>
<let name="config_file" value="$(find-pkg-share autoware_error_monitor)/config/autoware_error_monitor.planning_simulation.param.yaml" if="$(eval &quot;'$(var run_mode)'=='planning_simulation'&quot;)"/>
<include file="$(find-pkg-share autoware_error_monitor)/launch/autoware_error_monitor.launch.xml">
<let name="config_file" value="$(find-pkg-share system_error_monitor)/config/system_error_monitor.param.yaml" if="$(eval &quot;'$(var run_mode)'=='online'&quot;)"/>
<let name="config_file" value="$(find-pkg-share system_error_monitor)/config/system_error_monitor.planning_simulation.param.yaml" if="$(eval &quot;'$(var run_mode)'=='planning_simulation'&quot;)"/>
<include file="$(find-pkg-share system_error_monitor)/launch/system_error_monitor.launch.xml">
<arg name="config_file" value="$(var config_file)" />
<arg name="extra_agg_config_file_sensing" value="$(var sensor_launch_pkg)/config/diagnostic_aggregator/sensor_kit.param.yaml" />
<arg name="extra_agg_config_file_vehicle" value="$(find-pkg-share system_launch)/config/diagnostic_aggregator/vehicle.param.yaml" />
Expand Down
4 changes: 2 additions & 2 deletions system_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<exec_depend>autoware_error_monitor</exec_depend>
<exec_depend>autoware_state_monitor</exec_depend>
<exec_depend>ad_service_state_monitor</exec_depend>
<exec_depend>emergency_handler</exec_depend>
<exec_depend>system_error_monitor</exec_depend>
<exec_depend>system_monitor</exec_depend>

<test_depend>ament_lint_auto</test_depend>
Expand Down
34 changes: 17 additions & 17 deletions system_launch/system_launch.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c391b46

Please sign in to comment.