Commit 63536348 authored by Denis Filatov's avatar Denis Filatov
Browse files

RC version of CPM module

parent aeffda20

.gitlab-ci.yml

+3 −3
Changes for .gitlab-ci.yml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ include: 
    file: '/gitlab-ci/base.yml'



variables:

  ASN1_SRC: 'asn/*.asn asn/cam/*.asn asn/vam/*.asn asn/cdd/*.asn'

  ASN1_SRC: 'asn/*.asn asn/cdd/*.asn'

  

validate:

  extends: .validate

#validate:

#  extends: .validate



documentation:

  extends: .documentation

.gitmodules

+0 −6
Changes for .gitmodules: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line 
[submodule "asn/cdd"]

	path = asn/cdd

	url = https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2.git
 
[submodule "asn/cam"]

	path = asn/cam

	url = https://forge.etsi.org/rep/ITS/asn1/cam_en302637_2.git

[submodule "asn/vam"]

	path = asn/vam

	url = https://forge.etsi.org/rep/ITS/asn1/vam-ts103300_3.git

asn/CPM-OriginatingStationContainers.asn

100644 → 100755
+0 −0
Changes for asn/CPM-OriginatingStationContainers.asn: 0 added lines, 0 removed lines.
Original line number Diff line number Diff line

asn/CPM-PDU-Descriptions.asn

100644 → 100755
+10 −5
Changes for asn/CPM-PDU-Descriptions.asn: 10 added lines, 5 removed lines.
Original line number Diff line number Diff line 
-- Date 29.11.2022

-- Date 1.12.2022



CPM-PDU-Descriptions { itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103324) cpm (1) major-version-1 (1) minor-version-1(1)}
@@ -52,14 +52,12 @@ CollectivePerceptionMessage ::= SEQUENCE { 
 *

 * @field managementContainer: the management container. 

 *

 * @field cpmContainers: the list of CPM containers, including either one or none of originatingVehicleContainer and/or originatingRsuContainer. 

 * @field cpmContainers: the list of CPM containers, including its container type identifier and including either one or none of originatingVehicleContainer and/or originatingRsuContainer. 

 *

*/

CpmPayload ::= SEQUENCE {

    managementContainer   ManagementContainer,

    cpmContainers         WrappedCpmContainers

    ((WITH COMPONENT (WITH COMPONENTS {..., containerId (ALL EXCEPT 1)})) |

    (WITH COMPONENT (WITH COMPONENTS {..., containerId (ALL EXCEPT 2)}))),

    cpmContainers         ConstraintWrappedCpmContainers,

    ...

}
@@ -150,6 +148,13 @@ WrappedCpmContainer ::= SEQUENCE { 
*/

WrappedCpmContainers::= SEQUENCE SIZE(1..8,...) OF WrappedCpmContainer 



/**

 * This DF represents a list of CPM containers, each with their type identifier with an additional constraint. 

*/

ConstraintWrappedCpmContainers ::= WrappedCpmContainers

    ((WITH COMPONENT (WITH COMPONENTS {..., containerId (ALL EXCEPT 1)})) |

    (WITH COMPONENT (WITH COMPONENTS {..., containerId (ALL EXCEPT 2)})))



/**

 * This DF  represents the planned or expected range of the message generation rate.

 *

asn/CPM-PerceivedObjectContainer.asn

100644 → 100755
+2 −2
Changes for asn/CPM-PerceivedObjectContainer.asn: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
-- Date: 29.11.2022

-- Date: 30.11.2022



CPM-PerceivedObjectContainer {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103324) perceivedObjectContainer (4) major-version-1 (1) minor-version-1(1)}
@@ -30,7 +30,7 @@ PerceivedObjectContainer ::= SEQUENCE { 


/** @brief Perceived Objects

 * This DF provides a list of perceived objects represented in the coordinate system of the originating station:

 * - For a vehicle, the  body-fixed coordinate system as provided by ISO 8855 originating at the ITS-station’s reference point. 

 * - For a vehicle, the  body-fixed coordinate system as provided by ISO 8855 originating at the ITS-station’s reference point. 

 * - For an RSU the coordinate system in which the y-axis corresponds to the North direction, the x-axis to the East direction, and the z- axis to the vertical direction.

*/

PerceivedObjects::= SEQUENCE SIZE(0..255, ...) OF PerceivedObject (WITH COMPONENTS {... ,objectId ABSENT})