From db5691825fc207871ef1959dcc3ddd3002b27f38 Mon Sep 17 00:00:00 2001 From: saina-ramyar Date: Tue, 8 Jun 2021 14:20:30 -0400 Subject: [PATCH 1/7] add location to mob op --- cav_msgs/msg/MobilityHeader.msg | 1 + cav_msgs/msg/MobilityOperation.msg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/cav_msgs/msg/MobilityHeader.msg b/cav_msgs/msg/MobilityHeader.msg index b60705db..370cbd42 100644 --- 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 index 0e1c6c36..a48ad7b8 100644 --- a/cav_msgs/msg/MobilityOperation.msg +++ b/cav_msgs/msg/MobilityOperation.msg @@ -12,3 +12,6 @@ string strategy # strategy parameters specified by each individual plugin/component # the maximum length of this string is 100 string strategy_params + +# current location in ECEF frame +cav_msgs/LocationECEF location From 0a7b2ded1cb2df70c229e6a0602d606ece16d624 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Tue, 15 Jun 2021 15:38:12 +0000 Subject: [PATCH 2/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 12f74f9d6f41ea4978466c5743a144b5910dd9bf Mon Sep 17 00:00:00 2001 From: dan-du-car Date: Tue, 22 Jun 2021 11:17:31 -0400 Subject: [PATCH 3/7] init --- cav_msgs/msg/PlatooningInfo.msg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cav_msgs/msg/PlatooningInfo.msg b/cav_msgs/msg/PlatooningInfo.msg index e5c55fb0..8249365b 100644 --- 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 \ No newline at end of file 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 4/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 5/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 From ed5d493818501f2b9fd52343eeddcd24ce72b9c6 Mon Sep 17 00:00:00 2001 From: saina-ramyar Date: Thu, 15 Jul 2021 08:45:02 -0400 Subject: [PATCH 6/7] remove loc from mob op msg --- cav_msgs/msg/MobilityOperation.msg | 2 -- 1 file changed, 2 deletions(-) diff --git a/cav_msgs/msg/MobilityOperation.msg b/cav_msgs/msg/MobilityOperation.msg index a48ad7b8..5f322bd2 100644 --- a/cav_msgs/msg/MobilityOperation.msg +++ b/cav_msgs/msg/MobilityOperation.msg @@ -13,5 +13,3 @@ string strategy # the maximum length of this string is 100 string strategy_params -# current location in ECEF frame -cav_msgs/LocationECEF location From c4b1d4cafe7dd4f831c8437506bc8c19504b0ad2 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Wed, 4 Aug 2021 17:12:27 -0400 Subject: [PATCH 7/7] update config with verions 3.7.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4ee2c83..4506715b 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.7.0 user: carma environment: TERM: xterm # use xterm to get full display output from build