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

Merge with current cygwin version into TTF0002 branch

parent 6923d0bb
sources := CAM_PDU_Descriptions.asn
sources := DENM_PDU_Descriptions.asn
-- @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
......@@ -26,7 +26,8 @@ DEFINITIONS AUTOMATIC TAGS::= BEGIN
IMPORTS
--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) }
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) };
......
......@@ -7,17 +7,20 @@
--
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
--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
IMPORTS;
IMPORTS
PtvRequestType
FROM DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) }
;
Control-addGrpC ::= SEQUENCE {
ptvRequest PtvRequestType,
...
}
/*
PtvRequestType ::= ENUMERATED {
preRequest,
mainRequest,
......@@ -26,5 +29,5 @@ PtvRequestType ::= ENUMERATED {
emergencyRequest,
...
}
*/
END
......@@ -25,10 +25,13 @@ IMPORTS
Reg-SPAT,Reg-SignalRequestMessage, Reg-SignalStatusMessage, Reg-MapData, Reg-AdvisorySpeed, Reg-ComputedLane, Reg-ConnectionManeuverAssist,
Reg-GenericLane, Reg-IntersectionGeometry, Reg-IntersectionState, Reg-LaneAttributes, /*Reg-LaneDataAttribute,*/ Reg-MovementEvent, Reg-MovementState,
/*Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY,*/ Reg-Position3D, Reg-RequestorDescription, Reg-RequestorType, Reg-RestrictionUserType, Reg-RoadSegment,
Reg-SignalControlZone, Reg-SignalRequestPackage, Reg-SignalRequest, Reg-SignalStatusPackage, Reg-SignalStatus, Reg-RTCMcorrections FROM REGION {iso (1) standard (0) signalizedIntersection (19091) profilec (2) region (1) version2 (2)}
Reg-SignalControlZone, Reg-SignalRequestPackage, Reg-SignalRequest, Reg-SignalStatusPackage, Reg-SignalStatus, Reg-RTCMcorrections
FROM REGION {iso (1) standard (0) signalizedIntersection (19091) profilec (2) region (1) version2 (2)}
--FIXME RGY definitions moved to DSRC-REGION-noCircular but also refernced here are re-imported
DeltaAngle, DeltaTime, LaneID, LaneConnectionID, IntersectionID, NodeSetXY, PrioritizationResponseStatus, RegionalExtension, SignalGroupID, SpeedLimitList, Velocity, NodeOffsetPointXY, NodeAttributeXY, Reg-LaneDataAttribute, Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY, Offset-B12, Offset-B09, Offset-B10 FROM DSRC-REGION-noCircular
DeltaAngle, DeltaTime, LaneID, LaneConnectionID, IntersectionID, NodeSetXY, PrioritizationResponseStatus, RegionalExtension, SignalGroupID, SpeedLimitList,
Velocity, NodeOffsetPointXY, NodeAttributeXY, Reg-LaneDataAttribute, Reg-NodeAttributeSetXY, Reg-NodeOffsetPointXY, Offset-B12, Offset-B09, Offset-B10, Node-LLmD-64b, NodeAttributeXYList
FROM DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) }
Iso3833VehicleType FROM ElectronicRegistrationIdentificationVehicleDataModule {iso(1) standard(0) iso24534 (24534) vehicleData (1) version1 (1)}
......@@ -403,17 +406,16 @@ NodeAttributeXY ::= ENUMERATED {
hydrantPresent,
...
}
*/
NodeAttributeXYList ::= SEQUENCE (SIZE(1..8)) OF NodeAttributeXY
FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop
Node-LLmD-64b ::= SEQUENCE {
lon Longitude,
lat Latitude
}
/*FIXME RGY moved to IS-DSRC-REGION-noCircular to cut circular import loop
Node-XY-20b ::= SEQUENCE {
x Offset-B10,
y Offset-B10
......
......@@ -5,7 +5,7 @@
--
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
--FIXME RGY definitions are moved here from IS-DSRC and IS-REGION; created to cut circular import loops amongst ASN.1 files
DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc (2) version (2) }
DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) }
DEFINITIONS AUTOMATIC TAGS::= BEGIN
......
......@@ -21,11 +21,13 @@ DEFINITIONS AUTOMATIC TAGS::= BEGIN
IMPORTS
--FIXME RGY definitions moved to non-circularity module
--addGrpC, REG-EXT-ID-AND-TYPE FROM DSRC
NodeAttributeSet-addGrpC, addGrpC, REG-EXT-ID-AND-TYPE FROM DSRC-REGION-noCircular
NodeAttributeSet-addGrpC, addGrpC, REG-EXT-ID-AND-TYPE
FROM DSRC-REGION-noCircular { iso (1) standard (0) signalizedIntersection (19091) profilec(2) dsrc-reg (3) version (2) }
--FIXME RGY NodeAttributeSet-addGrpC has been moved to a non-circularity module
--NodeAttributeSet-addGrpC FROM AddGrpC-noCircular
ConnectionManeuverAssist-addGrpC, ConnectionTrajectory-addGrpC, IntersectionState-addGrpC, /*NodeAttributeSet-addGrpC,*/ Position3D-addGrpC, RestrictionUserType-addGrpC, LaneAttributes-addGrpC, MovementEvent-addGrpC, RequestorDescription-addGrpC,
SignalStatusPackage-addGrpC, MapData-addGrpC FROM AddGrpC {iso (1) standard (0) signalizedIntersection (19091) profilec (2) addgrpc (0) version2 (2)};
SignalStatusPackage-addGrpC, MapData-addGrpC
FROM AddGrpC {iso (1) standard (0) signalizedIntersection (19091) profilec (2) addgrpc (0) version2 (2)};
Reg-AdvisorySpeed REG-EXT-ID-AND-TYPE ::= { ... }
......
sources := \
ETSI_TS_103301/IVIM_PDU_Descriptions.asn \
ETSI_TS_103301/MAPEM_PDU_Descriptions.asn \
ETSI_TS_103301/RTCMEM_PDU_Descriptions.asn \
ETSI_TS_103301/SPATEM_PDU_Descriptions.asn\
ETSI_TS_103301/SREM_PDU_Descriptions.asn \
ETSI_TS_103301/SSEM_PDU_Descriptions.asn \
ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
ISO_TS_14906/EfcDsrcApplication.asn \
ISO_TS_14906/EfcDsrcGeneric.asn \
ISO_TS_17419/CITSapplMgmtIDs.asn \
ISO_TS_19091/AddGrpC.asn \
ISO_TS_19091/AddGrpC_noCircular.asn \
ISO_TS_19091/DSRC.asn \
ISO_TS_19091/DSRC_REGION_noCircular.asn \
ISO_TS_19091/REGION.asn \
ISO_TS_19321/IVI.asn \
ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn
sources := ITS_Container.asn
\ No newline at end of file
sources := \
./1609Dot2/IEEE1609dot2.asn \
./1609Dot2/IEEE1609dot2BaseTypes.asn \
./EtsiTs103097Module.asn \
./TS102921/EtsiTs102941BaseTypes.asn \
./TS102921/EtsiTs102941MessagesCa.asn \
./TS102921/EtsiTs102941TrustLists.asn \
./TS102921/EtsiTs102941TypesAuthorization.asn \
./TS102921/EtsiTs102941TypesAuthorizationValidation.asn \
./TS102921/EtsiTs102941TypesCaManagement.asn \
./TS102921/EtsiTs102941TypesEnrolment.asn \
modules := ttcn/Common \
asn1/ITS-Container \
# asn1/IS \
# asn1/Security \
# asn1/DENM \
# asn1/CAM \
# ttcn/DENM \
# ttcn/IVIM \
# ttcn/MapemSpatem \
# ttcn/Pki \
# ttcn/SremSsem \
# ttcn/Http \
sources := LibItsBtp_EncdecDeclarations.ttcn \
LibItsBtp_Functions.ttcn \
LibItsBtp_Pixits.ttcn \
LibItsBtp_Templates.ttcn \
LibItsBtp_TestSystem.ttcn \
LibItsBtp_TypesAndValues.ttcn
sources := \
LibItsCam_EncdecDeclarations.ttcn \
LibItsCam_Functions.ttcn \
LibItsCam_Pics.ttcn \
LibItsCam_Pixits.ttcn \
LibItsCam_Templates.ttcn \
LibItsCam_TestSystem.ttcn \
LibItsCam_TypesAndValues.ttcn
sources := LibItsCommon_ASN1_ISDSRC_NamedNumbers.ttcn \
LibItsCommon_ASN1_NamedNumbers.ttcn \
LibItsCommon_Functions.ttcn \
LibItsCommon_Pixits.ttcn \
LibItsCommon_Templates.ttcn \
LibItsCommon_TestSystem.ttcn \
LibItsCommon_TypesAndValues.ttcn \
LibItsExternal_TypesAndValues.ttcn
\ No newline at end of file
sources := LibItsDenm_EncdecDeclarations.ttcn \
LibItsDenm_Functions.ttcn \
LibItsDenm_Pics.ttcn \
LibItsDenm_Pixits.ttcn \
LibItsDenm_Templates.ttcn \
LibItsDenm_TestSystem.ttcn \
LibItsDenm_TypesAndValues.ttcn
\ No newline at end of file
sources := \
LibItsGeoNetworking_EncdecDeclarations.ttcn \
LibItsGeoNetworking_Functions.ttcn \
LibItsGeoNetworking_Pics.ttcn \
LibItsGeoNetworking_Pixits.ttcn \
LibItsGeoNetworking_Templates.ttcn \
LibItsGeoNetworking_TestSystem.ttcn \
LibItsGeoNetworking_TypesAndValues.ttcn \
sources := LibItsHttp_BinaryMessageBodyTypes.ttcn \
LibItsHttp_BinaryTemplates.ttcn \
LibItsHttp_BinaryTypes.ttcn \
LibItsHttp_EncdecDeclarations.ttcn \
LibItsHttp_Functions.ttcn \
LibItsHttp_JSONTypes.ttcn \
LibItsHttp_JsonMessageBodyTypes.ttcn \
LibItsHttp_JsonTemplates.ttcn \
LibItsHttp_MessageBodyTypes.ttcn \
LibItsHttp_Pics.ttcn \
LibItsHttp_Templates.ttcn \
LibItsHttp_TestSystem.ttcn \
LibItsHttp_TypesAndValues.ttcn \
LibItsHttp_XMLTypes.ttcn \
LibItsHttp_XmlMessageBodyTypes.ttcn \
LibItsHttp_XmlTemplates.ttcn
sources := LibItsIvim_ASN1_IVInamedNumbers.ttcn \
LibItsIvim_EncdecDeclarations.ttcn \
LibItsIvim_Functions.ttcn \
LibItsIvim_Pics.ttcn \
LibItsIvim_Pixits.ttcn \
LibItsIvim_Templates.ttcn \
LibItsIvim_TestSystem.ttcn \
LibItsIvim_TypesAndValues.ttcn
sources := \
LibItsIpv6OverGeoNetworking_EncdecDeclarations.ttcn \
LibItsIpv6OverGeoNetworking_Functions.ttcn \
LibItsIpv6OverGeoNetworking_Pics.ttcn \
LibItsIpv6OverGeoNetworking_Pixits.ttcn \
LibItsIpv6OverGeoNetworking_Templates.ttcn \
LibItsIpv6OverGeoNetworking_TestSystem.ttcn \
LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment