diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn index 3306da2751e7f53494b41aa45e80e1966c7ae5bd..b86fc2847557fba94bb91467cc3ab896eda85bd4 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn @@ -532,7 +532,9 @@ module ItsRSUsSimulator_Functions { // 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]; - v_spatem.spat.intersections[v_intersection].states[0] := v_states[vc_spatemStatesId]; + v_spatem.spat.intersections[v_intersection].states := { v_states[vc_spatemStatesId] }; + v_spatem.spat.intersections[v_intersection].moy := f_getMinuteOfTheYear(); + v_spatem.spat.intersections[v_intersection].timeStamp := f_getDSecond(); select (vc_spatemStatesId) { case (0) { v_spatem.spat.intersections[v_intersection].states[1] := v_states[1]; diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn index 2f2c6fcf666decccf9c27152f75787c2ffe0ba7e..bc2ef6eacd9feb3c6bf5cf2c0e68aba6f84cf64c 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn @@ -574,12 +574,12 @@ module ItsRSUsSimulator_Pics { modulepar PosConfidenceEllipse PICS_DENM_POSITION_CONFIDENCE_ELLIPSE := { semiMajorConfidence := 100, semiMinorConfidence := 100, - semiMajorOrientation := HeadingValue_wgs84North_ + semiMajorOrientation := 0 } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE modulepar Altitude PICS_DENM_ALTITUDE := { altitudeValue := AltitudeValue_referenceEllipsoidSurface_, - altitudeConfidence := unavailable + altitudeConfidence := alt_000_01 } // End of PICS_DENM_ALTITUDE /** @@ -3624,8 +3624,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z1_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { @@ -3714,8 +3714,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z2_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { @@ -3804,8 +3804,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z3_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { @@ -3894,8 +3894,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z4_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { @@ -3984,8 +3984,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z5_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { @@ -4074,8 +4074,8 @@ module ItsRSUsSimulator_Pics { id := PICS_Z6_M1_SL_IDX, revision := 0, status := int2bit(0, 16), - moy := omit, - timeStamp := omit, + moy := 0, // To be updated in real-time + timeStamp := 0, // To be updated in real-time enabledLanes := omit, states := { { diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pixits.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pixits.ttcn index 643e25fcdd22aa588730b0aa7adf821a5616daaa..462a687f4b532913d107a117fd5ff4115820e55b 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pixits.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pixits.ttcn @@ -34,7 +34,7 @@ module ItsRSUsSimulator_Pixits { * UC9 (CAM only): PX_ETSI_USE_CASE_ID := 9 !! PX_RSU_ID 5 * @remark LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB */ - modulepar integer PX_ETSI_USE_CASE_ID := 6; + modulepar integer PX_ETSI_USE_CASE_ID := 1; /** * @desc Indicate which zone to simulate @@ -46,7 +46,7 @@ module ItsRSUsSimulator_Pixits { modulepar boolean PICS_GENERATE_CAM := true; - modulepar boolean PICS_GENERATE_DENM := false; + modulepar boolean PICS_GENERATE_DENM := true; modulepar boolean PICS_GENERATE_IVIM := false;