From c6d024c55a150a00faf7c960b4514fe2475f01b8 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Tue, 8 Jun 2021 12:30:16 -0400 Subject: [PATCH 1/7] update version number --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4ee2c83..a098456e 100644 --- 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 From 5a989ed98a7bb590c9775e6b836df081299fa803 Mon Sep 17 00:00:00 2001 From: Misheel Bayartsengel Date: Wed, 9 Jun 2021 21:16:31 +0000 Subject: [PATCH 2/7] first --- cav_msgs/msg/TrafficControlRequestPolygon.msg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 cav_msgs/msg/TrafficControlRequestPolygon.msg diff --git a/cav_msgs/msg/TrafficControlRequestPolygon.msg b/cav_msgs/msg/TrafficControlRequestPolygon.msg new file mode 100644 index 00000000..dc62f52d --- /dev/null +++ b/cav_msgs/msg/TrafficControlRequestPolygon.msg @@ -0,0 +1,13 @@ +# +# IntersectionGeometry.msg +# +# J2735 2016 message format. +# +# @author Misheel Bayartsengel +# @version 0.1 +# + +# refPoint Position3D, -- The reference from which subsequent +# -- data points are offset until a new +# -- point is used. +cav_msgs/Position3D[] polygon_list \ No newline at end of file From 18ce8f556dcc0810f3cd687a46a5fb6882e85494 Mon Sep 17 00:00:00 2001 From: Misheel Bayartsengel Date: Wed, 9 Jun 2021 21:20:02 +0000 Subject: [PATCH 3/7] add comment --- cav_msgs/msg/TrafficControlRequestPolygon.msg | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cav_msgs/msg/TrafficControlRequestPolygon.msg b/cav_msgs/msg/TrafficControlRequestPolygon.msg index dc62f52d..bfeacce3 100644 --- a/cav_msgs/msg/TrafficControlRequestPolygon.msg +++ b/cav_msgs/msg/TrafficControlRequestPolygon.msg @@ -1,13 +1,9 @@ # -# IntersectionGeometry.msg -# -# J2735 2016 message format. +# 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 -# refPoint Position3D, -- The reference from which subsequent -# -- data points are offset until a new -# -- point is used. cav_msgs/Position3D[] polygon_list \ No newline at end of file From 0a7b2ded1cb2df70c229e6a0602d606ece16d624 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Tue, 15 Jun 2021 15:38:12 +0000 Subject: [PATCH 4/7] Merge with develop --- .circleci/config.yml | 2 +- cav_msgs/msg/TrafficControlRequestPolygon.msg | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a098456e..e4ee2c83 100644 --- 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 index bfeacce3..d378a02b 100644 --- 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 From f1d24412992cde56221e9518e8292eb1ec4791c6 Mon Sep 17 00:00:00 2001 From: lewisid <66792727+lewisid@users.noreply.github.com> Date: Fri, 25 Jun 2021 10:04:59 -0400 Subject: [PATCH 5/7] Commit enumeration change to UpcomingLaneChange.msg (#111) --- cav_msgs/msg/UpcomingLaneChangeStatus.msg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cav_msgs/msg/UpcomingLaneChangeStatus.msg b/cav_msgs/msg/UpcomingLaneChangeStatus.msg index bc3763b4..7252599e 100644 --- a/cav_msgs/msg/UpcomingLaneChangeStatus.msg +++ b/cav_msgs/msg/UpcomingLaneChangeStatus.msg @@ -14,6 +14,6 @@ uint8 lane_change # enums for lane change uint8 NONE = 0 -uint8 LEFT = 0 +uint8 LEFT = 1 -uint8 RIGHT= 1 +uint8 RIGHT= 2 From 16777ed126effc86e21ff6deff47ac0491c419bf Mon Sep 17 00:00:00 2001 From: lewisid <66792727+lewisid@users.noreply.github.com> Date: Mon, 28 Jun 2021 10:24:49 -0400 Subject: [PATCH 6/7] Commit changes to UpcomingLaneChangeStatus.msg (#116) --- cav_msgs/msg/UpcomingLaneChangeStatus.msg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cav_msgs/msg/UpcomingLaneChangeStatus.msg b/cav_msgs/msg/UpcomingLaneChangeStatus.msg index bc3763b4..c78e5fa8 100644 --- 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 From 7383c1c5071bba474346363b88a333d5321d4038 Mon Sep 17 00:00:00 2001 From: Adam Morrissett Date: Mon, 28 Jun 2021 14:57:42 -0400 Subject: [PATCH 7/7] 112 - Replace UTF-8 quotes with ASCII quotes (#114) The previous quote marks were UTF-8 characters for left quote and right quote, resulting in the file being UTF-8 encoded. This causes file reading issues on environments with a non-UTF-8 locale (e.g., a POSIX locale). Replacing the UTF-8 quote marks with ASCII versions fixes the issue. --- j2735_msgs/msg/LaneAttributesTrackedVehicle.msg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/j2735_msgs/msg/LaneAttributesTrackedVehicle.msg b/j2735_msgs/msg/LaneAttributesTrackedVehicle.msg index 58ba97c4..80e651c8 100644 --- 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 \ No newline at end of file +uint16 lane_attributes_trackedvehicle