Skip to content
GitLab
Commit 19ba9213 authored by berge's avatar berge
Browse files

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

parent 64925c67
Expand all Hide whitespace changes
Inline Side-by-side
asn1/MAP_SPAT/MAP_SPAT_CEN.asn → asn1/MAP_SPAT/MAP_SPAT_ETSI.asn
View file @ 19ba9213
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
asn1/MAP_SPAT/MAP_SPAT_REG_D.asn 0 → 100644
View file @ 19ba9213
-- ############################################################################
-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
--
-- 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
asn1/MAP_SPAT/MAP_SPAT_Regional_EU.asn deleted 100644 → 0
View file @ 64925c67
-- -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
--
-- 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.
ttcn/CAM/LibItsCam_Pics.ttcn
View file @ 19ba9213
......@@ -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
ttcn/CAM/LibItsCam_Templates.ttcn
View file @ 19ba9213
......@@ -7,6 +7,9 @@
*/
module LibItsCam_Templates {
// LibCommon
import from LibCommon_BasicTypesAndValues all;
// LibIts
import from ITS_Container language "ASN.1:1997" all;
import from CAM_PDU_Descriptions language "ASN.1:1997" all;
......@@ -24,12 +27,58 @@ module LibItsCam_Templates {
/**
* @desc Receive template for CAM Message (CamPort Primitive)
* @param p_camMsg CAM Message to be sent
* @param p_camMsg Expected CAM Message
*/
template CamInd mw_camInd (
in template (present) CAM p_camMsg
) := {
msgIn := p_camMsg
msgIn := p_camMsg,
gnNextHeader := *,
gnHeaderType := *,
gnHeaderSubtype := *,
gnLifetime := *,
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *
};
/**
* @desc Receive template for CAM Message (CamPort Primitive)
* @param p_camMsg Expected CAM Message
* @param p_gnNextHeader GN next header value
* @param p_gnHeaderType GN header type value
* @param p_gnHeaderSubtype GN header subtype value
* @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value
*/
template CamInd mw_camIndWithGnParameters (
in template (present) CAM p_camMsg,
in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *,
in template UInt8 p_gnHeaderSubtype := *,
in template UInt32 p_gnLifetime := *,
in template UInt8 p_gnTrafficClass := *
) modifies mw_camInd := {
gnNextHeader := p_gnNextHeader,
gnHeaderType := p_gnHeaderType,
gnHeaderSubtype := p_gnHeaderSubtype,
gnLifetime := p_gnLifetime,
gnTrafficClass := p_gnTrafficClass
};
/**
* @desc Receive template for CAM Message (CamPort Primitive)
* @param p_camMsg Expected CAM Message
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
template CamInd mw_camIndWithBtpParameters (
in template (present) CAM p_camMsg,
in template UInt8 p_btpDestinationPort := *,
in template UInt8 p_btpInfo := *
) modifies mw_camInd := {
btpDestinationPort := p_btpDestinationPort,
btpInfo := p_btpInfo
};
/**
......
ttcn/CAM/LibItsCam_TestSystem.ttcn
View file @ 19ba9213
......@@ -10,6 +10,7 @@ module LibItsCam_TestSystem {
// LibCommon
import from LibCommon_Time {modulepar all};
import from LibCommon_Sync all;
import from LibCommon_BasicTypesAndValues all;
// LibIts
import from CAM_PDU_Descriptions language "ASN.1:1997" all;
......@@ -17,7 +18,7 @@ module LibItsCam_TestSystem {
// LibItsCommon
import from LibItsCommon_TestSystem all;
import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_TypesAndValues all;
// LibItsCam
import from LibItsCam_TypesAndValues all;
......@@ -104,7 +105,14 @@ module LibItsCam_TestSystem {
* @desc FA1 CAM Indication Primitive
*/
type record CamInd {
CAM msgIn
CAM msgIn,
UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional,
UInt32 gnLifetime optional,
UInt8 gnTrafficClass optional,
UInt16 btpDestinationPort optional,
UInt16 btpInfo optional
}
with {
encode (msgIn) "LibItsCam_asn1"
......
ttcn/DENM/LibItsDenm_Pics.ttcn
View file @ 19ba9213
......@@ -11,9 +11,57 @@ module LibItsDenm_Pics {
/**
* @desc Default expiry time of DENM generations
* @see ETSI TS 102 869-1 v1.1.1 A.66/1
* @see ETSI TS 102 869-2 Table 3
*/
modulepar integer PICS_DEFAULT_EXPIRY_TIME := 60000;
modulepar integer PICS_DENM_DEFAULT_EXPIRY_TIME := 60000;
/**
* @desc Support for DENM generation
* @see ETSI TS 102 869-2 Table 3
*/
modulepar boolean PICS_DENM_GENERATION := true;
/**
* @desc Support for DENM update
* @see ETSI TS 102 869-2 Table 3
*/
modulepar boolean PICS_DENM_UPDATE := true;
/**
* @desc Support for DENM repetition