Commit 96ce3409 authored by berge's avatar berge
Browse files

Fixed compilation issues with TestCast

parent 2aa3f3f2
Loading
Loading
Loading
Loading
+58 −58
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with low beam lights off  
         */
        template ExteriorLights mw_lowBeamLightsOff := complement(mw_lowBeamLightsOn) ; 
        template ExteriorLights mw_lowBeamLightsOff := complement(mw_lowBeamLightsOn, omit) ; 
      
        /**
         * @desc  Receive template for exterior lights with low beam lights on 
@@ -703,7 +703,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with high beam lights off 
         */
        template ExteriorLights mw_highBeamLightsOff := complement(mw_highBeamLightsOn);
        template ExteriorLights mw_highBeamLightsOff := complement(mw_highBeamLightsOn, omit);
      
        /**
         * @desc  Receive template for exterior lights with high beam lights on 
@@ -713,7 +713,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with left turn signal off 
         */
        template ExteriorLights mw_leftTurnSignalOff := complement(mw_leftTurnSignalOn);
        template ExteriorLights mw_leftTurnSignalOff := complement(mw_leftTurnSignalOn, omit);
      
        /**
         * @desc  Receive template for exterior lights with left turn signal on 
@@ -723,7 +723,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with right turn signal off 
         */
        template ExteriorLights mw_rightTurnSignalOff := complement(mw_rightTurnSignalOn);
        template ExteriorLights mw_rightTurnSignalOff := complement(mw_rightTurnSignalOn, omit);
        /**
         * @desc  Receive template for exterior lights with right turn signal on 
         */
@@ -732,7 +732,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with automatic light control off 
         */
        template ExteriorLights mw_automaticLightControlOff := complement(mw_automaticLightControlOn); 
        template ExteriorLights mw_automaticLightControlOff := complement(mw_automaticLightControlOn, omit); 
        /**
         * @desc  Receive template for exterior lights with automatic light control on 
         */
@@ -741,7 +741,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with day time running lights off 
         */
        template ExteriorLights mw_daytimeRunningLightOff := complement(mw_daytimeRunningLightOn);
        template ExteriorLights mw_daytimeRunningLightOff := complement(mw_daytimeRunningLightOn, omit);
        
        /**
         * @desc  Receive template for exterior lights with day time running lights on 
@@ -751,7 +751,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with fog lights off 
         */
        template ExteriorLights mw_fogLightOff := complement(mw_fogLightOn); 
        template ExteriorLights mw_fogLightOff := complement(mw_fogLightOn, omit); 
        
        /**
         * @desc  Receive template for exterior lights with fog lights on 
@@ -761,7 +761,7 @@ module LibItsCam_Templates {
        /**
         * @desc  Receive template for exterior lights with parking lights off 
         */
        template ExteriorLights mw_parkingLightsOff := complement(mw_parkingLightsOn);
        template ExteriorLights mw_parkingLightsOff := complement(mw_parkingLightsOn, omit);
         
        /**
         * @desc  Receive template for exterior lights with parking lights on 
+24 −0
Original line number Diff line number Diff line
/**
 *    @author      ETSI / STF405
 *    @version     $URL$
 *                 $Id$
 *    @desc        Module containing types and values for External protocols
 *
 */
module LibItsExternal_TypesAndValues {

    // LibCommon
    import from LibCommon_DataStrings all;

    group linkLayerConstants {

        /**
         * @desc Ethernet MAC address
         */
        type Oct6 MacAddress;
                
        const MacAddress c_llBroadcast := 'FFFFFFFFFFFF'O;
        
    } // end linkLayerConstants
        
} // end LibItsIpv6OverGeoNetworking_TypesAndValues
 No newline at end of file
+130 −130
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ module LibItsDenm_Templates {
            ) := {
            eventPosition := p_eventPosition, 
            locationRef := p_locationRef,
            relevanceArea := m_denmRelevanceArea(p_eventPosition.eventPositionCurrentDefinition.refPosition)
            relevanceArea := m_denmRelevanceArea(valueof(p_eventPosition.eventPositionCurrentDefinition.refPosition))
        }
        
        /**
+82 −81
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ module LibItsGeoNetworking_Functions {
    import from LibItsGeoNetworking_Templates all;
    import from LibItsGeoNetworking_Pixits all;
    import from LibItsGeoNetworking_Pics all;
    import from LibItsExternal_TypesAndValues {type MacAddress};
    
    group geoConfigurationFunctions {
        
@@ -1063,7 +1064,7 @@ module LibItsGeoNetworking_Functions {
        /**
         * @desc Brings the IUT into an initial state.
         */
        function f_initialState() {
        function f_initialState() runs on ItsAdapterComponent {
           
            f_utInitializeIut(m_gnInitialize);
        }
+1 −2
Original line number Diff line number Diff line
@@ -7,14 +7,13 @@
 */
module LibItsGeoNetworking_Pics {
    
    import from LibItsGeoNetworking_TypesAndValues {type MacAddress;}

    // LibCommon
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_DataStrings all;
        
    // LibIts
    import from LibItsGeoNetworking_TypesAndValues all;
    import from LibItsExternal_TypesAndValues {type MacAddress};
    
    group geoNwPics {
        
Loading