Commit 390119fc authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge with current cygwin version into TTF0002 branch

parent 6923d0bb

asn1/CAM/module.mk

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
sources := CAM_PDU_Descriptions.asn

asn1/DENM/module.mk

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
sources := DENM_PDU_Descriptions.asn

asn1/IS/ETSI_TS_103301/RTCMEM_PDU_Descriptions.asn

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
-- @brief Specification of the RTCM corrections extended Message ETSI TS 103 301

-- Latest version available at @url https://forge.etsi.org/rep/ITS/asn1/is_ts103301.git



RTCMEM-PDU-Descriptions {

    itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts103301 (103301) rtcmem (5) version1 (1)

}



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)};



RTCMEM ::= SEQUENCE {

  header  ItsPduHeader,

  rtcmc   RTCMcorrections

}



END

asn1/IS/ISO_TS_19091/AddGrpC.asn

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,8 @@ DEFINITIONS AUTOMATIC TAGS::= BEGIN 
IMPORTS

IMPORTS

--FIXME RGY all definitions are moved to IS-DSRC-noCircular to cut circular import loop

--FIXME RGY all definitions are moved to IS-DSRC-noCircular to cut circular import loop

--DeltaTime, FuelType, IntersectionID, LaneConnectionID, LaneID, NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus, SignalGroupID, VehicleHeight FROM DSRC { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2) }

--DeltaTime, FuelType, IntersectionID, LaneConnectionID, LaneID, NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus, SignalGroupID, VehicleHeight FROM DSRC { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version2 (2) }

NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus, SignalGroupID, DeltaTime, LaneID, LaneConnectionID, FuelType, VehicleHeight FROM DSRC-REGION-noCircular

NodeOffsetPointXY, NodeSetXY, PrioritizationResponseStatus, SignalGroupID, DeltaTime, LaneID, LaneConnectionID, FuelType, VehicleHeight

FROM DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) }





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

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

asn1/IS/ISO_TS_19091/AddGrpC_noCircular.asn

+7 −4
Original line number Original line Diff line number Diff line
@@ -7,17 +7,20 @@ 
-- 

-- 

-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-

--FIXME RGY definitions are moved here from AddGrpC; created to cut circular import loops amongst ASN.1 files

--FIXME RGY definitions are moved here from AddGrpC; created to cut circular import loops amongst ASN.1 files

AddGrpC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) addgrpc (0) version (1) }

AddGrpC-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) addgrpc (1) version (1) }









DEFINITIONS AUTOMATIC TAGS::= BEGIN 

DEFINITIONS AUTOMATIC TAGS::= BEGIN 

IMPORTS;

IMPORTS 

PtvRequestType

FROM DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) } 

;





Control-addGrpC ::=  SEQUENCE {

Control-addGrpC ::=  SEQUENCE {

	ptvRequest			PtvRequestType,

	ptvRequest			PtvRequestType,

	...

	...

}

}



/*

PtvRequestType	::= ENUMERATED {

PtvRequestType	::= ENUMERATED {

	preRequest,

	preRequest,

	mainRequest,

	mainRequest,
@@ -26,5 +29,5 @@ PtvRequestType ::= ENUMERATED { 
	emergencyRequest,

	emergencyRequest,

	...

	...

}

}



*/

END
 
END