Merge with develop

xuhan417 · Jun 15, 2021 · 0a7b2de · 0a7b2de
1 parent 3692f67
commit 0a7b2de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
  build:
  # Setup docker
  docker:
- - image: usdotfhwastol/carma-base:carma-system-3.6.0
+ - image: usdotfhwastoldev/carma-base:develop
  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
@@ -3,6 +3,10 @@
 #
 # @author Misheel Bayartsengel
 # @version 0.1
+#
+# NOTE: This message is not part of the TrafficControlRequest message definition. 
+# It is an alternative representation of TrafficControlBounds used for visualization.
+#
 # describes the four vertices of polygon created by CARMA to form an TrafficControlRequest zone
 # each points are in EPSG:4326 lat/long