From 7a762f42bf7036c5ef0cd26f9e7f2af166d90694 Mon Sep 17 00:00:00 2001 From: satoshi-ota Date: Tue, 7 Nov 2023 14:45:01 +0900 Subject: [PATCH] refactor(launch): add new option to select planning preset Signed-off-by: satoshi-ota --- autoware_launch/launch/autoware.launch.xml | 7 +++++- .../tier4_planning_component.launch.xml | 24 +++++-------------- .../launch/e2e_simulator.launch.xml | 5 ++++ .../launch/logging_simulator.launch.xml | 5 ++++ .../launch/planning_simulator.launch.xml | 5 ++++ 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index 5d98c9388f..80822d0146 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -8,6 +8,9 @@ + + + @@ -98,7 +101,9 @@ - + + + diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml index 5f14006f7a..5fb17541cd 100644 --- a/autoware_launch/launch/components/tier4_planning_component.launch.xml +++ b/autoware_launch/launch/components/tier4_planning_component.launch.xml @@ -1,24 +1,8 @@ - - - - - - - - - - - - - - - - - - + + @@ -26,6 +10,7 @@ + @@ -34,6 +19,7 @@ + @@ -46,6 +32,7 @@ + @@ -68,6 +55,7 @@ + diff --git a/autoware_launch/launch/e2e_simulator.launch.xml b/autoware_launch/launch/e2e_simulator.launch.xml index fe8d1de1d8..d920584c6c 100644 --- a/autoware_launch/launch/e2e_simulator.launch.xml +++ b/autoware_launch/launch/e2e_simulator.launch.xml @@ -6,6 +6,9 @@ + + + @@ -43,6 +46,8 @@ + + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index 7eb13135d3..a2b66e91ed 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -7,6 +7,9 @@ + + + @@ -39,6 +42,8 @@ + + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index fdc86ebba7..28a0f0e347 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -6,6 +6,9 @@ + + + @@ -39,6 +42,8 @@ + +