Commit 228c20a8 authored by berge's avatar berge
Browse files

Merged revision(s) 959-1050 from branches/STF484_VALIDATION

parent 4cd830a5
Loading
Loading
Loading
Loading
+1572 −0

File added.

Preview size limit exceeded, changes collapsed.

+21 −0
Original line number Original line Diff line number Diff line
MAP-SPAT-CEN DEFINITIONS AUTOMATIC TAGS ::= 

BEGIN

IMPORTS 
   MapData, SpatData FROM DSRC
   ItsPduHeader FROM ITS-Container;

MAP ::= SEQUENCE
{
	header	ItsPduHeader,
	mapM	MapData
}

SPAT ::= SEQUENCE
{
	header	ItsPduHeader,
	spat	SpatData
}

END
+213 −0
Original line number Original line Diff line number Diff line

 
-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-- 
-- Start of External Data entries...
-- Grouped into sets of modules
-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-- 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
-- 
-- Begin module: EU
-- 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
EU DEFINITIONS AUTOMATIC TAGS::= BEGIN 
-- Fritz: Imports from ETSI CDD
IMPORTS StationID, Altitude FROM ITS-Container
        SignalGroupID, PrioritizationResponseStatus FROM DSRC;


-- DF_Altitude_EU (Desc Name) Record 1
-- From source: Regional Data of Draft J2735 (EU)
-- Fritz: will be included from the ETSI CDD
-- Altitude ::=  SEQUENCE {
--   value        AltitudeValue,
--   confidence   AltitudeConfidence
--   }

-- DE_AltitudeConfidence_EU (Desc Name) Record 2
-- From source: Regional Data of Draft J2735 (EU)
-- Fritz: will be included from the ETSI CDD
-- AltitudeConfidence ::= ENUMERATED {
--   alt-000-01  (0),   accuracy within    0.01 meter
--   alt-000-02  (1),   accuracy within    0.02 meter
--   alt-000-05  (2),   accuracy within    0.05 meter
--   alt-000-10  (3),   accuracy within    0.10 meter
--   alt-000-20  (4),   accuracy within    0.20 meter
--   alt-000-50  (5),   accuracy within    0.50 meter
--   alt-001-00  (6),   accuracy within    1.00 meter
--   alt-002-00  (7),   accuracy within    2.00 meter
--   alt-005-00  (8),   accuracy within    5.00 meter
--   alt-010-00  (9),   accuracy within   10.00 meter
--   alt-020-00  (10),  accuracy within   20.00 meter
--   alt-050-00  (11),  accuracy within   50.00 meter
--   alt-100-00  (12),  accuracy within  100.00 meter
--   alt-200-00  (13),  accuracy within  200.00 meter
--   outOfRange  (14),  accuracy exceeds 201.00 meters
--   unavailable (15)   unavailable
-- }

-- DE_AltitudeValue_EU (Desc Name) Record 3
-- From source: Regional Data of Draft J2735 (EU)
-- Fritz: will be included from the ETSI CDD
-- AltitudeValue ::= INTEGER (-100000..800001)  units of  0.01 meter 
   -- Where: 
   -- seaLevel(0), 
   -- oneCentimeter(1), 
   -- unavailable(800001)

-- DE_EmmissionType_EU (Desc Name) Record 6
-- From source: Regional Data of Draft J2735 (EU)
EmmissionType ::= ENUMERATED {
     typeA,  -- check for proper restrictions
     typeB,  -- 
     typeC,  -- 
     typeD,  -- 
     typeE,  -- 
     ... -- # LOCAL_CONTENT
     } 
     -- values to 127 reserved for std use
     -- values 128 to 255 reserved for local use

-- DF_PrioritizationResponse_EU (Desc Name) Record 17
-- From source: Regional Data of Draft J2735 (EU)
PrioritizationResponse ::=  SEQUENCE {
   -- Fritz: will be included from the ETSI CDD
   -- stationID      DSRC.StationID,
   stationID      StationID,
                  -- Id of prioritized vehicle
   priorState     PrioritizationResponseStatus,
                  -- State of prioritization request
   signalGroupId  SignalGroupID,
                  -- id of prioritized LaneSet, which will 
                  -- be given free way 
   ... -- # LOCAL_CONTENT
   }

   
-- DF_REG_Position3D_EU (Desc Name) Record 34
-- From source: Regional Data of Draft J2735 (EU)
Reg-Position3D ::=  SEQUENCE {
   altitude    Altitude, 
   ...
   }
   
 -- DF_REG_RestrictionUserType_EU (Desc Name) Record 45
-- From source: Regional Data of Draft J2735 (EU)
-- Fritz this is missing
Reg-RestrictionUserType ::=  SEQUENCE {
   emmission    EmmissionType OPTIONAL,
   ...
   }
   

-- DF_REG_SPAT_UE (Desc Name) Record 41
-- From source: Regional Data of Draft J2735 (EU)
Reg-SPAT ::=  SEQUENCE { 
    activePrioritizations SEQUENCE SIZE(1..10) OF 
                 PrioritizationResponse OPTIONAL,
    ... 
    }


-- Unable to find the file: EUstubs.txt
-- Which would be be inserted at this point if present.


 
-- END
-- End of the EU module.

 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
-- 
-- Begin module: REGION
-- 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
-- REGION DEFINITIONS AUTOMATIC TAGS::= BEGIN 
 


-- DF_REG_AdvisorySpeed_Base (Desc Name) Record 18
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-AdvisorySpeed ::=  SEQUENCE { ... }

-- DF_REG_ComputedLane_Base (Desc Name) Record 19
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-ComputedLane ::=  SEQUENCE { ... }

-- DF_REG_ConnectionManeuverAssist_Base (Desc Name) Record 20
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-ConnectionManeuverAssist ::=  SEQUENCE { ... }

-- DF_REG_GenericLane_Base (Desc Name) Record 21
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-GenericLane ::=  SEQUENCE { ... }

-- DF_REG_Intersection_Base (Desc Name) Record 22
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-Intersection ::=  SEQUENCE { ... }

-- DF_REG_IntersectionState_Base (Desc Name) Record 23
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-IntersectionState ::=  SEQUENCE { ... }

-- DF_REG_LaneAttributes_Base (Desc Name) Record 24
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-LaneAttributes ::=  SEQUENCE { ... }

-- DF_REG_LaneDataAttribute_Base (Desc Name) Record 25
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-LaneDataAttribute ::=  SEQUENCE { ... }

-- DF_REG_MapData_Base (Desc Name) Record 27
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-MapData ::=  SEQUENCE { ... }

-- DF_REG_MovementEvent_Base (Desc Name) Record 29
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-MovementEvent ::=  SEQUENCE { ... }

-- DF_REG_MovementState_Base (Desc Name) Record 30
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-MovementState ::=  SEQUENCE { ... }

-- DF_REG_NodeAttribute_Base (Desc Name) Record 31
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-NodeAttribute ::=  SEQUENCE { ... }

-- DF_REG_NodeOffsetPoint_Base (Desc Name) Record 32
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-NodeOffsetPoint ::=  SEQUENCE { ... }

-- DF_REG_Position3D_Base (Desc Name) Record 35
-- From source: Regional Data of Draft J2735 (DSRC)
-- Fritz: this is defined in EU part
-- Reg-Position3D ::=  SEQUENCE { ... }

-- DF_REG_RestrictionUserType_Base (Desc Name) Record 37
-- From source: Regional Data of Draft J2735 (DSRC)
-- Fritz: defined in EU region
-- Reg-RestrictionUserType ::=  SEQUENCE { ... }

-- DF_REG_RoadSegment_Base (Desc Name) Record 38
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-RoadSegment ::=  SEQUENCE { ... }

-- DF_REG_SignalControlZone_Base (Desc Name) Record 39
-- From source: Regional Data of Draft J2735 (DSRC)
Reg-SignalControlZone ::=  SEQUENCE { ... }

-- DF_REG_SPAT_Base (Desc Name) Record 40
-- From source: Regional Data of Draft J2735 (DSRC)
-- Reg-SPAT ::=  SEQUENCE { ... }


-- Unable to find the file: REGIONstubs.txt
-- Which would be be inserted at this point if present.


 
END
-- End of the REGION module.
 
+37 −35
Original line number Original line Diff line number Diff line
@@ -76,38 +76,18 @@ module LibItsCam_Functions {
        }
        }
        
        
        /**
        /**
         * @desc Checks that the event was indicated at the application layer
         * @desc    Changes the position of the IUT
         * @param p_event The event to check.
         * @param   p_position
         * @param   p_discard The event should not appear. Default value: FALSE.
         */
         */
        function f_utCheckEvent(template (value) UtCamTrigger p_event, boolean p_discard := false) runs on ItsCam {
        function f_utChangePosition(template (value) UtChangePosition p_position) runs on ItsCam {
            var template (value) UtCheck v_utMsg := { p_event };
            
            
            utPort.send(v_utMsg);
            utPort.send(p_position);
            tc_wait.start;
            alt {
            alt {
                [] utPort.receive(UtCamTriggerResult:true) {
                [] utPort.receive(UtChangePositionResult:?) {
                    tc_wait.stop;
                    if (p_discard == false) {
                        log("*** f_utCheckEvent: INFO: Event correctly indicated at application layer ***");
                    }
                    else {
                        log("*** f_utCheckEvent: ERROR: Event indicated at application layer where it should be discarded ***");
                        f_selfOrClientSyncAndVerdict("error", e_error);
                    }
                }
                [] utPort.receive(UtCamTriggerResult:false) {
                    tc_wait.stop;
                    tc_wait.stop;
                    if (p_discard == false) {
                        log("*** f_utCheckEvent: ERROR: Event not correctly indicated at application layer ***");
                        f_selfOrClientSyncAndVerdict("error", e_error);
                    }
                    else {
                        log("*** f_utCheckEvent: INFO: Event not indicated at application layer***");
                    }
                }
                }
                [] tc_wait.timeout {
                [] tc_wait.timeout {
                    log("*** f_utCheckEvent: ERROR: Timeout while waiting for event check result ***");
	                log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
	                f_selfOrClientSyncAndVerdict("error", e_timeout);
	                f_selfOrClientSyncAndVerdict("error", e_timeout);
	            }
	            }
	            [else] { // Shortcut defaults
	            [else] { // Shortcut defaults
@@ -172,12 +152,35 @@ module LibItsCam_Functions {
            }
            }
        }//end altstep a_basicDefault
        }//end altstep a_basicDefault
        
        
         
        /**
         * @desc The default for handling upper tester messages.
         */
        altstep a_utDefault() runs on ItsCam {
            var UtCamEventInd v_event;
            [] utPort.receive(UtCamEventInd:?) -> value v_event {
                //store every upper tester indication received
                vc_utEvents[lengthof(vc_utEvents)] := v_event;
                repeat;
            }
            [] utPort.receive {
                tc_wait.stop;
                log("*** " & testcasename() & ": INFO: Received unexpected UT message from IUT ***");
                f_selfOrClientSyncAndVerdict("error", e_error);
            }
        }
         
         
    } // end of defaults  
    } // end of defaults  
    
    
    group preambles {
    group preambles {
        
        
        /**
         * @desc The default preamble.
         */
        function f_prDefault() runs on ItsCam {
            vc_default := activate(a_default());
            activate(a_utDefault());
        }
        
        /**
        /**
         * @desc    Initialize the IUT
         * @desc    Initialize the IUT
         * @remark  No specific actions specified in the base standard
         * @remark  No specific actions specified in the base standard
@@ -186,8 +189,7 @@ module LibItsCam_Functions {
            
            
            f_utInitializeIut(m_camInitialize);
            f_utInitializeIut(m_camInitialize);
            
            
            // basic default altstep
            f_prDefault();
            activate(a_default());
            
            
            camPort.clear;
            camPort.clear;
            tc_ac.start;
            tc_ac.start;
+0 −16
Original line number Original line Diff line number Diff line
@@ -122,22 +122,6 @@ module LibItsCam_Templates {
                setDangerousGoods := p_dangerousGoods
                setDangerousGoods := p_dangerousGoods
            }
            }
            
            
            /**
             * @desc Change the position in the direction of the current heading
             * @param p_offset Offset to the current position in meter
             */
            template (value) UtCamTrigger m_changePosition(UtChangePosition p_offset) := {
                changePosition := p_offset
            }
            
            /**
             * @desc Checks the receive of a message at LDM
             * @param p_message The CAM message to check
             */
            template (value) UtCamTrigger m_checkLdm(CAM p_message) := {
                checkLdm := p_message
            }
            
        } // end utPrimitives
        } // end utPrimitives
        
        
    } // end group Primitives
    } // end group Primitives
Loading