Merge pull request #130 from usdot-fhwa-stol/release/yenko

Release 3.7.0
usdot-fhwa-stol · Aug 9, 2021 · 585e5ed · 585e5ed
2 parents 815aec1 + c4b1d4c
commit 585e5ed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
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: usdotfhwastol/carma-base:carma-system-3.7.0
  user: carma
  environment:
  TERM: xterm # use xterm to get full display output from build

diff --git a/cav_msgs/msg/MobilityHeader.msg b/cav_msgs/msg/MobilityHeader.msg
@@ -24,3 +24,4 @@ string plan_id
 # A UNIX timestamp in milliseconds, which indicates the time elapsed since UNIX epoch
 # Example: "9223372036854775807"
 uint64 timestamp
+
diff --git a/cav_msgs/msg/MobilityOperation.msg b/cav_msgs/msg/MobilityOperation.msg
@@ -12,3 +12,4 @@ string strategy
 # strategy parameters specified by each individual plugin/component
 # the maximum length of this string is 100
 string strategy_params
+
diff --git a/cav_msgs/msg/PlatooningInfo.msg b/cav_msgs/msg/PlatooningInfo.msg
@@ -42,3 +42,6 @@ float32 host_cmd_speed
 
 # Desired gap with leader
 float32 desired_gap
+
+# Actual gap with leader
+float32 actual_gap
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 
 

diff --git a/cav_msgs/msg/UpcomingLaneChangeStatus.msg b/cav_msgs/msg/UpcomingLaneChangeStatus.msg
@@ -5,9 +5,6 @@
 # downtrack until next lanechange
 float64 downtrack_until_lanechange
 
-# last recorded lanechange downtrack
-float64 last_recorded_lanechange_downtrack
-
 # choice for lane change
 uint8 lane_change
 

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