Skip to content

Commit 97caa37

Browse files
committed
Update versions for 1.1.1 patch release
1 parent 26377e0 commit 97caa37

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

doc/specification.rst

+19-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sensor models, logical models and traffic participant models using the
66
`Open Simulation Interface`_ are to be packaged for their use in simulation
77
environments using FMI 2.0.
88

9-
This is version 1.1.0 of this document. The version number is to be
9+
This is version 1.1.1 of this document. The version number is to be
1010
interpreted according to the `Semantic Versioning Specification (SemVer)
1111
2.0.0`_.
1212

@@ -64,7 +64,7 @@ The following basic conventions apply:
6464

6565
.. code:: XML
6666
67-
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.0" osi-version="3.3.0"/></Tool>
67+
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.1" osi-version="3.3.1"/></Tool>
6868
6969
where the ``osi-version`` attribute SHOULD contain the major, minor
7070
and patch version number of the open simulation interface
@@ -163,9 +163,9 @@ the following convention is used to define such variables for FMI 2.0:
163163
``<mime-type>``, which MUST be a valid MIME type specification.
164164

165165
In the case of OSI-specified data, the MIME type MUST be of the form
166-
``application/x-open-simulation-interface; type=SensorView; version=3.3.0``
166+
``application/x-open-simulation-interface; type=SensorView; version=3.3.1``
167167
indicating that the binary content is conformant to a given OSI
168-
version (3.3.0 in this example), containing a message of the type
168+
version (3.3.1 in this example), containing a message of the type
169169
given in the ``type`` parameter (````osi3::SensorView```` in this
170170
example).
171171

@@ -206,7 +206,7 @@ Sensor View Inputs
206206

207207
- The MIME type of the variable MUST specify the ``type=SensorView``,
208208
e.g.
209-
``application/x-open-simulation-interface; type=SensorView; version=3.3.0``.
209+
``application/x-open-simulation-interface; type=SensorView; version=3.3.1``.
210210

211211
- The sensor view MUST be encoded as ``osi3::SensorView`` (see the OSI
212212
specification documentation for more details).
@@ -245,7 +245,7 @@ Sensor View Input Configuration
245245

246246
- The MIME type of both variables MUST specify the
247247
``type=SensorViewConfiguration``, e.g.
248-
``application/x-open-simulation-interface; type=SensorViewConfiguration; version=3.3.0``.
248+
``application/x-open-simulation-interface; type=SensorViewConfiguration; version=3.3.1``.
249249

250250
- The variables values MUST be encoded as ``osi3::SensorViewConfiguration``
251251
(see the OSI specification documentation for more details).
@@ -287,7 +287,7 @@ Sensor View Outputs
287287

288288
- The MIME type of the variable MUST specify the ``type=SensorView``,
289289
e.g.
290-
``application/x-open-simulation-interface; type=SensorView; version=3.3.0``.
290+
``application/x-open-simulation-interface; type=SensorView; version=3.3.1``.
291291

292292
- The sensor view MUST be encoded as ``osi3::SensorView`` (see the OSI
293293
specification documentation for more details).
@@ -327,7 +327,7 @@ Sensor Data Outputs
327327

328328
- The MIME type of the variable MUST specify the ``type=SensorData``,
329329
e.g.
330-
``application/x-open-simulation-interface; type=SensorData; version=3.3.0``.
330+
``application/x-open-simulation-interface; type=SensorData; version=3.3.1``.
331331

332332
- The sensor data MUST be encoded as ``osi3::SensorData`` (see the OSI
333333
specification documentation for more details).
@@ -368,7 +368,7 @@ Sensor Data Inputs
368368

369369
- The MIME type of the variable MUST specify the ``type=SensorData``,
370370
e.g.
371-
``application/x-open-simulation-interface; type=SensorData; version=3.3.0``.
371+
``application/x-open-simulation-interface; type=SensorData; version=3.3.1``.
372372

373373
- The sensor data MUST be encoded as ``osi3::SensorData`` (see the OSI
374374
specification documentation for more details).
@@ -401,7 +401,7 @@ GroundTruth Initialization Parameters
401401
``causality="parameter"``, ``variability="fixed"`` and ``initial="exact"``.
402402

403403
- The MIME type of the variable MUST specify the ``type=GroundTruth``, e.g.
404-
``application/x-open-simulation-interface; type=GroundTruth; version=3.3.0``.
404+
``application/x-open-simulation-interface; type=GroundTruth; version=3.3.1``.
405405

406406
- ``OSMPGroundTruthInit`` MUST be encoded as ``osi3::GroundTruth`` (see the OSI
407407
specification documentation for more details).
@@ -442,7 +442,7 @@ Traffic Update Outputs
442442

443443
- The MIME type of the variable MUST specify the ``type=TrafficUpdate``,
444444
e.g.
445-
``application/x-open-simulation-interface; type=TrafficUpdate; version=3.3.0``.
445+
``application/x-open-simulation-interface; type=TrafficUpdate; version=3.3.1``.
446446

447447
- The traffic update MUST be encoded as ``osi3::TrafficUpdate`` (see the
448448
OSI specification documentation for more details).
@@ -486,7 +486,7 @@ Traffic Command Inputs
486486

487487
- The MIME type of the variable MUST specify the ``type=TrafficCommand``,
488488
e.g.
489-
``application/x-open-simulation-interface; type=TrafficCommand; version=3.3.0``.
489+
``application/x-open-simulation-interface; type=TrafficCommand; version=3.3.1``.
490490

491491
- The traffic command MUST be encoded as ``osi3::TrafficCommand`` (see
492492
the OSI specification documentation for more details).
@@ -521,43 +521,43 @@ with one input and output and no additional features:
521521
canNotUseMemoryManagementFunctions="true"/>
522522
<DefaultExperiment startTime="0.0" stepSize="0.020"/>
523523
<VendorAnnotations>
524-
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.0" osi-version="3.3.0"/></Tool>
524+
<Tool name="net.pmsf.osmp" xmlns:osmp="http://xsd.pmsf.net/OSISensorModelPackaging"><osmp:osmp version="1.1.1" osi-version="3.3.1"/></Tool>
525525
</VendorAnnotations>
526526
<ModelVariables>
527527
<ScalarVariable name="OSMPSensorViewIn.base.lo" valueReference="0" causality="input" variability="discrete">
528528
<Integer start="0"/>
529529
<Annotations>
530-
<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.0"/></Tool>
530+
<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>
531531
</Annotations>
532532
</ScalarVariable>
533533
<ScalarVariable name="OSMPSensorViewIn.base.hi" valueReference="1" causality="input" variability="discrete">
534534
<Integer start="0"/>
535535
<Annotations>
536-
<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.0"/></Tool>
536+
<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>
537537
</Annotations>
538538
</ScalarVariable>
539539
<ScalarVariable name="OSMPSensorViewIn.size" valueReference="2" causality="input" variability="discrete">
540540
<Integer start="0"/>
541541
<Annotations>
542-
<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.0"/></Tool>
542+
<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>
543543
</Annotations>
544544
</ScalarVariable>
545545
<ScalarVariable name="OSMPSensorDataOut.base.lo" valueReference="3" causality="output" variability="discrete" initial="exact">
546546
<Integer start="0"/>
547547
<Annotations>
548-
<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.0"/></Tool>
548+
<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>
549549
</Annotations>
550550
</ScalarVariable>
551551
<ScalarVariable name="OSMPSensorDataOut.base.hi" valueReference="4" causality="output" variability="discrete" initial="exact">
552552
<Integer start="0"/>
553553
<Annotations>
554-
<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.0"/></Tool>
554+
<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>
555555
</Annotations>
556556
</ScalarVariable>
557557
<ScalarVariable name="OSMPSensorDataOut.size" valueReference="5" causality="output" variability="discrete" initial="exact">
558558
<Integer start="0"/>
559559
<Annotations>
560-
<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.0"/></Tool>
560+
<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>
561561
</Annotations>
562562
</ScalarVariable>
563563
</ModelVariables>

examples/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1616
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1717
endif()
1818

19-
set(OSMPVERSION "1.1.0" CACHE STRING "OSMP Version String")
19+
set(OSMPVERSION "1.1.1" CACHE STRING "OSMP Version String")
2020

2121
add_subdirectory( open-simulation-interface )
2222

0 commit comments

Comments
 (0)