Commit a1df1ff2 authored by tepelmann's avatar tepelmann
Browse files

Merged with latest output of STF484.

parent 46020922

ttcn/CAM/LibItsCam_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ module LibItsCam_Templates { 
         * @param p_accCtrl The acceleration control

         */

        template(present) BasicVehicleContainerHighFrequency mw_HF_BV_accCtrl(

            in template(present) AccelerationControl p_accCtrl

            in template AccelerationControl p_accCtrl

        ) modifies mw_HF_BV_any := 

        {

            accelerationControl := p_accCtrl
@@ -422,7 +422,7 @@ module LibItsCam_Templates { 
         * @param p_extLights The exterior lights

         */

        template(present) BasicVehicleContainerLowFrequency mw_LF_BV_extLights(

            in template(present) ExteriorLights p_extLights

            in template ExteriorLights p_extLights

        ) modifies mw_LF_BV_any := 

        {

            exteriorLights := p_extLights

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+0 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ module LibItsCam_TypesAndValues { 
         * @member setEmbarkationStatus

         * @member setPtActivation

         * @member setDangerousGoods

         * @member setDangerousGoodsExt

         * @member setLightBarSireneStatus

         * @member changeYawRate Changes the yaw rate in offsets of 0.01 degrees per second.

         */
@@ -103,7 +102,6 @@ module LibItsCam_TypesAndValues { 
            EmbarkationStatus setEmbarkationStatus,

            PtActivation setPtActivation,

            DangerousGoodsBasic setDangerousGoods,

            DangerousGoodsExtended setDangerousGoodsExt,

            LightBarSirenInUse setLightBarSirene

        }

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -2575,7 +2575,7 @@ module LibItsGeoNetworking_Functions { 
                

            // Build signed SecuredMessage

            v_gnNonSecuredPacket := valueof(m_geoNwShbPacket(

                f_getPosition(c_compIut)

                f_getPosition(c_compNodeC) // FIXME To be verified YANN

            ));

            // Add CAM payload

            v_gnNonSecuredPacket.payload := valueof(f_adaptPayload_m(p_payload));

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

+8 −0
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ module LibItsGeoNetworking_Pixits { 
             * @see  ETSI TS 102 871-3 Table B.7

             */

            modulepar NextHeader PX_GN_UPPER_LAYER := e_btpA;    



            /**

             * @desc   Is BTP header present in IUT's UT indication. Only applicable if PX_GN_UPPER_LAYER == e_btpA or e_btpB.

             * @remark It may happen that IUT do not report BTP header in UT indications (dur to GN/BTP merge)

             * @see    ETSI TS 102 871-3 Table B.7

             */

            modulepar boolean PX_BTP_IN_UT_IND := true;    



        }

        

        group parametrisation {

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+12 −1
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ module LibItsGeoNetworking_Templates { 
            ) modifies mw_longPosVectorPosition := {

                    latitude := f_getDelta32(valueof(p_longPosVector.latitude), PX_POS_DELTA),

                    longitude := f_getDelta32(valueof(p_longPosVector.longitude), PX_POS_DELTA),

                    speed := f_getDelta15(valueof(p_longPosVector.speed), PX_POS_DELTA)

                    speed := ? 

            }

            

            /**
@@ -2321,6 +2321,17 @@ module LibItsGeoNetworking_Templates { 
    

    group geoTemplateFunctions {

        

        function f_adaptPayloadForUtInd_m(in template (value) Payload p_gnPayload) return octetstring {

            

            if(PX_BTP_IN_UT_IND == false) {

            	if(PX_GN_UPPER_LAYER == e_btpA or PX_GN_UPPER_LAYER == e_btpB) {

				    return bit2oct(encvalue(p_gnPayload.decodedPayload.btpPacket.payload));

            	}

            }

            

			return bit2oct(encvalue(p_gnPayload));

        }



        function f_adaptPayload_m(in template (value) octetstring p_finalPayload) return template (value) Payload {

            var template (value) Payload v_payload;