Commit 6fcc4da3 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge branch 'TTF0002' of https://forge.etsi.org/gitlab/LIBS/LibIts into TTF0002

parents dc79687e 2edfaf56

ttcn/CAM/LibItsCam_Templates.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ module LibItsCam_Templates { 
            in template (present) CAM p_camMsg

        ) := { 

            msgIn               := p_camMsg,

            recvTime            := ?,

            gnNextHeader        := *,

            gnHeaderType        := *,

            gnHeaderSubtype     := *,

ttcn/CAM/LibItsCam_TestSystem.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test 
             */

            type record CamInd {

                CAM         msgIn,

                UInt64      recvTime,

                UInt8       gnNextHeader optional,

                UInt8       gnHeaderType optional,

                UInt8       gnHeaderSubtype optional,

ttcn/Common/LibItsCommon_ASN1_ISDSRC_NamedNumbers.ttcn

+44 −41
Original line number Diff line number Diff line
@@ -5,26 +5,19 @@ module LibItsCommon_ASN1_ISDSRC_NamedNumbers { 
import from DSRC language "ASN.1:1997" all;



 group IS_DSCR_constants {



   group LaneParameter_constants {

        const LaneAttributes_Barrier LaneAttributes_Barrier_median_RevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Barrier LaneAttributes_Barrier_median_RevocableLane_ := '0000000000000000'B;

     const LaneAttributes_Bike LaneAttributes_Bike_bikeRevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Crosswalk LaneAttributes_Crosswalk_crosswalkRevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Parking LaneAttributes_Parking_parkingRevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Sidewalk LaneAttributes_Sidewalk_sidewalk_RevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Striping LaneAttributes_Striping_stripeToConnectingLanesRevocableLane_ := '0000000000000000'B;



     const LaneAttributes_TrackedVehicle LaneAttributes_TrackedVehicle_spec_RevocableLane_ := '0000000000000000'B;



     const LaneAttributes_Vehicle LaneAttributes_Vehicle_isVehicleRevocableLane_ := '00000000'B;



     const LaneDirection LaneDirection_ingressPath_ := '00'B;

     const LaneDirection LaneDirection_egressPath_ := '01'B;



   } //end LaneParameter_constants



   group Intersection_constants {
@@ -42,8 +35,18 @@ import from DSRC language "ASN.1:1997" all; 
     const IntersectionStatusObject IntersectionStatusObject_recentChangeInMAPassignedLanesIDsUsed_ := '0000000000001011'B;

     const IntersectionStatusObject IntersectionStatusObject_noValidMAPisAvailableAtThisTime_ := '0000000000001100'B;

     const IntersectionStatusObject IntersectionStatusObject_noValidSPATisAvailableAtThisTime_ := '0000000000001101'B;

   } // End of group Intersection_constants



   group requestor_description {

     const TransitVehicleStatus TransitVehicleStatus_loading_ := '10000000'B;

     const TransitVehicleStatus TransitVehicleStatus_anADAuse_ := '01000000'B;

     const TransitVehicleStatus TransitVehicleStatus_aBikeLoad_ := '00100000'B;

     const TransitVehicleStatus TransitVehicleStatus_doorOpen_ := '00010000'B;

     const TransitVehicleStatus TransitVehicleStatus_charging_ := '00001000'B;

     const TransitVehicleStatus TransitVehicleStatus_atStopLine_ := '00000100'B;



   } // End of of group requestor_description



    } //end Intersection_constants

  } // end IS_DSCR_constants

 } // End of group IS_DSCR_constants



} // End of module LibItsCommon_ASN1_ISDSRC_NamedNumbers

ttcn/DENM/LibItsDenm_Templates.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ module LibItsDenm_Templates { 
            template (present) DENM p_denMsg

        ) := {

            msgIn               := p_denMsg,

            recvTime            := ?,

            gnNextHeader        := *,

            gnHeaderType        := *,

            gnHeaderSubtype     := *,

ttcn/DENM/LibItsDenm_TestSystem.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ module LibItsDenm_TestSystem { 
             */

            type record DenmInd {

                DENM        msgIn,

                UInt64      recvTime,

                UInt8       gnNextHeader optional,

                UInt8       gnHeaderType optional,

                UInt8       gnHeaderSubtype optional,