Commit 442632e6 authored by garciay's avatar garciay
Browse files

Add changes for UC3

Finalise UC7
parent d69fc9a6
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ module ItsRSUsSimulator_Functions {
                v_cam := 
                    m_camParm(
                        PICS_UC7_LPV.stationID,
                        PICS_UC7_LPV.stationType,
                        PICS_UC7_LPV.vehicleRole, 
                        m_rsuPosition(
                            PICS_UC7_LPV.longPosVector.latitude,
                            PICS_UC7_LPV.longPosVector.longitude
@@ -297,6 +299,8 @@ module ItsRSUsSimulator_Functions {
                v_cam := 
                    m_camParm(
                        PICS_RSU_PARAMS[p_rsu_id].stationID,
                        -,
                        -,
                        m_rsuPosition(
                            vc_longPosVectorRsu.latitude,
                            vc_longPosVectorRsu.longitude
@@ -310,6 +314,8 @@ module ItsRSUsSimulator_Functions {
                v_cam := 
                    m_camParm(
                        PICS_RSU_PARAMS[p_rsu_id].stationID,
                        -,
                        -,
                        m_rsuPosition(
                            vc_longPosVectorRsu.latitude,
                            vc_longPosVectorRsu.longitude
@@ -662,7 +668,7 @@ module ItsRSUsSimulator_Functions {
    ) runs on ItsRSUsSimulator {
        var GeoNetworkingPdu v_geoNetworkingPdu;
        
        vc_longPosVectorRsu.timestamp_ := f_getCurrentTime();
        vc_longPosVectorRsu.timestamp_ := f_computeGnTimestamp();
        
        if (p_its_aid == 36) { // CAM 
            v_geoNetworkingPdu := valueof(m_geoNwPdu( // FIXME Use PIXIT parameter to get a fully configurable template
+219 −260

File changed.

Preview size limit exceeded, changes collapsed.

+16 −2
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ module ItsRSUsSimulator_Pixits {
    
    /**
     * @desc Indicate which Use Case to simulate
     * @remark UC1 (DENM only):         PX_ETSI_USE_CASE_ID := 1 !! PX_RSU_ID 2
     * @remark UC1 (DENM only):         PX_ETSI_USE_CASE_ID := 1
     *         UC3 (TLM MAPEM/SPATEM):  PX_ETSI_USE_CASE_ID := 3 !! PX_RSU_ID 2
     *         UC5 (IVIM only):         PX_ETSI_USE_CASE_ID := 5 !! PX_RSU_ID 2
     *         UC6 (CAM only):          PX_ETSI_USE_CASE_ID := 6 !! PX_RSU_ID 2
     *         UC7 (CAM only):          PX_ETSI_USE_CASE_ID := 7 !! PX_RSU_ID 2
     *         UC9 (CAM only):          PX_ETSI_USE_CASE_ID := 9 !! PX_RSU_ID 5
     */
    modulepar integer PX_ETSI_USE_CASE_ID := 6;
    modulepar integer PX_ETSI_USE_CASE_ID := 3;
    
    /**
     * @desc Indicate which zone to simulate
@@ -41,4 +41,18 @@ module ItsRSUsSimulator_Pixits {
     */
    modulepar integer PX_ETSI_ZONE_ID := 2;
    
    modulepar boolean PICS_GENERATE_BEACON   := false;
    
    modulepar boolean PICS_GENERATE_CAM      := false;
    
    modulepar boolean PICS_GENERATE_DENM     := false;
    
    modulepar boolean PICS_GENERATE_IVIM     := false;
    
    modulepar boolean PICS_GENERATE_MAPEM    := true;
    
    modulepar boolean PICS_GENERATE_SPATEM   := true;
    
    modulepar boolean PICS_GENERATE_SSEM     := true;
    
} // End of module ItsRSUsSimulator_Pixits
+4 −2
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ module ItsRSUsSimulator_Templates {
        
        template (value) CAM m_camParm(
                                       in template (value) StationID p_stationID,
                                       in template (value) ITS_Container.StationType p_stationType := StationType_roadSideUnit_,
                                       in template (value) VehicleRole p_vehicleRole := roadOperator,
                                       in template (value) ReferencePosition p_rsuPosition,
                                       in template (value) PathHistory p_pathHistory,
                                       in template (value) HighFrequencyContainer p_highFrequencyContainer
@@ -287,13 +289,13 @@ module ItsRSUsSimulator_Templates {
                generationDeltaTime := 0, // Dynamic parameter
                camParameters := {
                    basicContainer := {
                        stationType := StationType_roadSideUnit_,
                        stationType := p_stationType,
                        referencePosition := p_rsuPosition
                    },
                    highFrequencyContainer := p_highFrequencyContainer,
                    lowFrequencyContainer := {
                        basicVehicleContainerLowFrequency := {
                            vehicleRole := roadOperator,
                            vehicleRole := p_vehicleRole,
                            exteriorLights := '00000000'B,
                            pathHistory := p_pathHistory
                        }
+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ module ItsRSUsSimulator_TestCases {
            [vc_beacon == true] tc_beacon.timeout {
                //log("*** " & testcasename() & ": DEBUG: Processing BEACON ***");
                f_prepare_beacon(v_payload);
                f_send(v_payload, PICS_CAM_ITS_AID);
                f_send(v_payload, PICS_BEACON_ITS_AID);
                tc_beacon.start;
                repeat;
            }
Loading