Commit 19ba9213 authored by berge's avatar berge
Browse files

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

parent 64925c67
Loading
Loading
Loading
Loading
+1240 −607

File changed and moved.

Preview size limit exceeded, changes collapsed.

+6 −6
Changes for asn1/MAP_SPAT/MAP_SPAT_ETSI.asn: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
MAP-SPAT-CEN DEFINITIONS AUTOMATIC TAGS ::= 
MAP-SPAT-ETSI DEFINITIONS AUTOMATIC TAGS ::= 

BEGIN

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

MAP ::= SEQUENCE
MAP-PDU ::= SEQUENCE
{
	header	ItsPduHeader,
	mapM	MapData
	mapData	MapData
}

SPAT ::= SEQUENCE
SPAT-PDU ::= SEQUENCE
{
	header	ItsPduHeader,
	spat	SpatData
	spatData SPAT
}

END
+157
Changes for asn1/MAP_SPAT/MAP_SPAT_REG_D.asn: 157 added lines, 0 removed lines.
Original line number Diff line number Diff line
 

-- ############################################################################
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
-- 
-- Begin module: REG-D
-- 
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
-- ############################################################################
REG-D DEFINITIONS AUTOMATIC TAGS::= BEGIN 

-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-- 
-- Imports from Modules:
-- ITS-Container: ETSI common Data Dictionary
-- DSRC:          Basic definition of SPAT and MapData dictionary
-- 
-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
IMPORTS
	Altitude, StationID
	FROM ITS-Container
	
	PrioritizationResponseStatus, SignalGroupID, NodeOffsetPoint,
	Offset-B11, LaneID
	FROM DSRC;


-- =============================================================================
-- DE_EmissionType_RegD (Desc Name) Record 10
-- From source: AMENDMENT Regional Data J2735 (REG-D)
EmissionType ::= ENUMERATED {
     typeA,  -- check for proper restrictions
     typeB,  -- 
     typeC,  -- 
     typeD,  -- 
     typeE,  -- 
     ... -- # LOCAL_CONTENT
     }

	 
-- =============================================================================
-- DF_PrioritizationResponse_RegD (Desc Name) Record 34
-- From source: AMENDMENT Regional Data J2735 (REG-D)
PrioritizationResponse ::=  SEQUENCE {
   stationID      StationID,
                  -- Id of requesting vehicle
                  -- Note that the stationID has to remain unchanged 
                  -- during the whole prioritisation process.
				  
   priorState     PrioritizationResponseStatus,
                  -- State of prioritization request.
				  
   signalGroup    SignalGroupID,
                  -- id of prioritized LaneSet, which will 
                  -- be given free way.
				  
   ... -- # LOCAL_CONTENT
   }

   
-- =============================================================================
-- DF_PrioritizationResponseList_RegD (Desc Name) Record 35
-- From source: AMENDMENT Regional Data J2735 (REG-D)
PrioritizationResponseList ::=  SEQUENCE SIZE(1..10) OF PrioritizationResponse


-- =============================================================================
-- DF_Reg-ConnectionManeuverAssist_RegD (Desc Name) Record 38
-- From source: AMENDMENT Regional Data J2735 (REG-D)
Reg-ConnectionManeuverAssist ::=  SEQUENCE {
   ...,
   -- version 1
   [[
   vehicleToLanePositions  VehicleToLanePositionList,
   rsuDistanceFromAnchor   NodeOffsetPoint OPTIONAL
   ]]
   }

	
-- =============================================================================
-- DF_REG_IntersectionState_RegD (Desc Name) Record 42
-- From source: AMENDMENT Regional Data J2735 (REG-D)
Reg-IntersectionState ::=  SEQUENCE { 
   ...,
   -- version 1
   [[
   activePrioritizations PrioritizationResponseList OPTIONAL
   ]]
   }

   
-- =============================================================================
-- DF_REG_MapData_Base_RegD   NEW (Desc Name) Record 48
-- From source: AMENDMENT Regional Data J2735 (REG-D)
Reg-MapData ::=  SEQUENCE { 
   ...,
   -- version 1
   [[
   signalHeadLocations   SignalHeadLocationList OPTIONAL
   ]]
   }

   
-- =============================================================================
-- DF_REG_Position3D_RegD (Desc Name) Record 57
Reg-Position3D ::=  SEQUENCE {
   ...,
   -- version 1
   [[
   altitude    Altitude
   ]]
   }

   
-- =============================================================================
-- DF_REG_RestrictionUserType_RegD (Desc Name) Record 58
Reg-RestrictionUserType ::=  SEQUENCE {
   ...,
   -- version 1
   [[
   emission   EmissionType OPTIONAL
   ]]
   }

   
-- =============================================================================
-- DF_SignalHeadLocation_RegD    NEW (Desc Name) Record 66
SignalHeadLocation ::=  SEQUENCE {
   node             NodeOffsetPoint, -- the location
   elevation        Offset-B11,      -- elevation up to 10 meters 
   signalGroupID    SignalGroupID,   
   ...
   }

   
-- =============================================================================
-- DF_SignalHeadLocationList_RegD   NEW (Desc Name) Record 67
SignalHeadLocationList ::=  SEQUENCE (SIZE(1..20)) OF  SignalHeadLocation


-- =============================================================================
-- DF_VehicleToLanePosition_RegD (Desc Name) Record 73
VehicleToLanePosition ::=  SEQUENCE {
    stationID   StationID, 
    laneID      LaneID,
    ...
    }

	
-- =============================================================================
-- DF_VehicleToLanePositionList_RegD (Desc Name) Record 74
VehicleToLanePositionList ::=  SEQUENCE SIZE(1..5) OF VehicleToLanePosition


END
-- End of the REG-D module.
 No newline at end of file
−213

File deleted.

+24 −17
Changes for ttcn/CAM/LibItsCam_Pics.ttcn: 24 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -14,69 +14,63 @@ module LibItsCam_Pics {
        
        /**
         * @desc Is IUT a public transport vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/1
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_PUBLICTRANS := false;
        
        /**
         * @desc Is IUT a special transport vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A12/2
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_SPECIALTRANS := false;
        
        /**
         * @desc Is IUT a dangerous goods vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/3
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_DANGEROUSGOODS := false;
        
        /**
         * @desc Is IUT a road works vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/4
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_ROADWORKS := false;
        
        /**
         * @desc Is IUT a rescue vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/5
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_RESCUE := false;
        
        /**
         * @desc Is IUT an emergency vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/6
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_EMERGENCY := false;
        
        /**
         * @desc Is IUT a safety car vehicle 
         * @see  ETSI TS 102 868-1 v0.0.1 A.2/7
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_SAFETY_CAR := false;
        
        /**
         * @desc Does IUT support 'lowFrequencyContainer' in CamParameters?
         * @see  ETSI TS 102 868-1 v0.0.1 A.8/3
         */
        modulepar boolean PICS_LOWFREQUENCYCONTAINER := true;
        
        /**
         * @desc Does IUT support 'specialVehicleContainer' in CamParameters?
         * @see  ETSI TS 102 868-1 v0.0.1 A.8/4
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_SPECIALVEHICLECONTAINER := true;
        
        /**
         * @desc Maximum time interval between CAM generations (in seconds).
         *       Default value, as per base standard: 1.0s 
         * @see  ETSI TS 102 868-1 v0.0.1 A.22/1
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar float PICS_T_GENCAMMAX := 1.000;
        
        /**
         * @desc Minimum time interval between CAM generations (in seconds).
         *       Default value, as per base standard: 0.1s 
         * @see  ETSI TS 102 868-1 v0.0.1 A.22/2
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar float PICS_T_GENCAMMIN := 0.100;
        
@@ -85,10 +79,23 @@ module LibItsCam_Pics {
         *       according to the requirements of the 
         *       Decentralized Congestion Control(DCC).
         *       Default value, as per base standard: 0.1s 
         * @see  ETSI TS 102 868-1 v0.0.1 A.22/4
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar float PICS_T_GENCAMDCC := 0.100;
        
        /**
         * @desc Support for CAM generation
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_CAM_GENERATION := true;

        /**
         * @desc Support for CAM reception
         * @see  ETSI TS 102 868-2 Table 3
         */
        modulepar boolean PICS_CAM_RECEPTION := true;

        
    } // end camPics
    
} // end LibItsCam_Pics
Loading