Commit 3972f694 authored by tepelmann's avatar tepelmann
Browse files

Taken latest changes from ITS CMS4.

parent 5ca30a4a

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+0 −15
Original line number Diff line number Diff line
@@ -22,23 +22,8 @@ module LibItsCam_TypesAndValues { 
        const float c_specialVehicleGenerationTime := 0.5; //500 ms

        

        const AccelerationControl c_accCtrlIdle             := '0000000'B;

        const AccelerationControl c_brakePedalEngaged       := '1000000'B;

        const AccelerationControl c_gasPedalEngaged         := '0100000'B;

        const AccelerationControl c_emergencyBrakeEngaged   := '0010000'B;

        const AccelerationControl c_collisionWarningEngaged := '0001000'B;

        const AccelerationControl c_accEngaged              := '0000100'B;

        const AccelerationControl c_cruiseControlEngaged    := '0000010'B;

        const AccelerationControl c_speedLimiterEngaged     := '0000001'B;

        

        const ExteriorLights c_elAllLightsOff           := '00000000'B; 

        const ExteriorLights c_lowBeamHeadlightsOn      := '10000001'B; 

        const ExteriorLights c_highBeamHeadlightsOn     := '01000010'B; 

        const ExteriorLights c_leftTurnSignalOn         := '00100100'B; 

        const ExteriorLights c_rightTurnSignalOn        := '00010000'B; 

        const ExteriorLights c_daytimeRunningLightsOn   := '00001000'B; 

        const ExteriorLights c_reverseLightOn           := '00000100'B; 

        const ExteriorLights c_fogLightOn               := '00000010'B; 

        const ExteriorLights c_parkingLightsOn          := '00000001'B; 

        

        const VehicleRole c_vehicleRole_publicTransport := publicTransport;

        const VehicleRole c_vehicleRole_specialTransport := specialTransport;

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+5 −1
Original line number Diff line number Diff line
@@ -2325,8 +2325,12 @@ module LibItsGeoNetworking_Templates { 
            

            if(PX_BTP_IN_UT_IND == false) {

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

            		if( ispresent(p_gnPayload.decodedPayload) ){

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

            		}

            		

            		return p_gnPayload.rawPayload;

            	}

            }

            

			return bit2oct(encvalue(p_gnPayload));

ttcn/Security/LibItsSecurity_TestSystem.ttcn3

+6 −2
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ module LibItsSecurity_TestSystem { 
            const charstring cc_taCert_EC := "CERT_TS_A_EC"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */

            const charstring cc_taCert_AA := "CERT_TS_A_AA"; /** Certificate with a subject type indicating 'authorisation_authority', to be used when secured messages are sent from TA to IUT */

            // Test Adapter certificates & private keys - Inoportune behavior

            const charstring cc_taCert_B_BO  := "CERT_TS_B_BO_AT"; /** Certificate with a circular region, the IUT position is outside of the region */

            const charstring cc_taCert_C_BO  := "CERT_TS_C_BO_AT"; /** Certificate with a rectangular region, the IUT position is outside of the region */

            const charstring cc_taCert_D_BO  := "CERT_TS_D_BO_AT"; /** Certificate with a polygonal region, the IUT position is outside of the region */

            const charstring cc_taCert_E_BO  := "CERT_TS_E_BO_AT"; /** Certificate with a region identifier, the IUT position is outside of the region */

            const charstring cc_taCert0101BO := "CERT_TS_01_01_BO_AT"; /**  */

            const charstring cc_taCert0102BO := "CERT_TS_01_02_BO_AT"; /**  */

            const charstring cc_taCert0103BO := "CERT_TS_01_03_BO_AT"; /**  */