From 708274116eeede1b196d6706762ccc69aabd1c89 Mon Sep 17 00:00:00 2001 From: "jack.song" Date: Fri, 8 Dec 2023 15:08:26 +0800 Subject: [PATCH 1/5] fix:add system msg Signed-off-by: jack.song --- autoware_system_msgs/CMakeLists.txt | 26 ++++++++++++++++ autoware_system_msgs/msg/AutowareState.msg | 9 ++++++ autoware_system_msgs/msg/HazardStatus.msg | 11 +++++++ .../msg/HazardStatusStamped.msg | 2 ++ autoware_system_msgs/package.xml | 31 +++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 autoware_system_msgs/CMakeLists.txt create mode 100644 autoware_system_msgs/msg/AutowareState.msg create mode 100644 autoware_system_msgs/msg/HazardStatus.msg create mode 100644 autoware_system_msgs/msg/HazardStatusStamped.msg create mode 100644 autoware_system_msgs/package.xml diff --git a/autoware_system_msgs/CMakeLists.txt b/autoware_system_msgs/CMakeLists.txt new file mode 100644 index 0000000..9e43191 --- /dev/null +++ b/autoware_system_msgs/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.5) +project(autoware_planning_msgs) + +find_package(ament_cmake_auto REQUIRED) +ament_auto_find_build_dependencies() + +rosidl_generate_interfaces(${PROJECT_NAME} + "msg/AutowareState.msg" + "msg/HazardStatus.msg" + "msg/HazardStatusStamped.msg" + DEPENDENCIES + geometry_msgs + std_msgs + unique_identifier_msgs + nav_msgs + builtin_interfaces + diagnostic_msgs + ADD_LINTER_TESTS +) + +if(BUILD_TESTING) + find_package(ament_lint_auto REQUIRED) + ament_lint_auto_find_test_dependencies() +endif() + +ament_auto_package() diff --git a/autoware_system_msgs/msg/AutowareState.msg b/autoware_system_msgs/msg/AutowareState.msg new file mode 100644 index 0000000..269f15b --- /dev/null +++ b/autoware_system_msgs/msg/AutowareState.msg @@ -0,0 +1,9 @@ +uint8 INITIALIZING = 1 +uint8 WAITING_FOR_ROUTE = 2 +uint8 PLANNING = 3 +uint8 WAITING_FOR_ENGAGE = 4 +uint8 DRIVING = 5 +uint8 ARRIVED_GOAL = 6 +uint8 FINALIZING = 7 +builtin_interfaces/Time stamp +uint8 state \ No newline at end of file diff --git a/autoware_system_msgs/msg/HazardStatus.msg b/autoware_system_msgs/msg/HazardStatus.msg new file mode 100644 index 0000000..81447ad --- /dev/null +++ b/autoware_system_msgs/msg/HazardStatus.msg @@ -0,0 +1,11 @@ +uint8 NO_FAULT = 0 +uint8 SAFE_FAULT = 1 +uint8 LATENT_FAULT = 2 +uint8 SINGLE_POINT_FAULT = 3 +uint8 level; +boolean emergency +boolean emergency_holding +diagnostic_msgs/DiagnosticStatus[] diag_no_fault +diagnostic_msgs/DiagnosticStatus[] diag_safe_fault +diagnostic_msgs/DiagnosticStatus[] diag_latent_fault +diagnostic_msgs/DiagnosticStatus[] diag_single_point_fault \ No newline at end of file diff --git a/autoware_system_msgs/msg/HazardStatusStamped.msg b/autoware_system_msgs/msg/HazardStatusStamped.msg new file mode 100644 index 0000000..bc4c08a --- /dev/null +++ b/autoware_system_msgs/msg/HazardStatusStamped.msg @@ -0,0 +1,2 @@ +builtin_interfaces/Time stamp +autoware_system_msgs/HazardStatus status \ No newline at end of file diff --git a/autoware_system_msgs/package.xml b/autoware_system_msgs/package.xml new file mode 100644 index 0000000..267b15e --- /dev/null +++ b/autoware_system_msgs/package.xml @@ -0,0 +1,31 @@ + + + + autoware_planning_msgs + 0.0.0 + Autoware planning messages package. + Takagi, Isamu + Apache License 2.0 + + ament_cmake_auto + + rosidl_default_generators + + builtin_interfaces + geometry_msgs + nav_msgs + std_msgs + unique_identifier_msgs + diagnostic_msgs + + rosidl_default_runtime + + ament_lint_auto + ament_lint_common + + rosidl_interface_packages + + + ament_cmake + + From 07334852c9fc220bae74b5fe41c4c7ce0288c07a Mon Sep 17 00:00:00 2001 From: "jack.song" Date: Tue, 12 Dec 2023 13:19:15 +0800 Subject: [PATCH 2/5] fix:add system msgs Signed-off-by: jack.song --- autoware_system_msgs/CMakeLists.txt | 2 +- autoware_system_msgs/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autoware_system_msgs/CMakeLists.txt b/autoware_system_msgs/CMakeLists.txt index 9e43191..159326a 100644 --- a/autoware_system_msgs/CMakeLists.txt +++ b/autoware_system_msgs/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(autoware_planning_msgs) +project(autoware_system_msgs) find_package(ament_cmake_auto REQUIRED) ament_auto_find_build_dependencies() diff --git a/autoware_system_msgs/package.xml b/autoware_system_msgs/package.xml index 267b15e..6e2eda5 100644 --- a/autoware_system_msgs/package.xml +++ b/autoware_system_msgs/package.xml @@ -1,9 +1,9 @@ - autoware_planning_msgs + autoware_system_msgs 0.0.0 - Autoware planning messages package. + Autoware system messages package. Takagi, Isamu Apache License 2.0 From 6854bed1672b4af1d4c98999de3af6fba118a98c Mon Sep 17 00:00:00 2001 From: "jack.song" Date: Tue, 12 Dec 2023 13:44:10 +0800 Subject: [PATCH 3/5] fix:add system msgs Signed-off-by: jack.song --- autoware_system_msgs/msg/HazardStatus.msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoware_system_msgs/msg/HazardStatus.msg b/autoware_system_msgs/msg/HazardStatus.msg index 81447ad..6945f79 100644 --- a/autoware_system_msgs/msg/HazardStatus.msg +++ b/autoware_system_msgs/msg/HazardStatus.msg @@ -2,7 +2,7 @@ uint8 NO_FAULT = 0 uint8 SAFE_FAULT = 1 uint8 LATENT_FAULT = 2 uint8 SINGLE_POINT_FAULT = 3 -uint8 level; +uint8 level boolean emergency boolean emergency_holding diagnostic_msgs/DiagnosticStatus[] diag_no_fault From e61e19ef6b60765fc1dc673f7bf4b9a5753f4c54 Mon Sep 17 00:00:00 2001 From: "jack.song" Date: Tue, 12 Dec 2023 13:49:11 +0800 Subject: [PATCH 4/5] fix:add system msgs Signed-off-by: jack.song --- autoware_system_msgs/msg/HazardStatus.msg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoware_system_msgs/msg/HazardStatus.msg b/autoware_system_msgs/msg/HazardStatus.msg index 6945f79..b29b15f 100644 --- a/autoware_system_msgs/msg/HazardStatus.msg +++ b/autoware_system_msgs/msg/HazardStatus.msg @@ -3,8 +3,8 @@ uint8 SAFE_FAULT = 1 uint8 LATENT_FAULT = 2 uint8 SINGLE_POINT_FAULT = 3 uint8 level -boolean emergency -boolean emergency_holding +bool emergency +bool emergency_holding diagnostic_msgs/DiagnosticStatus[] diag_no_fault diagnostic_msgs/DiagnosticStatus[] diag_safe_fault diagnostic_msgs/DiagnosticStatus[] diag_latent_fault From bd100e809dc1874122b07836a2b6ff923bfb380f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 05:54:03 +0000 Subject: [PATCH 5/5] style(pre-commit): autofix --- autoware_system_msgs/msg/AutowareState.msg | 2 +- autoware_system_msgs/msg/HazardStatus.msg | 2 +- autoware_system_msgs/msg/HazardStatusStamped.msg | 2 +- autoware_system_msgs/package.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoware_system_msgs/msg/AutowareState.msg b/autoware_system_msgs/msg/AutowareState.msg index 269f15b..0118f32 100644 --- a/autoware_system_msgs/msg/AutowareState.msg +++ b/autoware_system_msgs/msg/AutowareState.msg @@ -6,4 +6,4 @@ uint8 DRIVING = 5 uint8 ARRIVED_GOAL = 6 uint8 FINALIZING = 7 builtin_interfaces/Time stamp -uint8 state \ No newline at end of file +uint8 state diff --git a/autoware_system_msgs/msg/HazardStatus.msg b/autoware_system_msgs/msg/HazardStatus.msg index b29b15f..c9af12f 100644 --- a/autoware_system_msgs/msg/HazardStatus.msg +++ b/autoware_system_msgs/msg/HazardStatus.msg @@ -8,4 +8,4 @@ bool emergency_holding diagnostic_msgs/DiagnosticStatus[] diag_no_fault diagnostic_msgs/DiagnosticStatus[] diag_safe_fault diagnostic_msgs/DiagnosticStatus[] diag_latent_fault -diagnostic_msgs/DiagnosticStatus[] diag_single_point_fault \ No newline at end of file +diagnostic_msgs/DiagnosticStatus[] diag_single_point_fault diff --git a/autoware_system_msgs/msg/HazardStatusStamped.msg b/autoware_system_msgs/msg/HazardStatusStamped.msg index bc4c08a..68955b6 100644 --- a/autoware_system_msgs/msg/HazardStatusStamped.msg +++ b/autoware_system_msgs/msg/HazardStatusStamped.msg @@ -1,2 +1,2 @@ builtin_interfaces/Time stamp -autoware_system_msgs/HazardStatus status \ No newline at end of file +autoware_system_msgs/HazardStatus status diff --git a/autoware_system_msgs/package.xml b/autoware_system_msgs/package.xml index 6e2eda5..aefa642 100644 --- a/autoware_system_msgs/package.xml +++ b/autoware_system_msgs/package.xml @@ -12,11 +12,11 @@ rosidl_default_generators builtin_interfaces + diagnostic_msgs geometry_msgs nav_msgs std_msgs unique_identifier_msgs - diagnostic_msgs rosidl_default_runtime