Merge pull request #121 from usdot-fhwa-stol/develop

Apply fix from issue #112
usdot-fhwa-stol · Jul 12, 2021 · 2a49d34 · 2a49d34
2 parents d35d4d7 + 500e167
commit 2a49d34
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/cav_msgs/msg/TrafficControlRequestPolygon.msg b/cav_msgs/msg/TrafficControlRequestPolygon.msg
@@ -0,0 +1,13 @@
+#
+# TrafficControlRequestPolygon.msg
+#
+# @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                                                       
+
+cav_msgs/Position3D[] polygon_list
diff --git a/cav_msgs/msg/UpcomingLaneChangeStatus.msg b/cav_msgs/msg/UpcomingLaneChangeStatus.msg
@@ -5,15 +5,12 @@
 # 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 = 0
+uint8 LEFT = 1
 
-uint8 RIGHT= 1
+uint8 RIGHT= 2
diff --git a/j2735_msgs/msg/LaneAttributesTrackedVehicle.msg b/j2735_msgs/msg/LaneAttributesTrackedVehicle.msg
@@ -8,7 +8,7 @@
 #
 # The LaneAttributes-Special data element relates specific properties found
 # in a tracked vehicle lane types (trolley and train lanes).
-# The term “rail vehicle” can be considered synonymous.
+# The term "rail vehicle" can be considered synonymous.
 # In this case, the term does not relate to vehicle types with tracks or treads.
 #
 # LaneAttributes-TrackedVehicle ::= BIT STRING {
@@ -24,4 +24,4 @@
 # -- Bits 5~15 reserved and set to zero
 # } (SIZE (16))
 
-uint16 lane_attributes_trackedvehicle
+uint16 lane_attributes_trackedvehicle