Skip to content

Change acronym meaning of OSMP #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/asciidoc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
fetch-depth: 0


- name: Checkout OSI Sensor Model Packaging
- name: Checkout OSI Simulation Model Packaging
uses: actions/checkout@v2
with:
repository: OpenSimulationInterface/osi-sensor-model-packaging
path: osi-sensor-model-packaging
repository: OpenSimulationInterface/osi-simulation-model-packaging
path: osi-simulation-model-packaging

- name: Checkout proto2cpp
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ Pipeline is broken - `OSI Validation`_

|osi_visualizer_build| - `OSI Visualizer`_

|osi_sensor_model_packaging_build| - `OSI Model Packaging`_
|osi_simulation_model_packaging_build| - `OSI Model Packaging`_



.. _Open Simulation Interface: https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/README.html
.. _OSI Validation: https://opensimulationinterface.github.io/osi-documentation/osi-validation/README.html
.. _OSI Visualizer: https://opensimulationinterface.github.io/osi-documentation/osi-visualizer/README.html
.. _OSI Model Packaging: https://opensimulationinterface.github.io/osi-documentation/osi-sensor-model-packaging/README.html
.. _OSI Model Packaging: https://opensimulationinterface.github.io/osi-documentation/osi-simulation-model-packaging/README.html

.. |osi_build| image:: https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml/badge.svg
:target: https://github.com/OpenSimulationInterface/open-simulation-interface/actions/workflows/protobuf.yml
Expand All @@ -33,5 +33,5 @@ Pipeline is broken - `OSI Validation`_
.. |osi_visualizer_build| image:: https://github.com/OpenSimulationInterface/osi-visualizer/actions/workflows/ci-build.yml/badge.svg
:target: https://github.com/OpenSimulationInterface/osi-visualizer/actions/workflows/ci-build.yml

.. |osi_sensor_model_packaging_build| image:: https://github.com/OpenSimulationInterface/osi-sensor-model-packaging/actions/workflows/protobuf.yml/badge.svg
:target: https://github.com/OpenSimulationInterface/osi-sensor-model-packaging/actions/workflows/protobuf.yml
.. |osi_simulation_model_packaging_build| image:: https://github.com/OpenSimulationInterface/osi-simulation-model-packaging/actions/workflows/protobuf.yml/badge.svg
:target: https://github.com/OpenSimulationInterface/osi-simulation-model-packaging/actions/workflows/protobuf.yml
2 changes: 1 addition & 1 deletion general_docs/glossary.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Specification for interfaces between models and components of a distributed simu
OSI has a strong focus on environmental perception of automated driving functions.
It also specifies interfaces for modeling traffic participants.

OSMP (OSI Sensor Model Packaging)::
OSMP (OSI Simulation Model Packaging)::
Specifies how models that use Open Simulation Interface (OSI) in simulation environments are packaged in accordance with the Functional Mock-up Interface 2.0 (FMI 2.0).

Sensor coordinate system::
Expand Down
2 changes: 1 addition & 1 deletion general_docs/osi_repos.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Main repository containing the interface description based on Google's Protocol

https://github.com/OpenSimulationInterface/osi-documentation[osi-documentation]:: Source for the OSI user guide sources and hosts the https://opensimulationinterface.github.io/osi-documentation/[{THIS_STANDARD} user guide].

https://github.com/OpenSimulationInterface/osi-sensor-model-packaging[osi-sensor-model-packaging]:: Packaging specification for OSI models used in FMI 2.0 cite:[fmi2.0] simulation environments, including examples.
https://github.com/OpenSimulationInterface/osi-simulation-model-packaging[osi-simulation-model-packaging]:: Packaging specification for OSI models used in FMI 2.0 cite:[fmi2.0] simulation environments, including examples.

https://github.com/OpenSimulationInterface/proto2cpp[proto2cpp]:: Doxygen filter for creating the reference documentation from OSI .proto files.
4 changes: 2 additions & 2 deletions index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include::{asciidoc-resources}/preamble.adoc[]
// If the subrepo is rendered seperatly, then the variable is set to just "./images" with ifdef.
// Please note that this variable has to used in all image includes. Includes here have to use "image::./images..."
:images_open_simulation_interface: ./open-simulation-interface/doc/images
// :images_osi_sensor_model_packaging: ./osi-sensor-model-packaging/doc/images // example
// :images_osi_simulation_model_packaging: ./osi-simulation-model-packaging/doc/images // example

:imagesoutdir: ./images/generated_images

Expand Down Expand Up @@ -66,7 +66,7 @@ include::./general_standard/relations_to_other_standards.adoc[leveloffset=+2]

include::./open-simulation-interface/doc/open-simulation-interface_user_guide.adoc[leveloffset=+1]

include::./osi-sensor-model-packaging/doc/osi-sensor-model-packaging_spec.adoc[leveloffset=+1]
include::./osi-simulation-model-packaging/doc/osi-simulation-model-packaging_spec.adoc[leveloffset=+1]

// osi-validation and osi-visualizer are considered supplementary tooling that is not normative. They are therefore not part of the ASAM standard release.
// include::./osi-validation/doc/osi-validator_user_guide.adoc[leveloffset=+1,opts=optional]
Expand Down