Merge branch 'feat/mrm-v0.6-integ-for-bench-test-based-on-x2-gen2-v3.…

…0.0' into feat/add-msg-mrm-state
tier4 · Jul 17, 2024 · 0f70869 · 0f70869
2 parents 6c42491 + 4c3dc40
commit 0f70869
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/tier4_perception_msgs/CMakeLists.txt b/tier4_perception_msgs/CMakeLists.txt
@@ -27,8 +27,8 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/traffic_light/TrafficLightElement.msg"
   "msg/traffic_light/TrafficLightRoi.msg"
   "msg/traffic_light/TrafficLightRoiArray.msg"
-  "msg/traffic_light/TrafficSignal.msg"
-  "msg/traffic_light/TrafficSignalArray.msg"
+  "msg/traffic_light/TrafficLight.msg"
+  "msg/traffic_light/TrafficLightArray.msg"
   DEPENDENCIES
     autoware_auto_perception_msgs
     builtin_interfaces

diff --git a/tier4_perception_msgs/msg/traffic_light/TrafficLight.msg b/tier4_perception_msgs/msg/traffic_light/TrafficLight.msg
@@ -0,0 +1,6 @@
+uint8 CAR_TRAFFIC_LIGHT=0
+uint8 PEDESTRIAN_TRAFFIC_LIGHT=1
+
+int64 traffic_light_id
+uint8 traffic_light_type
+tier4_perception_msgs/TrafficLightElement[] elements
diff --git a/tier4_perception_msgs/msg/traffic_light/TrafficLightArray.msg b/tier4_perception_msgs/msg/traffic_light/TrafficLightArray.msg
@@ -0,0 +1,2 @@
+std_msgs/Header header
+tier4_perception_msgs/TrafficLight[] signals
diff --git a/tier4_perception_msgs/msg/traffic_light/TrafficLightRoi.msg b/tier4_perception_msgs/msg/traffic_light/TrafficLightRoi.msg
@@ -1,2 +1,6 @@
+uint8 CAR_TRAFFIC_LIGHT=0
+uint8 PEDESTRIAN_TRAFFIC_LIGHT=1
+
 sensor_msgs/RegionOfInterest roi
 int64 traffic_light_id
+uint8 traffic_light_type
diff --git a/tier4_perception_msgs/msg/traffic_light/TrafficSignal.msg b/tier4_perception_msgs/msg/traffic_light/TrafficSignal.msg
diff --git a/tier4_perception_msgs/msg/traffic_light/TrafficSignalArray.msg b/tier4_perception_msgs/msg/traffic_light/TrafficSignalArray.msg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		std_msgs/Header header
		tier4_perception_msgs/TrafficLight[] signals