Commit 1615d38e authored by Yann Garcia's avatar Yann Garcia
Browse files

Rebuild AtsCAM full Release 2

parent ce4a954b

ItsCam_TpFunctions.ttcn

+2 −4
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 


module ItsCam_TpFunctions {

    

    import from LibItsCommon_Pixits all;



    // LibCommon

    import from LibCommon_Sync all;

    import from LibCommon_VerdictControl all;
@@ -2557,7 +2555,7 @@ module ItsCam_TpFunctions { 
                // Local variables

                timer t_genCam_dcc := PICS_T_GENCAMDCC * 0.90;

                var CamInd v_camPdu;

                var ReferencePosition v_referencePosition, v_expectedReferencePosition;

                var ReferencePositionWithConfidence v_referencePosition, v_expectedReferencePosition;

                var float v_changePosValue := 8.0; // 8 >> 4m

                

                // Test control

lib/LibItsCam_Templates.ttcn

+25 −25
Original line number Diff line number Diff line
@@ -197,22 +197,22 @@ module LibItsCam_Templates { 
                setDangerousGoods := p_dangerousGoods

            }



        } // end utPrimitives

        }// End of group utPrimitives



    } // end group Primitives

    } // End of group Primitives



    group positionTemplates {



        /**

         * @desc The test system reference position.

         */

        template (value) ReferencePosition m_tsPosition := {

        template (value) ReferencePositionWithConfidence m_tsPosition := {

            latitude := f_integer2Latitude(f_getTsLatitude()),

            longitude := f_integer2Longitude(f_getTsLongitude()),

            positionConfidenceEllipse := {

                semiMajorConfidence   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,

                semiMinorConfidence   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,

                semiMajorOrientation  := LibItsCommon_ASN1_NamedNumbers.HeadingValue_wgs84North_

                semiMajorAxisLength   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,

                semiMinorAxisLength   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,

                semiMajorAxisOrientation  := LibItsCommon_ASN1_NamedNumbers.HeadingValue_wgs84North_

            },

            altitude := {

                altitudeValue := LibItsCommon_ASN1_NamedNumbers.AltitudeValue_referenceEllipsoidSurface_,
@@ -224,7 +224,7 @@ module LibItsCam_Templates { 
        * @desc Reference position for given latitude and longitude.

        */

        template (present) ReferencePosition mw_refPositionWithDelta(

            in ReferencePosition p_origRefPos,

            in ReferencePositionWithConfidence p_origRefPos,

            in integer p_jitter := 100

        ) := {

            latitude := (p_origRefPos.latitude - p_jitter..p_origRefPos.latitude + p_jitter),
@@ -233,7 +233,7 @@ module LibItsCam_Templates { 
            altitude := p_origRefPos.altitude

        }



    } // end positionTemplates

    }// End of group positionTemplates



    /**

     * @desc    Default Receive template for CAM PDU
@@ -259,7 +259,7 @@ module LibItsCam_Templates { 
         * @param p_referencePosition The reference position

         */

        template (present) CAM mw_camMsg_BC_refPos(

            in template(present) ReferencePosition p_referencePosition

                                                   template(present) ReferencePositionWithConfidence p_referencePosition

                                                   ) modifies mw_camMsg_any := {

            cam := {

                camParameters := {
@@ -274,7 +274,7 @@ module LibItsCam_Templates { 
            }

        }



    } // end group camBasicContainer

    } // End of group camBasicContainer



    group camHighFrequencyContainer {
@@ -405,7 +405,7 @@ module LibItsCam_Templates { 
            }

        }



    } // end group camHighFrequencyContainer

    } // End of group camHighFrequencyContainer



    group camLowFrequencyContainer {
@@ -466,7 +466,7 @@ module LibItsCam_Templates { 
            exteriorLights := p_extLights

        }



    } // end group camLowFrequencyContainer

    } // End of group camLowFrequencyContainer



    group camSpecialVehicleContainer {
@@ -561,7 +561,7 @@ module LibItsCam_Templates { 
        template (value) CAM m_camMsg_vehicle_HF_BV(

            StationId p_stationId,

            GenerationDeltaTime p_generationTime,

            template (value) ReferencePosition p_referencePosition

            template (value) ReferencePositionWithConfidence p_referencePosition

        ) := {

            header := {

                protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
@@ -628,7 +628,7 @@ module LibItsCam_Templates { 
        template (value) CAM m_camMsg_vehicle(

            StationId p_stationId,

            GenerationDeltaTime p_generationTime,

            template (value) ReferencePosition p_referencePosition

            template (value) ReferencePositionWithConfidence p_referencePosition

        ) modifies m_camMsg_vehicle_HF_BV := {

            cam := {

                camParameters := {
@@ -646,7 +646,7 @@ module LibItsCam_Templates { 
        template (value) CAM m_camMsg_publicTransport(

            StationId p_stationId,

            GenerationDeltaTime p_generationTime,

            template (value) ReferencePosition p_referencePosition

            template (value) ReferencePositionWithConfidence p_referencePosition

        ) modifies m_camMsg_vehicle := {

            cam := {

                camParameters := {
@@ -668,7 +668,7 @@ module LibItsCam_Templates { 
        template (value) CAM m_camMsg_specialTransport(

            StationId p_stationId,

            GenerationDeltaTime p_generationTime,

            template (value) ReferencePosition p_referencePosition

            template (value) ReferencePositionWithConfidence p_referencePosition

        ) modifies m_camMsg_vehicle := {

            cam := {

                camParameters := {
@@ -686,7 +686,7 @@ module LibItsCam_Templates { 
                }

            }

        };

    } // end camAnyVehicle

    }// End of group camAnyVehicle



    group emergencyContainer {
@@ -700,7 +700,7 @@ module LibItsCam_Templates { 
            emergencyPriority  := p_emergencyPriority

        } // End of template m_emergencyContainer



    } // end emergencyContainer

    }// End of group emergencyContainer



    group specialTransportContainer {
@@ -712,7 +712,7 @@ module LibItsCam_Templates { 
            lightBarSirenInUse   := p_lightBarSirenInUse

        } // End of template m_specialTransportContainer



    } // end specialTransportContainer

    }// End of group specialTransportContainer



    group camAccelerationControlTemplates {
@@ -786,7 +786,7 @@ module LibItsCam_Templates { 
         */

        template AccelerationControl mw_speedLimiterActive_Off      := '*0'B length(7);



    } // end group camAccelerationControlTemplates

    } // End of group camAccelerationControlTemplates



    group camExteriorLightsTemplates {
@@ -873,7 +873,7 @@ module LibItsCam_Templates { 
         */

        template ExteriorLights mw_hazardConditionOn        := '??11*'B length(8);



    } // end group exteriorLights

    } // End of group exteriorLights



    group longitudinalAcceleration {
@@ -893,7 +893,7 @@ module LibItsCam_Templates { 
            longitudinalAccelerationConfidence := p_longitudinalAccelerationConfidence

        } // End of template mw_longitudinalAcceleration



    } // end group longitudinalAcceleration

    } // End of group longitudinalAcceleration



    group camTemplateFunctions {
@@ -921,6 +921,6 @@ module LibItsCam_Templates { 
            return v_latitude;

        }



    } // end camTemplateFunctions

    }// End of group camTemplateFunctions



} // end LibItsCam_Templates
 
}// End of group LibItsCam_Templates

lib/LibItsCam_TypesAndValues.ttcn

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ module LibItsCam_TypesAndValues { 
  // LibIts

  import from ETSI_ITS_CDD language "ASN.1:1997" all;

  import from CAM_PDU_Descriptions language "ASN.1:1997" all;

  //    import from DENM_PDU_Descriptions language "ASN.1:1997" all;



  group camValues {

lib/module.mk

+1 −0
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ sources := \ 
   LibItsCam_Templates.ttcn \

   LibItsCam_TypesAndValues.ttcn \





modules := asn1

lib_system/LibItsCam_TestSystem.ttcn

+0 −3
Original line number Diff line number Diff line
@@ -12,14 +12,11 @@ 
module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Testing" {

    

    // LibCommon

//    import from LibCommon_Time {modulepar all};

//    import from LibCommon_Sync all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    

    // LibIts

    import from CAM_PDU_Descriptions language "ASN.1:1997" all;

//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    // LibItsCommon

    import from LibItsCommon_TestSystem all;