From e7acddee11054b8a951f873e06d327d6f1276314 Mon Sep 17 00:00:00 2001 From: Caspar de Haes Date: Fri, 28 May 2021 14:36:28 +0100 Subject: [PATCH 1/4] Add a type field for custom traffic actions Signed-off-by: Caspar de Haes --- osi_trafficcommand.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index da0b6c9dd..a6843811e 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -490,6 +490,10 @@ message TrafficAction // The custom command given to the traffic participant. // optional string command = 2; + + // The type of the custom command given to the traffic participant. + // + optional string type = 3; } // \brief Longitudinal Distance Action From e3452d3ec4223f28c6663e9b7c59d95c478b6761 Mon Sep 17 00:00:00 2001 From: Caspar de Haes Date: Fri, 28 May 2021 14:40:16 +0100 Subject: [PATCH 2/4] Use a more specific field name Signed-off-by: Caspar de Haes --- osi_trafficcommand.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index a6843811e..6a2457618 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -493,7 +493,7 @@ message TrafficAction // The type of the custom command given to the traffic participant. // - optional string type = 3; + optional string command_type = 3; } // \brief Longitudinal Distance Action From 06ce8db1d8b7107bcda72c8203a22c4a9286d553 Mon Sep 17 00:00:00 2001 From: Caspar de Haes Date: Wed, 9 Jun 2021 11:13:16 +0100 Subject: [PATCH 3/4] Add more detail to documentation Signed-off-by: Caspar de Haes --- osi_trafficcommand.proto | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index 6a2457618..1d5b762c1 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -487,11 +487,19 @@ message TrafficAction // optional ActionHeader action_header = 1; - // The custom command given to the traffic participant. + // The custom command given to the traffic participant. Used to convey a specific instruction + // (for example "exit_highway"), or event (for example "left_indicator_activated"). + // + // \note This corresponds to the content of the OpenSCENARIO 1.0 CustomCommandAction field. // optional string command = 2; - // The type of the custom command given to the traffic participant. + // The type of the custom command given to the traffic participant. Can be used to simplify + // how commands are grouped, for example the command_type could be "sensor_failure" and the + // command value (above) could be "front_right_camera". This prevents needing long commands + // (like "sensor_failure: front_right_camera"). + // + // \note This corresponds to the "type" attribute of the OpenSCENARIO 1.0 CustomCommandAction. // optional string command_type = 3; } From 6aaadcaafc0d7397ee7dc65aa9c30dc0e9aef45f Mon Sep 17 00:00:00 2001 From: caspar-ai Date: Tue, 10 Aug 2021 10:24:49 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: max-rosin <62103539+max-rosin@users.noreply.github.com> Signed-off-by: Caspar de Haes --- osi_trafficcommand.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osi_trafficcommand.proto b/osi_trafficcommand.proto index 1d5b762c1..6bd2da8d4 100644 --- a/osi_trafficcommand.proto +++ b/osi_trafficcommand.proto @@ -487,17 +487,17 @@ message TrafficAction // optional ActionHeader action_header = 1; - // The custom command given to the traffic participant. Used to convey a specific instruction - // (for example "exit_highway"), or event (for example "left_indicator_activated"). + // The custom command given to the traffic participant. Used to convey a specific instruction + // (for example, "exit_highway"), or event (for example, "left_indicator_activated"). // // \note This corresponds to the content of the OpenSCENARIO 1.0 CustomCommandAction field. // optional string command = 2; - // The type of the custom command given to the traffic participant. Can be used to simplify - // how commands are grouped, for example the command_type could be "sensor_failure" and the - // command value (above) could be "front_right_camera". This prevents needing long commands - // (like "sensor_failure: front_right_camera"). + // The type of the custom command given to the traffic participant. Can be used to simplify + // how commands are grouped. For example, the command_type could be "sensor_failure" and the + // command value could be "front_right_camera". This avoids long commands, like + //"sensor_failure: front_right_camera". // // \note This corresponds to the "type" attribute of the OpenSCENARIO 1.0 CustomCommandAction. //