Skip to content

Commit 156b1c0

Browse files
tier4-autoware-public-bot[bot]yuki-takagi-66sebekxSebastian Zęderowskixtk8532704
authored andcommitted
chore: sync awf-latest (#701)
* refactor(system_diagnostic_monitor, dummy_diag_publisher, diagnostic_graph_aggregator): combine diag list setting directories (autowarefoundation#1253) Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp> * feat(object_lanelet_filter): add configurable margin for object lanel… (autowarefoundation#1210) feat(object_lanelet_filter): add configurable margin for object lanelet filter Signed-off-by: Sebastian Zęderowski <szederowski@autonomous-systems.pl> Co-authored-by: Sebastian Zęderowski <szederowski@autonomous-systems.pl> * fix(rviz): fix a bug about visualizing ego model (autowarefoundation#1257) fix a visulization bug. Signed-off-by: temkei.kem <1041084556@qq.com> * refactor(glog_component): prefix package and namespace with autoware (autowarefoundation#1245) Signed-off-by: Esteve Fernandez <esteve@apache.org> * refactor(global_parameter_loader): prefix package and namespace with autoware (autowarefoundation#1246) Signed-off-by: Esteve Fernandez <esteve@apache.org> * feat(lane_change): add new lane change parameter (autowarefoundation#1224) * add minimum prepare duration parameter Signed-off-by: mohammad alqudah <alqudah.mohammad@tier4.jp> * increase min_prepare_duration to 1.0 s Signed-off-by: mohammad alqudah <alqudah.mohammad@tier4.jp> * increase min prepare duration value, add new parameter Signed-off-by: mohammad alqudah <alqudah.mohammad@tier4.jp> --------- Signed-off-by: mohammad alqudah <alqudah.mohammad@tier4.jp> --------- Signed-off-by: yuki-takagi-66 <yuki.takagi@tier4.jp> Signed-off-by: Sebastian Zęderowski <szederowski@autonomous-systems.pl> Signed-off-by: temkei.kem <1041084556@qq.com> Signed-off-by: Esteve Fernandez <esteve@apache.org> Signed-off-by: mohammad alqudah <alqudah.mohammad@tier4.jp> Co-authored-by: Yuki TAKAGI <141538661+yuki-takagi-66@users.noreply.github.com> Co-authored-by: Sebastian Zęderowski <sebek.x@gmail.com> Co-authored-by: Sebastian Zęderowski <szederowski@autonomous-systems.pl> Co-authored-by: Kem (TiankuiXian) <1041084556@qq.com> Co-authored-by: Esteve Fernandez <33620+esteve@users.noreply.github.com> Co-authored-by: mkquda <168697710+mkquda@users.noreply.github.com>
1 parent 0386f88 commit 156b1c0

5 files changed

+6
-6
lines changed

autoware_launch/launch/autoware.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<arg name="system_run_mode" default="online" description="run mode in system"/>
3939
<arg name="launch_system_monitor" default="true" description="launch system monitor"/>
4040
<arg name="launch_dummy_diag_publisher" default="false" description="launch dummy diag publisher"/>
41-
<arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/autoware-main.yaml" description="diagnostic graph config"/>
41+
<arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml" description="diagnostic graph config"/>
4242
<!-- Tools -->
4343
<arg name="rviz" default="true" description="launch rviz"/>
4444
<arg name="rviz_config_name" default="autoware.rviz" description="rviz config name"/>

autoware_launch/launch/components/tier4_system_component.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<launch>
33
<arg name="diagnostic_graph_aggregator_param_path" default="$(find-pkg-share diagnostic_graph_aggregator)/config/default.param.yaml"/>
4-
<arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/autoware-main.yaml"/>
4+
<arg name="diagnostic_graph_aggregator_graph_path" default="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
55

66
<!-- Depending on the sensor_model, different topics should be monitored -->
77
<let name="state_monitor_topic_yaml" value="topics_gen2.yaml" if="$(eval &quot;'aip_xx1_gen2' == '$(var sensor_model)'&quot;)"/>
@@ -18,7 +18,7 @@
1818
<arg name="processing_time_checker_param_path" value="$(find-pkg-share autoware_launch)/config/system/processing_time_checker/processing_time_checker.param.yaml"/>
1919
<arg name="mrm_comfortable_stop_operator_param_path" value="$(find-pkg-share autoware_launch)/config/system/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator.param.yaml"/>
2020
<arg name="mrm_emergency_stop_operator_param_path" value="$(find-pkg-share autoware_launch)/config/system/mrm_emergency_stop_operator/mrm_emergency_stop_operator.param.yaml"/>
21-
<arg name="dummy_diag_publisher_param_path" value="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/dummy_diag_publisher.param.yaml"/>
21+
<arg name="dummy_diag_publisher_param_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/dummy_diag_publisher.param.yaml"/>
2222
<arg name="system_monitor_cpu_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/cpu_monitor.param.yaml"/>
2323
<arg name="system_monitor_gpu_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/gpu_monitor.param.yaml"/>
2424
<arg name="system_monitor_hdd_monitor_param_path" value="$(find-pkg-share autoware_launch)/config/system/system_monitor/hdd_monitor.param.yaml"/>

autoware_launch/launch/e2e_simulator.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<!-- System -->
8888
<arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
8989
<arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
90-
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/autoware-awsim.yaml"/>
90+
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-awsim.yaml"/>
9191
<!-- Sensing -->
9292
<arg name="launch_sensing_driver" value="$(var launch_sensing_driver)"/>
9393
<!-- Perception-->

autoware_launch/launch/logging_simulator.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<arg name="system_run_mode" value="logging_simulation"/>
7171
<arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
7272
<arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
73-
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/autoware-main.yaml"/>
73+
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
7474
<!-- Map -->
7575
<arg name="lanelet2_map_file" value="$(var lanelet2_map_file)"/>
7676
<arg name="pointcloud_map_file" value="$(var pointcloud_map_file)"/>

autoware_launch/launch/planning_simulator.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<arg name="system_run_mode" value="planning_simulation"/>
7878
<arg name="launch_system_monitor" value="$(var launch_system_monitor)"/>
7979
<arg name="launch_dummy_diag_publisher" value="$(var launch_dummy_diag_publisher)"/>
80-
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/tier4_diagnostics/autoware-main.yaml"/>
80+
<arg name="diagnostic_graph_aggregator_graph_path" value="$(find-pkg-share autoware_launch)/config/system/diagnostics/autoware-main.yaml"/>
8181
<!-- Map -->
8282
<arg name="lanelet2_map_file" value="$(var lanelet2_map_file)"/>
8383
<arg name="pointcloud_map_file" value="$(var pointcloud_map_file)"/>

0 commit comments

Comments
 (0)