From 29bc97acbed6135028436f6e559bb62f70547360 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Mon, 13 May 2024 04:54:30 +0000 Subject: [PATCH 1/6] feat(tier4_simulation_msgs): add traffic light v1 messages Signed-off-by: Kotaro Yoshimoto --- .../msg/TrafficLightArrayV1.msg | 2 ++ .../msg/TrafficLightBulbV1.msg | 31 +++++++++++++++++++ tier4_simulation_msgs/msg/TrafficLightV1.msg | 3 ++ 3 files changed, 36 insertions(+) create mode 100644 tier4_simulation_msgs/msg/TrafficLightArrayV1.msg create mode 100644 tier4_simulation_msgs/msg/TrafficLightBulbV1.msg create mode 100644 tier4_simulation_msgs/msg/TrafficLightV1.msg diff --git a/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg new file mode 100644 index 00000000..fc94cf4b --- /dev/null +++ b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg @@ -0,0 +1,2 @@ +uint8 minor_version = 0 +TrafficLightV1[] traffic_lights \ No newline at end of file diff --git a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg new file mode 100644 index 00000000..72413ecd --- /dev/null +++ b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg @@ -0,0 +1,31 @@ +uint8 UNKNOWN = 0 + +# constants for color +uint8 RED = 1 +uint8 AMBER = 2 +uint8 GREEN = 3 +uint8 WHITE = 4 + +# constants for shape +uint8 CIRCLE = 1 +uint8 LEFT_ARROW = 2 +uint8 RIGHT_ARROW = 3 +uint8 UP_ARROW = 4 +uint8 UP_LEFT_ARROW=5 +uint8 UP_RIGHT_ARROW=6 +uint8 DOWN_ARROW = 7 +uint8 DOWN_LEFT_ARROW = 8 +uint8 DOWN_RIGHT_ARROW = 9 +uint8 CROSS = 10 + +# constants for status +uint8 SOLID_OFF = 1 +uint8 SOLID_ON = 2 +uint8 FLASHING = 3 + +# variables +uint8 minor_version = 0 +uint8 color +uint8 shape +uint8 status +float32 confidence \ No newline at end of file diff --git a/tier4_simulation_msgs/msg/TrafficLightV1.msg b/tier4_simulation_msgs/msg/TrafficLightV1.msg new file mode 100644 index 00000000..038b19dc --- /dev/null +++ b/tier4_simulation_msgs/msg/TrafficLightV1.msg @@ -0,0 +1,3 @@ +uint8 minor_version = 0 +int64 lanelet_way_id +WebAutoTrafficLightBulbV1[] traffic_light_bulbs \ No newline at end of file From 47c16a3cbaa5096095d40d7391855861e28bf138 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 04:56:04 +0000 Subject: [PATCH 2/6] ci(pre-commit): autofix --- tier4_simulation_msgs/msg/TrafficLightArrayV1.msg | 2 +- tier4_simulation_msgs/msg/TrafficLightBulbV1.msg | 2 +- tier4_simulation_msgs/msg/TrafficLightV1.msg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg index fc94cf4b..31be5fe0 100644 --- a/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg @@ -1,2 +1,2 @@ uint8 minor_version = 0 -TrafficLightV1[] traffic_lights \ No newline at end of file +TrafficLightV1[] traffic_lights diff --git a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg index 72413ecd..a2d41a02 100644 --- a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg @@ -28,4 +28,4 @@ uint8 minor_version = 0 uint8 color uint8 shape uint8 status -float32 confidence \ No newline at end of file +float32 confidence diff --git a/tier4_simulation_msgs/msg/TrafficLightV1.msg b/tier4_simulation_msgs/msg/TrafficLightV1.msg index 038b19dc..24c4e364 100644 --- a/tier4_simulation_msgs/msg/TrafficLightV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightV1.msg @@ -1,3 +1,3 @@ uint8 minor_version = 0 int64 lanelet_way_id -WebAutoTrafficLightBulbV1[] traffic_light_bulbs \ No newline at end of file +WebAutoTrafficLightBulbV1[] traffic_light_bulbs From 8f758b7d988966f4d4fd4e2c4d0e5ddb03689b46 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Tue, 14 May 2024 06:21:36 +0000 Subject: [PATCH 3/6] refactor(tier4_simulation_msgs): change version tag Signed-off-by: Kotaro Yoshimoto --- tier4_simulation_msgs/msg/TrafficLightArrayV1.msg | 1 - tier4_simulation_msgs/msg/TrafficLightBulbV1.msg | 2 +- tier4_simulation_msgs/msg/TrafficLightV1.msg | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg index 31be5fe0..0a1e4a47 100644 --- a/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightArrayV1.msg @@ -1,2 +1 @@ -uint8 minor_version = 0 TrafficLightV1[] traffic_lights diff --git a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg index a2d41a02..8dd3d41b 100644 --- a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg @@ -24,7 +24,7 @@ uint8 SOLID_ON = 2 uint8 FLASHING = 3 # variables -uint8 minor_version = 0 +uint8 enum_revision = 0 uint8 color uint8 shape uint8 status diff --git a/tier4_simulation_msgs/msg/TrafficLightV1.msg b/tier4_simulation_msgs/msg/TrafficLightV1.msg index 24c4e364..858654c0 100644 --- a/tier4_simulation_msgs/msg/TrafficLightV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightV1.msg @@ -1,3 +1,2 @@ -uint8 minor_version = 0 int64 lanelet_way_id WebAutoTrafficLightBulbV1[] traffic_light_bulbs From 780e8dafd7d9c62222885b68dccdfd20b4089c7b Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Tue, 14 May 2024 08:19:15 +0000 Subject: [PATCH 4/6] chore(tier4_simulation_msgs): register new messages to CMakeLists.txt Signed-off-by: Kotaro Yoshimoto pythagora.yoshimoto@gmail.com --- tier4_simulation_msgs/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tier4_simulation_msgs/CMakeLists.txt b/tier4_simulation_msgs/CMakeLists.txt index de8e38a0..94450da5 100644 --- a/tier4_simulation_msgs/CMakeLists.txt +++ b/tier4_simulation_msgs/CMakeLists.txt @@ -18,6 +18,9 @@ ament_auto_find_build_dependencies() rosidl_generate_interfaces(${PROJECT_NAME} msg/FaultInjectionEvent.msg msg/SimulationEvents.msg + msg/TrafficLightArrayV1.msg + msg/TrafficLightBulbV1.msg + msg/TrafficLightV1.msg msg/UserDefinedValue.msg msg/UserDefinedValueType.msg DEPENDENCIES builtin_interfaces std_msgs) From ade8e7a7ea57582cb3c17e40f16924793af762a6 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Tue, 14 May 2024 08:37:31 +0000 Subject: [PATCH 5/6] fix(tier4_simulation_msgs): use correct message name in TrafficLightV1.msg Signed-off-by: Kotaro Yoshimoto pythagora.yoshimoto@gmail.com --- tier4_simulation_msgs/msg/TrafficLightV1.msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tier4_simulation_msgs/msg/TrafficLightV1.msg b/tier4_simulation_msgs/msg/TrafficLightV1.msg index 858654c0..dd0d7d22 100644 --- a/tier4_simulation_msgs/msg/TrafficLightV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightV1.msg @@ -1,2 +1,2 @@ int64 lanelet_way_id -WebAutoTrafficLightBulbV1[] traffic_light_bulbs +TrafficLightBulbV1[] traffic_light_bulbs From 6115ec9f21818f416f0bd4d3c76890ee06a2cbf0 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Tue, 14 May 2024 08:41:41 +0000 Subject: [PATCH 6/6] fix(tier4_simulation_msgs): change a field from constant to variable in TrafficLightBulbV1.msg Signed-off-by: Kotaro Yoshimoto pythagora.yoshimoto@gmail.com --- tier4_simulation_msgs/msg/TrafficLightBulbV1.msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg index 8dd3d41b..badc61ac 100644 --- a/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg +++ b/tier4_simulation_msgs/msg/TrafficLightBulbV1.msg @@ -24,7 +24,7 @@ uint8 SOLID_ON = 2 uint8 FLASHING = 3 # variables -uint8 enum_revision = 0 +uint8 enum_revision 0 uint8 color uint8 shape uint8 status