Merge branch 'release/zephyr' into test/platoon3

xuhan417 · Jun 29, 2021 · e2e1bd2 · e2e1bd2
2 parents 57990e2 + f1d2441
commit e2e1bd2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
  build:
  # Setup docker
  docker:
- - image: usdotfhwastoldev/carma-base:develop
+ - image: usdotfhwastol/carma-base:carma-system-3.6.0
  user: carma
  environment:
  TERM: xterm # use xterm to get full display output from build

diff --git a/cav_msgs/msg/TrafficControlRequestPolygon.msg b/cav_msgs/msg/TrafficControlRequestPolygon.msg
@@ -0,0 +1,9 @@
+#
+# TrafficControlRequestPolygon.msg
+#
+# @author Misheel Bayartsengel
+# @version 0.1
+# describes the four vertices of polygon created by CARMA to form an TrafficControlRequest zone
+# each points are in EPSG:4326 lat/long 
+
+cav_msgs/Position3D[] polygon_list
diff --git a/cav_msgs/msg/UpcomingLaneChangeStatus.msg b/cav_msgs/msg/UpcomingLaneChangeStatus.msg
@@ -0,0 +1,19 @@
+#
+# UpcomingLaneChangeStatus.msg
+#
+
+# downtrack until next lanechange
+float64 downtrack_until_lanechange
+
+# last recorded lanechange downtrack
+float64 last_recorded_lanechange_downtrack
+
+# choice for lane change
+uint8 lane_change
+
+# enums for lane change
+uint8 NONE = 0
+
+uint8 LEFT = 1
+
+uint8 RIGHT= 2