Commit aa897dbe authored by berge's avatar berge
Browse files

Fixed CAM/DENM compilation issues

parent 3e7faf44

ttcn/CAM/LibItsCam_Templates.ttcn

+34 −2
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ module LibItsCam_Templates { 
    group positionTemplates {

        

        template (value) ReferencePosition m_tsPosition := {

            longitude := f_getTsLongitude(),

            latitude := f_getTsLatitude(),

            longitude := f_integer2Longitude(f_getTsLongitude()),

            latitude := f_integer2Latitude(f_getTsLatitude()),

            elevation := 0,

            heading := omit, //present if mobileItsStation flag is TRUE

            streetName := omit,
@@ -794,4 +794,36 @@ module LibItsCam_Templates { 
        

    } // end group exteriorLights

    

    group denmTemplateFunctions {

            

        function f_integer2Longitude(in integer p_longitude) return Longitude {

            

            var Longitude v_longitude;

            if(p_longitude >= 0) {

                v_longitude.hemisphere := east;

            }

            else {

                v_longitude.hemisphere := west;

            }

            v_longitude.degree := f_abs(p_longitude);

            

            return v_longitude;

        }

        

        function f_integer2Latitude(in integer p_latitude) return Latitude {

            

            var Latitude v_latitude;

            if(p_latitude >= 0) {

                v_latitude.hemisphere := north;

            }

            else {

                v_latitude.hemisphere := south;

            }

            v_latitude.degree := f_abs(p_latitude);

            

            return v_latitude;

        }

        

    } // end denmTemplateFunctions



} // end LibItsCam_Templates

ttcn/Common/LibItsCommon_Functions.ttcn

+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ module LibItsCommon_Functions { 
    import from LibCommon_VerdictControl all;

    

    // LibIts

    import from DENM_PDU_Descriptions language "ASN.1:1997" all; // TODO LibCommon shall be protocol independant?

    import from LibItsCommon_Pixits all;
@@ -89,8 +88,8 @@ module LibItsCommon_Functions { 
         * @desc    Gets the current time

         * @return  Timestamp - current time in Epoch format

         */

        function f_getCurrentTime() return TimeStamp {

            var TimeStamp v_timeStamp := 0;

        function f_getCurrentTime() return integer {

            var integer v_timeStamp := 0;

            

            log("*** f_getCurrentTime: INFO: calling fx_getCurrentTime() ***");

            v_timeStamp := fx_getCurrentTime();
@@ -142,7 +141,7 @@ module LibItsCommon_Functions { 
         * @desc    This external function gets the current time    

         * @return  Timestamp - current time in Epoch format

         */

        external function fx_getCurrentTime() return TimeStamp;

        external function fx_getCurrentTime() return integer;

        

    } // end externalFunctions

ttcn/DENM/LibItsDenm_Templates.ttcn

+34 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ module LibItsDenm_Templates { 
    group positionTemplates {

    	

        template (value) ReferencePosition m_tsPosition := {

            longitude := f_getTsLongitude(),

            latitude := f_getTsLatitude(),

            longitude := f_integer2Longitude(f_getTsLongitude()),

            latitude := f_integer2Latitude(f_getTsLatitude()),

            elevation := 0,

            heading := omit, //present if mobileItsStation flag is TRUE

            streetName := omit,
@@ -711,6 +711,38 @@ module LibItsDenm_Templates { 
            

        } // end group locationRefTemplates

        

        group denmTemplateFunctions {

            

            function f_integer2Longitude(in integer p_longitude) return Longitude {

                

                var Longitude v_longitude;

                if(p_longitude >= 0) {

                    v_longitude.hemisphere := east;

                }

                else {

                    v_longitude.hemisphere := west;

                }

                v_longitude.degree := f_abs(p_longitude);

                

                return v_longitude;

            }

            

            function f_integer2Latitude(in integer p_latitude) return Latitude {

                

                var Latitude v_latitude;

                if(p_latitude >= 0) {

                    v_latitude.hemisphere := north;

                }

                else {

                    v_latitude.hemisphere := south;

                }

                v_latitude.degree := f_abs(p_latitude);

                

                return v_latitude;

            }

            

        } // end denmTemplateFunctions

        

    } // end group decentralizedSituationLocationTemplates

    

} // end LibItsDenmTemplates
 
 No newline at end of file