Skip to content
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.

Sign up for GitHub

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

Move to 3.4.0 release base and update versions #80

Merged
merged 3 commits into from
Nov 24, 2021
Merged

Move to 3.4.0 release base and update versions #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e12cac
Move to 3.4.0 pre-release base
pmai Oct 27, 2021
d7943c3
Removed submodule ASAM resources since not needed here
Nov 18, 2021
92178e9
Update version and referenced OSI for 1.2.0 release
pmai Nov 19, 2021
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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@
path = examples/open-simulation-interface
url = https://github.com/OpenSimulationInterface/open-simulation-interface.git
branch = master
[submodule "asciidoc-resources"]
path = asciidoc-resources
url = https://code.asam.net/simulation/asciidoc-resources.git
1 change: 0 additions & 1 deletion asciidoc-resources
Open in desktop
Submodule asciidoc-resources deleted from e0bd50
14 changes: 7 additions & 7 deletions doc/misc/example.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@ The example describes a sensor model FMU with one input, one output, and no addi
canNotUseMemoryManagementFunctions="true"/>
<DefaultExperiment startTime="0.0" stepSize="0.020"/>
<VendorAnnotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.1" osi-version="3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.2.0" osi-version="3.4.0"/></Tool>
</VendorAnnotations>
<ModelVariables>
<ScalarVariable name="OSMPSensorViewIn.base.lo" valueReference="0" causality="input" variability="discrete">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="base.lo" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="base.lo" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
<ScalarVariable name="OSMPSensorViewIn.base.hi" valueReference="1" causality="input" variability="discrete">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="base.hi" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="base.hi" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
<ScalarVariable name="OSMPSensorViewIn.size" valueReference="2" causality="input" variability="discrete">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="size" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorViewIn" role="size" mime-type="application/x-open-simulation-interface; type=SensorView; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
<ScalarVariable name="OSMPSensorDataOut.base.lo" valueReference="3" causality="output" variability="discrete" initial="exact">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="base.lo" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="base.lo" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
<ScalarVariable name="OSMPSensorDataOut.base.hi" valueReference="4" causality="output" variability="discrete" initial="exact">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="base.hi" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="base.hi" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
<ScalarVariable name="OSMPSensorDataOut.size" valueReference="5" causality="output" variability="discrete" initial="exact">
<Integer start="0"/>
<Annotations>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="size" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.3.1"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp-binary-variable name="OSMPSensorDataOut" role="size" mime-type="application/x-open-simulation-interface; type=SensorData; version=3.4.0"/></Tool>
</Annotations>
</ScalarVariable>
</ModelVariables>
Expand Down
2 changes: 1 addition & 1 deletion doc/misc/introduction.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
_OSI Sensor Model Packaging_ (OSMP) is a package layer specification for the _Open Simulation Interface_ (OSI).
It specifies how models that use OSI are packaged as _Functional Mock-up Units_ (FMUs) in accordance with the _Functional Mock-up Interface 2.0_ (FMI 2.0).

This is version 1.1.1 of this specification. The version number is to be
This is version 1.2.0 of this specification. The version number is to be
interpreted according to the https://semver.org/spec/v2.0.0.html[_Semantic Versioning Specification 2.0.0_].
2 changes: 1 addition & 1 deletion doc/spec/basic_conventions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The following annotation shall be placed into the `<VendorAnnotations>` element

[source,xml]
----
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.1" osi-version="x.y.z"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.2.0" osi-version="x.y.z"/></Tool>
----

The `@osi-version` attribute should contain the major, minor, and patch version number of the OSI specification that this model was compiled against.
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()

set(OSMPVERSION "1.1.1" CACHE STRING "OSMP Version String")
set(OSMPVERSION "1.2.0" CACHE STRING "OSMP Version String")

add_subdirectory( open-simulation-interface )

Expand Down
2 changes: 1 addition & 1 deletion examples/open-simulation-interface
Open in desktop
Submodule open-simulation-interface updated 93 files
+162 −0 .github/workflows/protobuf.yml
+2 −0 .gitignore
+3 −0 .gitmodules
+0 −161 .travis.yml
+46 −1 CMakeLists.txt
+2 −2 README.md
+2 −2 VERSION
+41 −0 doc/architecture/architecture_overview.adoc
+14 −0 doc/architecture/data_layer.adoc
+9 −0 doc/architecture/environmental_effect_model.adoc
+5 −0 doc/architecture/feature_data.adoc
+52 −0 doc/architecture/formatting_scripts.adoc
+5 −0 doc/architecture/ground_truth.adoc
+6 −0 doc/architecture/logical_model.adoc
+13 −0 doc/architecture/packaging_layer.adoc
+78 −0 doc/architecture/proto-files.adoc
+20 −0 doc/architecture/reference_points_coordinate_systems.adoc
+7 −0 doc/architecture/sensor_data.adoc
+4 −0 doc/architecture/sensor_model.adoc
+9 −0 doc/architecture/sensor_view.adoc
+34 −0 doc/architecture/sensor_view_configuration.adoc
+45 −0 doc/architecture/test_scripts.adoc
+18 −0 doc/architecture/trace_file_formats.adoc
+58 −0 doc/architecture/trace_file_naming.adoc
+3 −0 doc/architecture/traffic_command.adoc
+31 −0 doc/architecture/traffic_participant.adoc
+4 −0 doc/architecture/traffic_update.adoc
+3 −0 doc/architecture/vehicle_dynamics.adoc
+0 −339 doc/commenting.rst
+0 −37 doc/coordinatesystem.rst
+0 −188 doc/description.rst
+0 −126 doc/fileformat.rst
+0 −319 doc/howtocontribute.rst
+5,670 −6,336 doc/images/OSI_MovingObject.svg
+ − doc/images/osi-context.png
+ − doc/images/osi-traffic-participant-advanced.png
+ − doc/images/osi-traffic-participant-principle.png
+ − doc/images/osi-traffic-participant-use-case-1.png
+ − doc/images/osi-traffic-participant-use-case-2.png
+ − doc/images/osi-traffic-participant-use-case-3.png
+ − doc/images/osi-traffic-participant-use-case-4.png
+ − doc/images/osi_example_coordinate_systems.png
+6,754 −0 doc/images/osi_example_coordinate_systems.svg
+0 −14 doc/installation.rst
+0 −103 doc/interfaceconventions.rst
+0 −56 doc/linux.rst
+5 −0 doc/misc/osi_vision.adoc
+117 −0 doc/open-simulation-interface_user_guide.adoc
+0 −103 doc/osifiles.rst
+0 −26 doc/reference.rst
+0 −14 doc/releases.rst
+0 −25 doc/releases/v02.00.rst
+0 −14 doc/releases/v02.01.rst
+0 −30 doc/releases/v02.02.rst
+0 −60 doc/releases/v03.00.rst
+0 −37 doc/releases/v03.01.rst
+0 −44 doc/releases/v03.02.rst
+0 −42 doc/releases/v03.03.rst
+17 −0 doc/setup/including_osi_dev_projects.adoc
+54 −0 doc/setup/installing_linux_cpp.adoc
+48 −0 doc/setup/installing_linux_python.adoc
+17 −0 doc/setup/installing_macos.adoc
+48 −0 doc/setup/installing_windows_cpp.adoc
+27 −0 doc/setup/installing_windows_python.adoc
+17 −0 doc/setup/using_osi_support_tools.adoc
+18 −0 doc/usecases/benchmark_integration_gpu_radar.adoc
+17 −0 doc/usecases/fusing_sensor_outputs.adoc
+17 −0 doc/usecases/generating_osi_traces.adoc
+17 −0 doc/usecases/injecting_faults.adoc
+17 −0 doc/usecases/modeling_camera_electronics.adoc
+15 −0 doc/usecases/modeling_lidar_sensor.adoc
+49 −0 doc/usecases/modeling_traffic_participant.adoc
+35 −0 doc/usecases/transforming_coordinate_systems.adoc
+0 −27 doc/versioning.rst
+0 −63 doc/windows.rst
+1 −0 flatbuffers
+379 −12 osi_common.proto
+9 −0 osi_detectedlane.proto
+8 −0 osi_detectedobject.proto
+8 −0 osi_detectedroadmarking.proto
+8 −0 osi_detectedtrafficlight.proto
+15 −0 osi_environment.proto
+30 −0 osi_featuredata.proto
+252 −6 osi_hostvehicledata.proto
+107 −5 osi_lane.proto
+129 −4 osi_object.proto
+13 −0 osi_occupant.proto
+140 −5 osi_roadmarking.proto
+9 −0 osi_sensorviewconfiguration.proto
+13 −1 osi_trafficcommand.proto
+37 −2 osi_trafficlight.proto
+170 −3 osi_trafficsign.proto
+12 −6 osi_trafficupdate.proto