Commit 3a330a9c authored by berge's avatar berge
Browse files

Additional cleaning in CAM

parent daf1d616
Loading
Loading
Loading
Loading
+7 −15
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ module LibItsCam_Functions {
    
    
        /**
        /**
         * @desc    basic default behaviour handling
         * @desc    basic default behaviour handling
         * @remark  none
         * @param   none
         */    
         */    
        altstep a_basicDefault() runs on ItsFa {
        altstep a_basicDefault() runs on ItsFa {
    
    
@@ -69,7 +67,6 @@ module LibItsCam_Functions {
        /**
        /**
         * @desc    Global postamble - stops the MTC
         * @desc    Global postamble - stops the MTC
         * @remark  No specific actions required so far
         * @remark  No specific actions required so far
         * @param   none
         */    
         */    
        function f_postamble()  runs on ItsFa {
        function f_postamble()  runs on ItsFa {
            
            
@@ -83,10 +80,9 @@ module LibItsCam_Functions {
            
            
        /** @desc   function to generate a random bitstring value 
        /** @desc   function to generate a random bitstring value 
         *          corresponding to 1 bit position set to 1 (eg '00010000', '01000000', ...)
         *          corresponding to 1 bit position set to 1 (eg '00010000', '01000000', ...)
         *          
         *  @see    f_random
         *  @see    f_random
         *  @param  p_length bitstring length - max 15<br>
         *  @param  p_length bitstring length - max 15
         *  @return bitstring<br>
         *  @return bitstring
         *
         *
         */
         */
        function f_bitPositionRandom( in integer p_length )
        function f_bitPositionRandom( in integer p_length )
@@ -106,7 +102,6 @@ module LibItsCam_Functions {
    
    
        /**
        /**
         * @desc    Requests to bring the IUT in an initial state
         * @desc    Requests to bring the IUT in an initial state
         * @return 
         */
         */
        function f_utInitializeIut() runs on ItsFa {
        function f_utInitializeIut() runs on ItsFa {
            
            
@@ -131,7 +126,6 @@ module LibItsCam_Functions {
        /**
        /**
         * @desc    Triggers event from the application layer
         * @desc    Triggers event from the application layer
         * @param   p_event The event to trigger.
         * @param   p_event The event to trigger.
         * @return 
         */
         */
        function f_utTriggerEvent(template (value) UtCamEvent p_event) runs on ItsFa return FncRetCode {
        function f_utTriggerEvent(template (value) UtCamEvent p_event) runs on ItsFa return FncRetCode {
            var FncRetCode v_ret := e_success;
            var FncRetCode v_ret := e_success;
@@ -145,7 +139,6 @@ module LibItsCam_Functions {
        /**
        /**
         * @desc    Checks that the event was indicated at the application layer
         * @desc    Checks that the event was indicated at the application layer
         * @param   p_event The event to check.
         * @param   p_event The event to check.
         * @return 
         */
         */
        function f_utCheckEvent(template (value) CamPdu p_event) runs on ItsFa return FncRetCode {
        function f_utCheckEvent(template (value) CamPdu p_event) runs on ItsFa return FncRetCode {
            var FncRetCode v_ret := e_success;
            var FncRetCode v_ret := e_success;
@@ -174,11 +167,10 @@ module LibItsCam_Functions {
    } // end group upperTester
    } // end group upperTester
    
    
    group getIutFunctions {
    group getIutFunctions {
          
        /** 
        /** 
         * @desc    function to get the PT Line Description
         * @desc    Function to get the PT Line Description
         *          currently return the PIXIT value
         * @see     PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE
         * @see     PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE
         *
         */
         */
        function f_getIutPtLineDescription()
        function f_getIutPtLineDescription()
        return PTLineDescription {
        return PTLineDescription {
+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ module LibItsCam_TypesAndValues {
        const AccelerationControl c_throttlePedal := '010000'B; 
        const AccelerationControl c_throttlePedal := '010000'B; 
        const AccelerationControl c_brakePedal := '100000'B; 
        const AccelerationControl c_brakePedal := '100000'B; 
        
        
        const DangerousGoods c_noDangerousGoodsTransported := 0;  // trigger -- no dangerous goods transported (formal param = 0)
        const DangerousGoods c_noDangerousGoodsTransported := 0;  
      
      
        const Direction c_south := 14400; 
        const Direction c_south := 14400; 
        const Direction c_north := 0; 
        const Direction c_north := 0;