From 4c231c591b2056e511686c8e13451636fd6a6f2c Mon Sep 17 00:00:00 2001 From: tguild Date: Fri, 4 Oct 2024 14:55:29 -0400 Subject: [PATCH 1/6] applying instances to ObstacleDetection, other Obstacle attributes and adding Adaptive to CruiseControl --- spec/ADAS/ADAS.vspec | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index 96a2f5dbe..67ad4630a 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -86,6 +86,17 @@ CruiseControl.IsError: type: sensor description: Indicates if cruise control system incurred an error condition. True = Error. False = No Error. +CruiseControl.IsAdaptive: + datatype: boolean + type: actuator + description: Indicates if cruise control system is adaptive (i.e. actively controls speed). + +CruiseControl.AdaptiveDistanceSet: + datatype: float + type: actuator + unit: m + description: Distance in meters to keep from lead vehicle + # # Lane Departure Detection System # @@ -113,6 +124,9 @@ LaneDepartureDetection.IsError: # ObstacleDetection: type: branch + instances: + - ["Front", "Rear"] + - ["Left", "Center", "Right"] description: Signals form Obstacle Sensor System. ObstacleDetection.IsEnabled: @@ -131,6 +145,28 @@ ObstacleDetection.IsError: type: sensor description: Indicates if obstacle sensor system incurred an error condition. True = Error. False = No Error. +ObstacleDetection.Distance: + datatype: float + type: sensor + unit: m + description: Distance in meters to detected object + +ObstacleDetection.TimeGap: + datatype: int32 + type: sensor + unit: ms + description: Time in milliseconds before potential impact object + +ObstacleDetection.WarningType: + datatype: string + type: sensor + allowed: [ + 'UNDEFINED', # Object detection warning not further categorized + 'CROSS_TRAFFIC', # Detected object is on an indirect trajectory that may intersect + 'BLIND_SPOT', # Detected object may not be in driver line of sight, including from mirrors + ] + description: Indicates the type of obstacle warning detected as some track not only the presence of an obstacle but potential intercepting trajectory or other characteristics. + comment: Undefined obstacle warning type would merely alert of presence of obstacle and may measure distance. # # Antilock Braking System From 7a4265c3d7ceb30e127ed2e422369e17951a3714 Mon Sep 17 00:00:00 2001 From: tguild Date: Mon, 18 Nov 2024 15:03:51 -0500 Subject: [PATCH 2/6] Update ADAS.vspec Adding alternative to distance in meters --- spec/ADAS/ADAS.vspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index 67ad4630a..10359fd4d 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -96,6 +96,11 @@ CruiseControl.AdaptiveDistanceSet: type: actuator unit: m description: Distance in meters to keep from lead vehicle + +CruiseControl.AdaptiveDistanceSet: + datatype: uint8 + type: actuator + description: Follow distance setting, commonly 1-5 with 1 being closest. # # Lane Departure Detection System From 01d81282fcbd2055da6036566757eef96d78fd54 Mon Sep 17 00:00:00 2001 From: tguild Date: Mon, 18 Nov 2024 15:09:21 -0500 Subject: [PATCH 3/6] Update ADAS.vspec trailing whitespace --- spec/ADAS/ADAS.vspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index 10359fd4d..6db523559 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -164,7 +164,7 @@ ObstacleDetection.TimeGap: ObstacleDetection.WarningType: datatype: string - type: sensor + type: sensor allowed: [ 'UNDEFINED', # Object detection warning not further categorized 'CROSS_TRAFFIC', # Detected object is on an indirect trajectory that may intersect From 5efe7bc94e0aa0af1a832a98c2b8157736ed5f42 Mon Sep 17 00:00:00 2001 From: tguild Date: Mon, 18 Nov 2024 15:15:43 -0500 Subject: [PATCH 4/6] Update ADAS.vspec more extraneous whitespace --- spec/ADAS/ADAS.vspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index 6db523559..a5e44b363 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -101,7 +101,7 @@ CruiseControl.AdaptiveDistanceSet: datatype: uint8 type: actuator description: Follow distance setting, commonly 1-5 with 1 being closest. - + # # Lane Departure Detection System # From d68b9343e94636c554987e45d86cf72944890c4c Mon Sep 17 00:00:00 2001 From: tguild Date: Tue, 19 Nov 2024 10:13:00 -0500 Subject: [PATCH 5/6] Update ADAS.vspec unique node name --- spec/ADAS/ADAS.vspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index a5e44b363..703de35c4 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -97,7 +97,7 @@ CruiseControl.AdaptiveDistanceSet: unit: m description: Distance in meters to keep from lead vehicle -CruiseControl.AdaptiveDistanceSet: +CruiseControl.AdaptiveIntvervalSet: datatype: uint8 type: actuator description: Follow distance setting, commonly 1-5 with 1 being closest. From 28c37ec6b2423752b9550db425058c18e02a913d Mon Sep 17 00:00:00 2001 From: tguild Date: Mon, 9 Dec 2024 15:04:46 -0500 Subject: [PATCH 6/6] mispelling --- spec/ADAS/ADAS.vspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/ADAS/ADAS.vspec b/spec/ADAS/ADAS.vspec index 703de35c4..28fee571f 100644 --- a/spec/ADAS/ADAS.vspec +++ b/spec/ADAS/ADAS.vspec @@ -97,7 +97,7 @@ CruiseControl.AdaptiveDistanceSet: unit: m description: Distance in meters to keep from lead vehicle -CruiseControl.AdaptiveIntvervalSet: +CruiseControl.AdaptiveIntervalSet: datatype: uint8 type: actuator description: Follow distance setting, commonly 1-5 with 1 being closest.