Skip to content

Commit

Permalink
Update VERSION and version references for release 1.5.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierre R. Mai <[email protected]>
  • Loading branch information
@pmai
pmai committed Apr 5, 2024
1 parent 243a3cb commit d5609c8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION_MAJOR = 1
VERSION_MINOR = 4
VERSION_MINOR = 5
VERSION_PATCH = 0
14 changes: 7 additions & 7 deletions doc/misc/example.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,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.4.0" osi-version="3.6.0"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.5.0" osi-version="3.7.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.6.0"/></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.7.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.6.0"/></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.7.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.6.0"/></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.7.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.6.0"/></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.7.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.6.0"/></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.7.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.6.0"/></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.7.0"/></Tool>
</Annotations>
</ScalarVariable>
</ModelVariables>
Expand Down
2 changes: 1 addition & 1 deletion doc/misc/introduction.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ endif::[]
_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.4.0 of this specification. The version number is to be
This is version 1.5.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_].
4 changes: 2 additions & 2 deletions doc/spec/basic_conventions.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.4.0" osi-version="x.y.z"/></Tool>
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.5.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 All @@ -37,5 +37,5 @@ The rules above for FMI 2.0 apply, with the provision that the annotation shall

[source,xml]
----
<Annotation type="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.4.0" osi-version="x.y.z"/></Annotation>
<Annotation type="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.5.0" osi-version="x.y.z"/></Annotation>
----
2 changes: 1 addition & 1 deletion examples/open-simulation-interface
Submodule open-simulation-interface updated 63 files
+24 −0 .github/.pyspelling.yml
+390 −0 .github/spelling_custom_words_en_US.txt
+1 −1 .github/workflows/antora-generator.yml
+100 −36 .github/workflows/protobuf.yml
+17 −9 .github/workflows/release.yml
+2 −2 .gitignore
+3 −1 CMakeLists.txt
+1 −0 MANIFEST.in
+4 −2 doc/architecture/architecture_overview.adoc
+0 −9 doc/architecture/feature_data.adoc
+0 −22 doc/architecture/formatting_scripts.adoc
+1 −0 doc/architecture/reference_points_coordinate_systems.adoc
+4 −0 doc/architecture/sensor_data.adoc
+6 −5 doc/architecture/trace_file_formats.adoc
+ − doc/images/OSI_Planned_Route.png
+ − doc/images/OSI_Route_Segment.png
+ − doc/images/osi-streaming-principle.png
+0 −2 doc/open-simulation-interface_user_guide.adoc
+0 −244 format/OSITrace.py
+0 −63 format/osi2read.py
+0 −75 format/txt2osi.py
+66 −0 osi3trace/osi2read.py
+168 −0 osi3trace/osi_trace.py
+157 −8 osi_common.proto
+6 −2 osi_detectedobject.proto
+2 −2 osi_environment.proto
+34 −12 osi_featuredata.proto
+60 −2 osi_groundtruth.proto
+8 −3 osi_hostvehicledata.proto
+6 −5 osi_lane.proto
+5 −1 osi_logicaldetectiondata.proto
+140 −6 osi_logicallane.proto
+8 −0 osi_motionrequest.proto
+70 −15 osi_object.proto
+7 −6 osi_referenceline.proto
+5 −1 osi_roadmarking.proto
+138 −0 osi_route.proto
+50 −0 osi_sensordata.proto
+16 −2 osi_sensorview.proto
+9 −1 osi_sensorviewconfiguration.proto
+9 −1 osi_streamingupdate.proto
+26 −14 osi_trafficcommand.proto
+12 −0 osi_trafficcommandupdate.proto
+2 −1 osi_trafficlight.proto
+12 −11 osi_trafficsign.proto
+9 −1 osi_trafficupdate.proto
+35 −0 pyproject.toml
+2 −0 requirements_tests.txt
+2 −1 rules.yml
+111 −78 setup.py
+107 −44 tests/test_comment_type.py
+26 −9 tests/test_doxygen_output.py
+18 −5 tests/test_invalid_comment.py
+76 −27 tests/test_invalid_enum.py
+87 −47 tests/test_invalid_html.py
+168 −59 tests/test_invalid_message.py
+8 −3 tests/test_invalid_punctuation.py
+7 −2 tests/test_invalid_tabs.py
+8 −3 tests/test_newline.py
+23 −4 tests/test_non_ascii.py
+6 −5 tests/test_osi_trace.py
+77 −22 tests/test_rules.py
+39 −10 tests/test_units.py

0 comments on commit d5609c8

Please sign in to comment.