Commit 0b7c9381 authored by garciay's avatar garciay
Browse files

Validation in Livorno (20161003-05)

parent d20acc0f

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ module ItsRSUsSimulator_Functions { 
            vc_ivim := false;

        }

        // DENM, only if PX_ETSI_USE_CASE_ID is set to 1

        if ((vc_denm == true) and (PX_ETSI_USE_CASE_ID == 1)) {

        if ((vc_denm == true) and (PX_ETSI_USE_CASE_ID == 5)) {

            // Build the list of the DENM events for the specified RSU (PX_RSU_ID) and the given zone (PX_ETSI_ZONE_ID)

            for (v_counter := 0; v_counter < lengthof(PICS_DENM_EVENTS_RSU[p_rsu_id][PX_ETSI_ZONE_ID - 1]); v_counter := v_counter + 1) {

                var DenmEventsParmsPerZone v_denmEventsParmsPerZone := PICS_DENM_EVENTS_RSU[p_rsu_id][PX_ETSI_ZONE_ID - 1];
@@ -426,6 +426,8 @@ module ItsRSUsSimulator_Functions { 
        log("vc_endPhaseStartTime = ", vc_endPhaseStartTime);

        log("v_currentTimeMark = ", v_currentTimeMark);

        log("vc_spatemStatesId = ", vc_spatemStatesId);

        log("mintime#1 = ", vc_currentPhaseStartTime + vc_repitition_duration[(vc_spatemStatesId + 1) mod vc_spatemStatesNum]);

        log("mintime#2 = ", vc_currentPhaseStartTime + vc_repitition_duration[(vc_spatemStatesId + 2) mod vc_spatemStatesNum]);

        // Rebuild SPATEM message

        for (var integer v_intersection := 0; v_intersection < lengthof(v_spatem.spat.intersections); v_intersection := v_intersection + 1) {

            var template (omit) MovementList v_states := vc_states[vc_signalGroupParmId][v_intersection];

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -127,14 +127,14 @@ module ItsRSUsSimulator_TestCases { 
                repeat;

            }

            [vc_mapem == true] tc_mapem.timeout {

                //log("*** " & testcasename() & ": DEBUG: Processing MAPEM ***");

                log("*** " & testcasename() & ": DEBUG: Processing MAPEM ***");

                f_prepare_mapem(v_payload);

                f_send(v_payload, PICS_MAPEM_ITS_AID);

                tc_mapem.start;

                repeat;

            }

            [vc_spatem == true] tc_spatem.timeout {

                //log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***");

                log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***");

                for (var integer v_counter := 0; v_counter < lengthof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems); v_counter := v_counter + 1) {

                    f_prepare_spatem(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter], v_payload);

                    f_send(v_payload, PICS_SPATEM_ITS_AID);