Skip to content

Commit 7f5a0a7

Browse files
ClemensLinnhoffClemensLinnhoff
committed
Merge branch 'master' into feature/flatbuffers_examples
Signed-off-by: linnhoff <linnhoff@fzd.tu-darmstadt.de>
2 parents 33c99a5 + cf2e73d commit 7f5a0a7

File tree

8 files changed

+12
-16
lines changed

8 files changed

+12
-16
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@
22
path = examples/open-simulation-interface
33
url = https://github.com/OpenSimulationInterface/open-simulation-interface.git
44
branch = master
5-
[submodule "asciidoc-resources"]
6-
path = asciidoc-resources
7-
url = https://code.asam.net/simulation/asciidoc-resources.git

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
OSI Sensor Model Packaging specifies ways in which models (like e.g. environmental effect models, sensor models and logical models) using the [Open Simulation Interface (OSI)][] are to be packaged for their use in simulation environments using FMI 2.0.
66
The specification can be found in the [doc/osi-sensor-model-packaging_spec.adoc](doc/osi-sensor-model-packaging_spec.adoc) document in this repository.
77

8-
For more detailed information see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/osi-sensor-model-packaging/README.html).
8+
For more detailed information see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/#_osi_sensor_model_packaging).
99

1010
[Open Simulation Interface (OSI)]: https://github.com/OpenSimulationInterface/open-simulation-interface
1111

‎asciidoc-resources‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/misc/example.adoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,43 @@ The example describes a sensor model FMU with one input, one output, and no addi
1616
canNotUseMemoryManagementFunctions="true"/>
1717
<DefaultExperiment startTime="0.0" stepSize="0.020"/>
1818
<VendorAnnotations>
19-
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.1" osi-version="3.3.1"/></Tool>
19+
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.2.0" osi-version="3.4.0"/></Tool>
2020
</VendorAnnotations>
2121
<ModelVariables>
2222
<ScalarVariable name="OSMPSensorViewIn.base.lo" valueReference="0" causality="input" variability="discrete">
2323
<Integer start="0"/>
2424
<Annotations>
25-
<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>
25+
<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>
2626
</Annotations>
2727
</ScalarVariable>
2828
<ScalarVariable name="OSMPSensorViewIn.base.hi" valueReference="1" causality="input" variability="discrete">
2929
<Integer start="0"/>
3030
<Annotations>
31-
<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>
31+
<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>
3232
</Annotations>
3333
</ScalarVariable>
3434
<ScalarVariable name="OSMPSensorViewIn.size" valueReference="2" causality="input" variability="discrete">
3535
<Integer start="0"/>
3636
<Annotations>
37-
<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>
37+
<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>
3838
</Annotations>
3939
</ScalarVariable>
4040
<ScalarVariable name="OSMPSensorDataOut.base.lo" valueReference="3" causality="output" variability="discrete" initial="exact">
4141
<Integer start="0"/>
4242
<Annotations>
43-
<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>
43+
<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>
4444
</Annotations>
4545
</ScalarVariable>
4646
<ScalarVariable name="OSMPSensorDataOut.base.hi" valueReference="4" causality="output" variability="discrete" initial="exact">
4747
<Integer start="0"/>
4848
<Annotations>
49-
<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>
49+
<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>
5050
</Annotations>
5151
</ScalarVariable>
5252
<ScalarVariable name="OSMPSensorDataOut.size" valueReference="5" causality="output" variability="discrete" initial="exact">
5353
<Integer start="0"/>
5454
<Annotations>
55-
<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>
55+
<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>
5656
</Annotations>
5757
</ScalarVariable>
5858
</ModelVariables>

‎doc/misc/introduction.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
_OSI Sensor Model Packaging_ (OSMP) is a package layer specification for the _Open Simulation Interface_ (OSI).
44
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).
55

6-
This is version 1.1.1 of this specification. The version number is to be
6+
This is version 1.2.0 of this specification. The version number is to be
77
interpreted according to the https://semver.org/spec/v2.0.0.html[_Semantic Versioning Specification 2.0.0_].

‎doc/spec/basic_conventions.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The following annotation shall be placed into the `<VendorAnnotations>` element
77

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

1313
The `@osi-version` attribute should contain the major, minor, and patch version number of the OSI specification that this model was compiled against.

‎examples/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1717
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1818
endif()
1919

20-
set(OSMPVERSION "1.1.1" CACHE STRING "OSMP Version String")
20+
set(OSMPVERSION "1.2.0" CACHE STRING "OSMP Version String")
2121

2222
add_subdirectory( open-simulation-interface )
2323

‎examples/open-simulation-interface‎

Submodule open-simulation-interface updated 93 files

0 commit comments

Comments
 (0)