Commit 9bb1656b authored by garciay's avatar garciay
Browse files

Code upgraded due to changes from the last commit of ITS-Container ASN.1 file

parent 69fca229

asn1/CAM/CAM.asn

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



IMPORTS 

   ItsPduHeader, CauseCode, ReferencePosition, AccelerationControl, Curvature, CurvatureCalculationMode, Heading, PtActivation, LaneNumber, EmergencyPriority, EmbarkationStatus, Speed, DriveDirection, LongitudinalAcceleration, LateralAcceleration, VerticalAcceleration, StationType, ExteriorLights, DangerousGoodsBasic, PerformanceClass, SpecialTransportType, LightBarSirenInUse, VehicleRole, VehicleLength, VehicleWidth, PathHistory, RoadworksSubCauseCode, ClosedLanes, TrafficRule, SpeedLimit, SteeringWheelAngle, YawRate FROM ITS-Container {

   ItsPduHeader, CauseCode, ReferencePosition, AccelerationControl, Curvature, CurvatureCalculationMode, Heading, PtActivation, EmergencyPriority, EmbarkationStatus, Speed, DriveDirection, LongitudinalAcceleration, LateralAcceleration, VerticalAcceleration, StationType, ExteriorLights, DangerousGoodsBasic, PerformanceClass, SpecialTransportType, LightBarSirenInUse, VehicleRole, VehicleLength, VehicleWidth, PathHistory, RoadworksSubCauseCode, ClosedLanes, TrafficRule, SpeedLimit, SteeringWheelAngle, YawRate FROM ITS-Container {

 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 

};
@@ -73,7 +73,6 @@ CAM ::= SEQUENCE { 
  curvatureCalculationMode CurvatureCalculationMode,

  yawRate YawRate,

  accelerationControl AccelerationControl OPTIONAL,

  laneNumber LaneNumber OPTIONAL,

  steeringWheelAngle SteeringWheelAngle OPTIONAL,

  lateralAcceleration LateralAcceleration OPTIONAL,

  verticalAcceleration VerticalAcceleration OPTIONAL,

asn1/DENM/DENM.asn

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



IMPORTS 

   ItsPduHeader, CauseCode, StationID, Speed, InformationQuality, ReferencePosition, ClosedLanes, DangerousGoodsExtended, Heading, LaneNumber, LightBarSirenInUse, PathHistory, RoadType, HeightLonCarr, PosLonCarr, PosPillar, PosCentMass, PositioningSolutionType, RequestResponseIndication, StationType, SpeedLimit, StationarySince, TimestampIts, WheelBaseVehicle, TurningRadius, PosFrontAx, PositionOfOccupants, Temperature, VehicleMass, VehicleIdentification, EnergyStorageType FROM ITS-Container {

   ActionID, SequenceNumber, ValidityDuration, TransmissionInterval, Traces, ItsPduHeader, CauseCode, StationID, Speed, InformationQuality, ReferencePosition, ClosedLanes, DangerousGoodsExtended, Heading, LightBarSirenInUse, PathHistory, RoadType, HeightLonCarr, PosLonCarr, PosPillar, PosCentMass, PositioningSolutionType, RequestResponseIndication, StationType, SpeedLimit, StationarySince, TimestampIts, WheelBaseVehicle, TurningRadius, PosFrontAx, PositionOfOccupants, Temperature, VehicleMass, VehicleIdentification, EnergyStorageType FROM ITS-Container {

 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 

};
@@ -93,7 +93,7 @@ StationaryVehicleContainer ::= SEQUENCE { 




AlacarteContainer ::= SEQUENCE {

	laneNumber LaneNumber OPTIONAL,



	impactReduction	ImpactReductionContainer OPTIONAL,

	externalTemperature Temperature OPTIONAL,

	roadWorks RoadWorksContainerExtended OPTIONAL,
@@ -102,27 +102,8 @@ AlacarteContainer ::= SEQUENCE { 
	...

}



 ActionID ::= SEQUENCE {



  originatorStationID StationID,

  sequenceNumber SequenceNumber

 }



 SequenceNumber ::=	INTEGER (0..65535)



 defaultValidity INTEGER ::= 600

 

 ValidityDuration ::=	INTEGER { timeOfDetection(0), oneSecondAfterDetection(1) } (0..86400)

 

 Traces ::= SEQUENCE SIZE(0..7) OF PathHistory

    

 ItineraryPath ::= SEQUENCE SIZE(0..40) OF ReferencePosition

 

 TransmissionInterval ::= INTEGER { oneMilliSecond(1), tenSeconds(10000) } (1..10000)

 

 RelevanceDistance ::= ENUMERATED { lessThan50m(0)

, lessThan100m(1), lessThan200m(2), lessThan500m(3), lessThan1000m(4), lessThan5km(5), lessThan10km(6), over10km(7) }

  

 RelevanceTrafficDirection ::= ENUMERATED { unavailable(0), upstreamTraffic(1), downstreamTraffic(2), allTrafficDirection(3) }



END

ttcn/CAM/LibItsCam_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ module LibItsCam_Functions { 
                p_referencePosition.latitude,

                p_referencePosition.longitude,

                p_offSet,

                p_referencePosition.positionConfidenceEllipse.semiMajorOrientation.headingValue,

                p_referencePosition.positionConfidenceEllipse.semiMajorOrientation,

                v_referencePosition.latitude,

                v_referencePosition.longitude

            );

ttcn/CAM/LibItsCam_Templates.ttcn

+9 −10
Original line number Diff line number Diff line
@@ -8,13 +8,17 @@ 
module LibItsCam_Templates {

    

    // LibIts

    import from ITS_Container language "ASN.1:1997" all;

    import from CAM_PDU_Descriptions language "ASN.1:1997" all;

    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    // LibItsCommon

    import from LibItsCommon_Functions all;

    import from LibItsCommon_TypesAndValues all;

    

    // LibItsCam

    import from LibItsCam_TestSystem all;

    import from LibItsCam_TypesAndValues all;

    import from ITS_Container language "ASN.1:1997" all;

    import from CAM_PDU_Descriptions language "ASN.1:1997" all;

    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    group camPrimitives {
@@ -149,10 +153,7 @@ module LibItsCam_Templates { 
            positionConfidenceEllipse := {

                semiMajorConfidence   := c_semiAxisLengthOneCentimeter,

                semiMinorConfidence   := c_semiAxisLengthOneCentimeter,

                semiMajorOrientation  := {

                    headingValue := c_headingValue_wgs84North,

                    headingConfidence := 10

                }

                semiMajorOrientation  := c_headingValue_wgs84North

            },

            altitude := {

                altitudeValue := c_altitudeValue_seaLevel,
@@ -240,7 +241,6 @@ module LibItsCam_Templates { 
            curvatureCalculationMode := ?,

            yawRate := ?,

            accelerationControl := *,

            laneNumber := *,

            steeringWheelAngle := *,

            lateralAcceleration := *,

            verticalAcceleration := *,
@@ -531,7 +531,6 @@ module LibItsCam_Templates { 
                                yawRateConfidence := unavailable

                            },

                            accelerationControl := omit,

                            laneNumber := omit,

                            steeringWheelAngle := omit,

                            lateralAcceleration := omit,

                            verticalAcceleration := omit,

ttcn/DENM/LibItsDenm_Functions.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ module LibItsDenm_Functions { 
    import from LibItsDenm_TestSystem all;

    import from LibItsDenm_TypesAndValues all; 

    import from LibItsDenm_Templates all; 

    import from ITS_Container language "ASN.1:1997" all;

    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    group utFuntions {