Commit 1751b499 authored by Thomas Ritter's avatar Thomas Ritter
Browse files

Annotating all Messages, update references

parent aacf1bb2

Dockerfile

+1 −7
Original line number Diff line number Diff line 
FROM ubuntu:xenial

FROM ubuntu:bionic



WORKDIR /home/etsi-its-asn1
@@ -16,10 +16,4 @@ RUN rm -rf /home/etsi-its-asn1/asn1c 


WORKDIR /home/etsi-its-asn1



ADD *.asn /home/etsi-its-asn1/

ADD syntax_check.bash /home/etsi-its-asn1/



ADD iso-patched/ /home/etsi-its-asn1/iso-patched/

ADD cdd/ /home/etsi-its-asn1/cdd/



CMD ./syntax_check.bash

IVIM-PDU-Descriptions.asn

+21 −2
Original line number Diff line number Diff line
@@ -10,11 +10,30 @@ DEFINITIONS AUTOMATIC TAGS ::= 
BEGIN



IMPORTS

IviStructure FROM IVI { iso (1) standard (0) ivi (19321) version2 (2) }

ItsPduHeader FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- @brief Include ISO 19321

-- Include references from @url https://standards.iso.org/iso/ts/19321/ed-2/en/ISO19321IVIv2.asn

IviStructure

FROM IVI { iso (1) standard (0) ivi (19321) version2 (2) }



-- @brief Include ETSI TS 102 894-2

-- Include references from @url https://forge.etsi.org/rep/ITS/ITS_ASN1/blob/master/CDD_TS102894-2/ITS-Container.asn

ItsPduHeader

FROM ITS-Container { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- In vehicle information Message Message



-- @brief In vehicle information Message Root

-- This DF includes DEs for the IVIM protocolVersion, the IVI message type identifier _messageID_,

-- the station identifier _stationID_ of the originating ITS-S and the IVI data from ISO TS 19321.

IVIM ::= SEQUENCE {

    -- @details header

    -- The DE _protocolVersion_ is used to select the appropriate protocol decoder at the receiving ITS-S.

    --   It shall be set to 2.

    -- The DE _messageID_ shall be ivim(6).

    header  ItsPduHeader,

    -- @details ivi

    -- The DE _ivi_ contains the IVI data as defined in ISO TS 19321.

    ivi     IviStructure

}

MAPEM-PDU-Descriptions.asn

+15 −1
Original line number Diff line number Diff line
@@ -11,11 +11,25 @@ BEGIN 


IMPORTS

MapData FROM DSRC { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2) }

ItsPduHeader FROM ITS-Container {  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- @brief Include ETSI TS 102 894-2

-- Include references from @url https://forge.etsi.org/rep/ITS/ITS_ASN1/blob/master/CDD_TS102894-2/ITS-Container.asn

ItsPduHeader

FROM ITS-Container {  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- Map (lane topology) extended Message



-- @brief Map (lane topology) extended Message Root

-- This DF includes DEs for the MAPEM: protocolVersion, the MAPEM message type identifier _messageID_,

-- the station identifier _stationID_ of the originating ITS-S and the Map data from ISO TS 19091.

MAPEM ::= SEQUENCE {

    -- @details header

    -- The DE _protocolVersion_ is used to select the appropriate protocol decoder at the receiving ITS-S.

    --   It shall be set to 2.

    -- The DE _messageID_ shall be mapem(5).

    header  ItsPduHeader,

    -- @details map

    -- The DE _map_ contains the MAP data as defined in ISO TS 19091.

    map	    MapData

}

README.md

+4 −4
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. 
## Dependencies



* The **[ITS-Container](https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2)** module from **[ETSI TS 102 894-2 v1.3.1](https://www.etsi.org/deliver/etsi_ts/102800_102899/10289402/01.03.01_60/ts_10289402v010301p.pdf)**: "Intelligent Transport Systems (ITS); Users and applications requirements; Part 2: Applications and facilities layer common data dictionary".

* The **[DSRC](https://standards.iso.org/iso/ts/19091/)** module from  **CEN ISO/TS 19091**: "Intelligent transport systems - Cooperative ITS - Using V2I and I2V communications for applications related to signalized intersections".

* The **[IVI](https://standards.iso.org/iso/ts/19321/ed-1/)** module from **CEN ISO/TS 19321-2015**: "Intelligent transport systems - Cooperative ITS - Dictionary of in-vehicle information (IVI) data structures".

* The **[DSRC](https://standards.iso.org/iso/ts/19091/)** module from  **CEN ISO/TS 19091-2018**: "Intelligent transport systems - Cooperative ITS - Using V2I and I2V communications for applications related to signalized intersections".

* The **[IVI](https://standards.iso.org/iso/ts/19321/ed-1/)** module from **CEN ISO/TS 19321-2020**: "Intelligent transport systems - Cooperative ITS - Dictionary of in-vehicle information (IVI) data structures".





## Syntax check
@@ -25,6 +25,6 @@ For convenience a Dockerfile is available that might be useful for this. 


```

Usage:

	>docker build -t etsi-its-asn-is:2.0.1 .

	>docker run etsi-its-asn-is:2.0.1

	>docker build -t etsi-its-asn-is:2.1.1 .

	>docker run -v `pwd`:/home/etsi-its-asn1 etsi-its-asn-is:2.1.1

```

RTCMEM-PDU-Descriptions.asn

+20 −2
Original line number Diff line number Diff line
@@ -10,12 +10,30 @@ DEFINITIONS AUTOMATIC TAGS ::= 
BEGIN



IMPORTS

RTCMcorrections FROM DSRC { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2) }

ItsPduHeader FROM ITS-Container {  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- @brief Include ISO 19091

-- Include references from @url https://standards.iso.org/iso/ts/19091/ed-2/en/ISO-TS-19091-addgrp-C-2018.asn

RTCMcorrections

FROM DSRC { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2) }



-- @brief Include ETSI TS 102 894-2

-- Include references from @url https://forge.etsi.org/rep/ITS/ITS_ASN1/blob/master/CDD_TS102894-2/ITS-Container.asn

ItsPduHeader

FROM ITS-Container {  itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)};



-- RTCM corrections extended extended Message



-- @brief RTCM corrections extended extended Message Root

-- This DF includes DEs for the RTCMEM: protocolVersion, the RTCMEM message type identifier _messageID_,

-- the station identifier _stationID_ of the originating ITS-S and the RTCM corrections as os ISO TS 19091.

RTCMEM ::= SEQUENCE {

    -- @details header

    -- The DE _protocolVersion_ is used to select the appropriate protocol decoder at the receiving ITS-S.

    --   It shall be set to 1.

    -- The DE _messageID_ shall be rtcmem(13).

    header  ItsPduHeader,

    -- @details rtcmc

    -- The DE _rtcmc_ contains the RTCM corrections data as defined in ISO TS 19091.

    rtcmc   RTCMcorrections

}