Commit 72af849c authored by Yann Garcia's avatar Yann Garcia
Browse files

Create send/receive TTCN-3 templates for all CDD types to be re-used in all ATSs

parent 2cd9d00d
Loading
Loading
Loading
Loading
+12 −11
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ module ItsCam_TpFunctions {
    import from LibItsCommon_Functions all;
    import from LibItsCommon_Pixits all;
    import from LibItsCommon_ASN1_NamedNumbers all;
    import from LibItsCommon_CddTemplates all;
    
    // LibItsCam
    import from LibItsCam_TestSystem all;
@@ -235,7 +236,7 @@ module ItsCam_TpFunctions {
            function f_CAM_MSD_FMT_BV_04() runs on ItsCam {
                
                // Local variables
                var VehicleRole v_vehicleRole := c_vehicleRole_roadWork;
                var VehicleRole v_vehicleRole := valueof(m_vehicle_role(roadWork));
                
                // Test control
                if (not PICS_CAM_GENERATION or PICS_RSU) {
@@ -286,7 +287,7 @@ module ItsCam_TpFunctions {
                
                // Local variables
                timer t_minTransInterval := c_specialVehicleGenerationTime * 1.10;
                var VehicleRole v_vehicleRole := roadWork;
                var VehicleRole v_vehicleRole := valueof(m_vehicle_role(roadWork));
                var SpeedValue v_speedValues[5] := { 1000, 2000, 3000, 4000, 5000 } //cm/s
                var integer v_cntSpeed, v_cntTime;
                var CamInd v_camInd;
@@ -1860,7 +1861,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_publicTransport));
                f_utTriggerEvent(m_setVehicleRole(publicTransport));
                
                // Test Body
                log("*** " & testcasename() & ": Expected template: ", mw_camInd ( mw_camMsg_SVC( mw_publicTransport_any )), " ***");
@@ -1910,7 +1911,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_specialTransport));
                f_utTriggerEvent(m_setVehicleRole(specialTransport));
                
                // Test Body
                tc_ac.start;
@@ -1959,7 +1960,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_dangerousGoods));
                f_utTriggerEvent(m_setVehicleRole(dangerousGoods));
                
                // Test Body
                tc_ac.start;
@@ -2008,7 +2009,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_roadWork));
                f_utTriggerEvent(m_setVehicleRole(roadWork));
                
                // Test Body
                tc_ac.start;
@@ -2057,7 +2058,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_rescue));
                f_utTriggerEvent(m_setVehicleRole(rescue));
                
                // Test Body
                tc_ac.start;
@@ -2106,7 +2107,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_emergency));
                f_utTriggerEvent(m_setVehicleRole(emergency));
                
                // Test Body
                tc_ac.start;
@@ -2155,7 +2156,7 @@ module ItsCam_TpFunctions {
                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                
                // Set vehicle role
                f_utTriggerEvent(m_setVehicleRole(c_vehicleRole_safetyCar));
                f_utTriggerEvent(m_setVehicleRole(safetyCar));
                
                // Test Body
                tc_ac.start;
@@ -3091,7 +3092,7 @@ module ItsCam_TpFunctions {
                }
                
                f_CAM_MSD_SSP_BO_XX(PX_CERT_IUT_CAM_02,
                                    m_setVehicleRole(c_vehicleRole_publicTransport),
                                    m_setVehicleRole(publicTransport),
                                    mw_camMsg_SVC ( mw_publicTransport_any )
                );

@@ -3105,7 +3106,7 @@ module ItsCam_TpFunctions {
                }

                f_CAM_MSD_SSP_BO_XX(PX_CERT_IUT_CAM_03,
                                    m_setVehicleRole(c_vehicleRole_specialTransport),
                                    m_setVehicleRole(specialTransport),
                                    mw_camMsg_SVC ( mw_specialTransport_any )
                );
            } // end f_CAM_MSD_SSP_BO_03
+0 −33
Original line number Diff line number Diff line
@@ -220,19 +220,6 @@ module LibItsCam_Templates {
            }
        }

        /**
        * @desc Reference position for given latitude and longitude.
        */
        template (present) ReferencePosition mw_refPositionWithDelta(
            in ReferencePositionWithConfidence p_origRefPos,
            in integer p_jitter := 100
        ) := {
            latitude := (p_origRefPos.latitude - p_jitter..p_origRefPos.latitude + p_jitter),
            longitude := (p_origRefPos.longitude - p_jitter..p_origRefPos.longitude + p_jitter),
            positionConfidenceEllipse := p_origRefPos.positionConfidenceEllipse,
            altitude := p_origRefPos.altitude
        }

    }// End of group positionTemplates

    /**
@@ -875,26 +862,6 @@ module LibItsCam_Templates {

    } // End of group exteriorLights

    group longitudinalAcceleration {

        template (value) LongitudinalAcceleration m_longitudinalAcceleration(
                                                                             in template (value) LongitudinalAccelerationValue p_longitudinalAccelerationValue,
                                                                             in template (value) AccelerationConfidence p_longitudinalAccelerationConfidence := 102 //AccelerationConfidence.unavailable
                                                                             ) := {
            longitudinalAccelerationValue      := p_longitudinalAccelerationValue,
            longitudinalAccelerationConfidence := p_longitudinalAccelerationConfidence
        } // End of template m_longitudinalAcceleration

        template (present) LongitudinalAcceleration mw_longitudinalAcceleration(
                                                                                template (present) LongitudinalAccelerationValue p_longitudinalAccelerationValue := ?,
                                                                                template (present) AccelerationConfidence p_longitudinalAccelerationConfidence := ?
                                                                                ) := {
            longitudinalAccelerationValue      := p_longitudinalAccelerationValue,
            longitudinalAccelerationConfidence := p_longitudinalAccelerationConfidence
        } // End of template mw_longitudinalAcceleration

    } // End of group longitudinalAcceleration

    group camTemplateFunctions {

        /**
+1 −8
Original line number Diff line number Diff line
@@ -28,13 +28,6 @@ module LibItsCam_TypesAndValues {
        
    const ExteriorLights c_elAllLightsOff           := '00000000'B; 

    const VehicleRole c_vehicleRole_publicTransport := publicTransport;
    const VehicleRole c_vehicleRole_specialTransport := specialTransport;
    const VehicleRole c_vehicleRole_dangerousGoods := dangerousGoods;
    const VehicleRole c_vehicleRole_roadWork := roadWork;
    const VehicleRole c_vehicleRole_rescue := rescue;
    const VehicleRole c_vehicleRole_emergency := emergency;
    const VehicleRole c_vehicleRole_safetyCar := safetyCar;
        
    const DangerousGoodsBasic c_dangerousGoodsBasic_explosives1 := explosives1;
    const DangerousGoodsBasic c_dangerousGoodsBasic_explosives2 := explosives2;