From dd4224bf6cabf0935bcbd80b3b7be80022b4dcff Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Wed, 1 Jun 2022 10:49:07 +0200 Subject: [PATCH 1/4] added missing proto file to setup.py Signed-off-by: Stefan Cyliax --- setup.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index dcc8ba688..44ba7ba10 100644 --- a/setup.py +++ b/setup.py @@ -45,34 +45,35 @@ def find_protoc(): return protoc osi_files = ( - 'osi_version.proto', 'osi_common.proto', 'osi_datarecording.proto', - 'osi_detectedtrafficsign.proto', - 'osi_detectedtrafficlight.proto', - 'osi_detectedroadmarking.proto', + 'osi_detectedlane.proto', 'osi_detectedobject.proto', 'osi_detectedoccupant.proto', - 'osi_detectedlane.proto', + 'osi_detectedroadmarking.proto', + 'osi_detectedtrafficlight.proto', + 'osi_detectedtrafficsign.proto', 'osi_environment.proto', + 'osi_featuredata.proto', 'osi_groundtruth.proto', 'osi_hostvehicledata.proto', - 'osi_trafficsign.proto', - 'osi_trafficlight.proto', - 'osi_trafficupdate.proto', - 'osi_trafficcommand.proto', - 'osi_roadmarking.proto', - 'osi_featuredata.proto', + 'osi_lane.proto', 'osi_logicaldetectiondata.proto', + 'osi_logicallane.proto', 'osi_object.proto', 'osi_occupant.proto', - 'osi_lane.proto', - 'osi_logicallane.proto', 'osi_referenceline.proto', + 'osi_roadmarking.proto', 'osi_sensordata.proto', - 'osi_sensorviewconfiguration.proto', 'osi_sensorspecific.proto', - 'osi_sensorview.proto') + 'osi_sensorview.proto', + 'osi_sensorviewconfiguration.proto', + 'osi_trafficcommand.proto', + 'osi_trafficcommandupdate.proto', + 'osi_trafficlight.proto', + 'osi_trafficsign.proto', + 'osi_trafficupdate.proto', + 'osi_version.proto') """ Generate Protobuf Messages """ From a90109340ea395df1a1730192e90b62f49c319ee Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Wed, 1 Jun 2022 10:49:53 +0200 Subject: [PATCH 2/4] Release prep: increase version in VERSION file Signed-off-by: Stefan Cyliax --- README.md | 8 ++++---- VERSION | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2ed0d6c96..61746b18e 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ The Open Simulation Interface [[1]](https://www.hot.ei.tum.de/forschung/aut As the complexity of automated driving functions rapidly increases, the requirements for test and development methods are growing. Testing in virtual environments offers the advantage of completely controlled and reproducible environment conditions. -For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. +For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages. -[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ +[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/ ## Usage ##### Example of generating OSI messages in `Python` @@ -30,7 +30,7 @@ def main(): sv_ground_truth = sensorview.global_ground_truth sv_ground_truth.version.version_major = 3 - sv_ground_truth.version.version_minor = 4 + sv_ground_truth.version.version_minor = 5 sv_ground_truth.version.version_patch = 0 sv_ground_truth.timestamp.seconds = 0 @@ -39,7 +39,7 @@ def main(): moving_object = sv_ground_truth.moving_object.add() moving_object.id.value = 42 - # Generate 1000 OSI messages for a duration of 10 seconds + # Generate 1000 OSI messages for a duration of 10 seconds for i in range(1000): # Increment the time diff --git a/VERSION b/VERSION index 1edb9a12b..46ae539ab 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR = 3 -VERSION_MINOR = 4 +VERSION_MINOR = 5 VERSION_PATCH = 0 From 3f28f9f296e5faf772814ebf045ed56253c526eb Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Tue, 9 Aug 2022 15:28:55 +0200 Subject: [PATCH 3/4] Added new elements to StationaryObject-Classification-Type New elements: BARREL, GUIDE_POST, TUNNEL Issue: #641 Signed-off-by: FlorianMueller87 --- osi_object.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/osi_object.proto b/osi_object.proto index fc73e5941..0025054ae 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -216,6 +216,21 @@ message StationaryObject // in the environment, like street lights. // TYPE_EMITTING_STRUCTURE = 18; + + // Landmarks corresponding to barrel in the + // in the environment. + // + TYPE_ BARREL = 19; + + // Landmarks corresponding to guide post in the + // in the environment. + // + TYPE_ GUIDE_POST = 20; + + // Landmarks corresponding to tunnel in the + // in the environment. + // + TYPE_ TUNNEL = 21; } // Definition of material types. From 4be3d752b2355cd52d6b66d7645137823998d21d Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Tue, 9 Aug 2022 15:31:16 +0200 Subject: [PATCH 4/4] eleiminate spaces in type names Issue: #641 Signed-off-by: FlorianMueller87 --- osi_object.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index 0025054ae..fe01eefbc 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -220,17 +220,17 @@ message StationaryObject // Landmarks corresponding to barrel in the // in the environment. // - TYPE_ BARREL = 19; + TYPE_BARREL = 19; // Landmarks corresponding to guide post in the // in the environment. // - TYPE_ GUIDE_POST = 20; + TYPE_GUIDE_POST = 20; // Landmarks corresponding to tunnel in the // in the environment. // - TYPE_ TUNNEL = 21; + TYPE_TUNNEL = 21; } // Definition of material types.