From 257b891df309e7e7f44f98a46a1bee5f162cc390 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 16:49:11 +0900 Subject: [PATCH 1/7] rename global_parameter_loader --- autoware_launch/launch/autoware.launch.xml | 2 +- autoware_launch/launch/logging_simulator.launch.xml | 2 +- autoware_launch/launch/planning_simulator.launch.xml | 2 +- autoware_launch/package.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index 5351d3f9f..25b94d019 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -12,7 +12,7 @@ - + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index f23ef0132..13261f768 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -26,7 +26,7 @@ - + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index 8738ca011..27228c3de 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -19,7 +19,7 @@ - + diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 381678775..788c76f2e 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -10,7 +10,7 @@ ament_cmake_auto autoware_api_launch - autoware_global_parameter_loader + global_parameter_loader autoware_web_controller control_launch localization_launch From 2867dbebf9f91072302791613f59f2a403d19bec Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 16:50:49 +0900 Subject: [PATCH 2/7] rename autoware_state_monitor --- system_launch/launch/system.launch.xml | 6 +++--- system_launch/package.xml | 2 +- system_launch/system_launch.drawio.svg | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/system_launch/launch/system.launch.xml b/system_launch/launch/system.launch.xml index 8ae917f30..15661a9e7 100644 --- a/system_launch/launch/system.launch.xml +++ b/system_launch/launch/system.launch.xml @@ -23,9 +23,9 @@ - - - + + + diff --git a/system_launch/package.xml b/system_launch/package.xml index b2150348e..11f7ac27f 100644 --- a/system_launch/package.xml +++ b/system_launch/package.xml @@ -11,7 +11,7 @@ ament_cmake_auto autoware_error_monitor - autoware_state_monitor + ad_service_state_monitor emergency_handler system_monitor diff --git a/system_launch/system_launch.drawio.svg b/system_launch/system_launch.drawio.svg index b22f00594..0bb4d9823 100644 --- a/system_launch/system_launch.drawio.svg +++ b/system_launch/system_launch.drawio.svg @@ -200,11 +200,11 @@
- autoware_state_monitor.launch.xml + ad_service_state_monitor.launch.xml

- package: autoware_state_monitor + package: ad_service_state_monitor

@@ -212,7 +212,7 @@
args: config_file = - autoware_state_monitor.param.yaml + ad_service_state_monitor.param.yaml
@@ -220,7 +220,7 @@
- autoware_state_monitor.launch.xml... + ad_service_state_monitor.launch.xml... @@ -231,11 +231,11 @@
- autoware_state_monitor.launch.xml + ad_service_state_monitor.launch.xml

- package: autoware_state_monitor + package: ad_service_state_monitor

@@ -243,7 +243,7 @@
args: config_file = - autoware_state_monitor.planning_simulation.param.yaml + ad_service_state_monitor.planning_simulation.param.yaml
@@ -251,7 +251,7 @@
- autoware_state_monitor.launch.xml... + ad_service_state_monitor.launch.xml... @@ -405,4 +405,4 @@ - \ No newline at end of file + From d0d7214ae5bf26949d15b816004378e41d494313 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 16:51:29 +0900 Subject: [PATCH 3/7] rename autoware_error_monitor --- system_launch/launch/system.launch.xml | 6 +++--- system_launch/package.xml | 2 +- system_launch/system_launch.drawio.svg | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/system_launch/launch/system.launch.xml b/system_launch/launch/system.launch.xml index 15661a9e7..1eb54a4a5 100644 --- a/system_launch/launch/system.launch.xml +++ b/system_launch/launch/system.launch.xml @@ -30,9 +30,9 @@ - - - + + + diff --git a/system_launch/package.xml b/system_launch/package.xml index 11f7ac27f..15cd3348b 100644 --- a/system_launch/package.xml +++ b/system_launch/package.xml @@ -10,7 +10,7 @@ ament_cmake_auto - autoware_error_monitor + system_error_monitor ad_service_state_monitor emergency_handler system_monitor diff --git a/system_launch/system_launch.drawio.svg b/system_launch/system_launch.drawio.svg index 0bb4d9823..bc039dbba 100644 --- a/system_launch/system_launch.drawio.svg +++ b/system_launch/system_launch.drawio.svg @@ -317,11 +317,11 @@
- autoware_error_monitor.launch.xml + system_error_monitor.launch.xml

- package: autoware_error_monitor + package: system_error_monitor

@@ -329,7 +329,7 @@
args: config_file = - autoware_error_monitor.param.yaml + system_error_monitor.param.yaml
@@ -337,7 +337,7 @@
- autoware_error_monitor.launch.xml... + system_error_monitor.launch.xml... @@ -348,11 +348,11 @@
- autoware_error_monitor.launch.xml + system_error_monitor.launch.xml

- package: autoware_error_monitor + package: system_error_monitor

@@ -360,7 +360,7 @@
args: config_file = - autoware_error_monitor.planning_simulation.param.yaml + system_error_monitor.planning_simulation.param.yaml
@@ -368,7 +368,7 @@
- autoware_error_monitor.launch.xml... + system_error_monitor.launch.xml... From f5243e183c100b66644c9b82e91820f55a201595 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 16:53:48 +0900 Subject: [PATCH 4/7] rename autoware_web_controller --- autoware_launch/autoware_launch.drawio.svg | 2 +- autoware_launch/launch/autoware.launch.xml | 2 +- autoware_launch/launch/logging_simulator.launch.xml | 2 +- autoware_launch/launch/planning_simulator.launch.xml | 2 +- autoware_launch/package.xml | 2 +- integration_launch/package.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/autoware_launch/autoware_launch.drawio.svg b/autoware_launch/autoware_launch.drawio.svg index 808a956be..b0f7660b0 100644 --- a/autoware_launch/autoware_launch.drawio.svg +++ b/autoware_launch/autoware_launch.drawio.svg @@ -1,4 +1,4 @@ -
autoware.launch.xml

package: autoware_launch
autoware.launch.xml...
launch name

package: package name
launch name...
ex:
ex:
node name

package: package name
node name...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle.launch.xml

package: vehicle_launch
vehicle.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
localization.launch.xml

package: localization_launch
localization.launch.xml...
perception.launch.xml

package: perception_launch
perception.launch.xml...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
awapi_awiv_adapter.launch.xml

package: control_launch
awapi_awiv_adapter.launch.xml...
autoware_web_controller.launch.xml

package: control_launch
autoware_web_controller.launch.xml...
clock_publisher.launch.xml

package: control_launch
clock_publisher.launch.xml...
rviz2

package: rviz2
rviz2...
planning_simulator.xml

package: autoware_launch
planning_simulator.xml...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle.launch.xml

package: vehicle_launch
vehicle.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
awapi_awiv_adapter.launch.xml

package: control_launch
awapi_awiv_adapter.launch.xml...
autoware_web_controller.launch.xml

package: control_launch
autoware_web_controller.launch.xml...
clock_publisher.launch.xml

package: control_launch
clock_publisher.launch.xml...
rviz2

package: rviz2
rviz2...
logging_simulator.launch.xml

package: autoware_launch
logging_simulator.launch.xml...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle_description.launch.xml

package: vehicle_launch
vehicle_description.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
perception.launch.xml

package: perception_launch
perception.launch.xml...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
autoware_web_controller.launch.xml

package: control_launch
autoware_web_controller.launch.xml...
rviz2

package: rviz2
rviz2...
$(var vehicle)
$(var vehicle)
True
True
$(var system)
$(var system)
True
True
$(var map)
$(var map)
True
True
sensing.launch.xml

package: sensing_launch
sensing.launch.xml...
sensing.launch.xml

package: sensing_launch
sensing.launch.xml...
$(var sensing)
$(var sensing)
True
True
localization.launch.xml

package: localization_launch
localization.launch.xml...
$(var localization)
$(var localization)
True
True
$(var perception)
$(var perception)
True
True
$(var planning)
$(var planning)
True
True
$(var control)
$(var control)
True
True
simulator.launch.xml

package: simulator_launch
simulator.launch.xml...
simulator.launch.xml

package: simulator_launch
simulator.launch.xml...
Viewer does not support full SVG 1.1
\ No newline at end of file +
autoware.launch.xml

package: autoware_launch
autoware.launch.xml...
launch name

package: package name
launch name...
ex:
ex:
node name

package: package name
node name...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle.launch.xml

package: vehicle_launch
vehicle.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
localization.launch.xml

package: localization_launch
localization.launch.xml...
perception.launch.xml

package: perception_launch
perception.launch.xml...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
awapi_awiv_adapter.launch.xml

package: control_launch
awapi_awiv_adapter.launch.xml...
web_controller.launch.xml

package: control_launch
web_controller.launch.xml...
clock_publisher.launch.xml

package: control_launch
clock_publisher.launch.xml...
rviz2

package: rviz2
rviz2...
planning_simulator.xml

package: autoware_launch
planning_simulator.xml...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle.launch.xml

package: vehicle_launch
vehicle.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
awapi_awiv_adapter.launch.xml

package: control_launch
awapi_awiv_adapter.launch.xml...
web_controller.launch.xml

package: control_launch
web_controller.launch.xml...
clock_publisher.launch.xml

package: control_launch
clock_publisher.launch.xml...
rviz2

package: rviz2
rviz2...
logging_simulator.launch.xml

package: autoware_launch
logging_simulator.launch.xml...
vehicle_info_launch.py

package: vehicle_launch
vehicle_info_launch.py...
vehicle_description.launch.xml

package: vehicle_launch
vehicle_description.launch.xml...
system.launch.xml

package: system_launch
system.launch.xml...
map.launch.py

package: map_launch
map.launch.py...
perception.launch.xml

package: perception_launch
perception.launch.xml...
planning.launch.xml

package: planning_launch
planning.launch.xml...
control.launch.py

package: control_launch
control.launch.py...
web_controller.launch.xml

package: control_launch
web_controller.launch.xml...
rviz2

package: rviz2
rviz2...
$(var vehicle)
$(var vehicle)
True
True
$(var system)
$(var system)
True
True
$(var map)
$(var map)
True
True
sensing.launch.xml

package: sensing_launch
sensing.launch.xml...
sensing.launch.xml

package: sensing_launch
sensing.launch.xml...
$(var sensing)
$(var sensing)
True
True
localization.launch.xml

package: localization_launch
localization.launch.xml...
$(var localization)
$(var localization)
True
True
$(var perception)
$(var perception)
True
True
$(var planning)
$(var planning)
True
True
$(var control)
$(var control)
True
True
simulator.launch.xml

package: simulator_launch
simulator.launch.xml...
simulator.launch.xml

package: simulator_launch
simulator.launch.xml...
Viewer does not support full SVG 1.1
diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index 25b94d019..71a7c54eb 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -84,6 +84,6 @@ - + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index 13261f768..90c2813f9 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -118,7 +118,7 @@ - + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index 27228c3de..94fff17ea 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -62,7 +62,7 @@ - + diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 788c76f2e..1959cce25 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -11,7 +11,7 @@ autoware_api_launch global_parameter_loader - autoware_web_controller + web_controller control_launch localization_launch map_launch diff --git a/integration_launch/package.xml b/integration_launch/package.xml index 118963ab7..8822fd01f 100644 --- a/integration_launch/package.xml +++ b/integration_launch/package.xml @@ -8,7 +8,7 @@ Apache 2 ament_cmake_auto - autoware_web_controller + web_controller control_launch localization_launch map_launch From 6cb2cb84934a2e3b57c67095b95fdac206dfc885 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 16:57:55 +0900 Subject: [PATCH 5/7] rename autoware_api_msgs --- .../launch/include/internal_api_relay.launch.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoware_api_launch/launch/include/internal_api_relay.launch.xml b/autoware_api_launch/launch/include/internal_api_relay.launch.xml index 46859d0fb..810e6a566 100644 --- a/autoware_api_launch/launch/include/internal_api_relay.launch.xml +++ b/autoware_api_launch/launch/include/internal_api_relay.launch.xml @@ -9,12 +9,12 @@ - + - + From e196cb0658330a975333bd5d9738516bf1fc3d52 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Wed, 15 Dec 2021 17:28:53 +0900 Subject: [PATCH 6/7] rename autoware_localization_rviz_plugin --- autoware_launch/rviz/autoware.rviz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz index 9074177c8..0486b0dbb 100644 --- a/autoware_launch/rviz/autoware.rviz +++ b/autoware_launch/rviz/autoware.rviz @@ -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 From d829a1e10b7c12b3bbb0d35b762578cd33455032 Mon Sep 17 00:00:00 2001 From: 1222-takeshi Date: Thu, 16 Dec 2021 09:39:03 +0900 Subject: [PATCH 7/7] fix pre-commit --- autoware_launch/package.xml | 4 ++-- integration_launch/package.xml | 2 +- system_launch/package.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoware_launch/package.xml b/autoware_launch/package.xml index 1959cce25..ff6f4dba9 100644 --- a/autoware_launch/package.xml +++ b/autoware_launch/package.xml @@ -10,9 +10,8 @@ ament_cmake_auto autoware_api_launch - global_parameter_loader - web_controller control_launch + global_parameter_loader localization_launch map_launch perception_launch @@ -24,6 +23,7 @@ simulator_launch system_launch vehicle_launch + web_controller ament_lint_auto autoware_lint_common diff --git a/integration_launch/package.xml b/integration_launch/package.xml index 8822fd01f..07cf7e3a1 100644 --- a/integration_launch/package.xml +++ b/integration_launch/package.xml @@ -8,7 +8,6 @@ Apache 2 ament_cmake_auto - web_controller control_launch localization_launch map_launch @@ -20,6 +19,7 @@ sensing_launch system_launch vehicle_launch + web_controller ament_lint_auto autoware_lint_common diff --git a/system_launch/package.xml b/system_launch/package.xml index 15cd3348b..7f8169ed5 100644 --- a/system_launch/package.xml +++ b/system_launch/package.xml @@ -10,9 +10,9 @@ ament_cmake_auto - system_error_monitor ad_service_state_monitor emergency_handler + system_error_monitor system_monitor ament_lint_auto