Update UT primitives (1d061142) · Commits · TTCN-3 Libraries / LibIts

ttcn/IVIM/LibItsIvim_TypesAndValues.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,11 @@ module LibItsIvim_TypesAndValues {
	* @desc Upper Tester message to request triggering of an event at IUT		* @desc Upper Tester message to request triggering of an event at IUT
	*/		*/
	type record UtIvimTrigger {		type record UtIvimTrigger {
	TimestampIts repetitionInterval optional,
	TimestampIts validFrom optional,		TimestampIts validFrom optional,
	TimestampIts validTo optional,		TimestampIts validTo optional,
			TimestampIts repetitionInterval optional/*,
	IVIManagementContainer.connectedIviStructures connectedIviStructures optional,		IVIManagementContainer.connectedIviStructures connectedIviStructures optional,
	IviStructure.optional_ optional_ optional		IviStructure.optional_ optional_ optional*/
	}		}

	/**		/**

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

+196 −51

Original line number	Original line	Diff line number	Diff line
	@@ -337,8 +337,32 @@ module LibItsMapemSpatem_Templates {

	group mapemSpatemTemplates {		group mapemSpatemTemplates {

			template (omit) IntersectionReferenceID m_intersectionReferenceID(
			in template (value) IntersectionID p_intersectionID := 0,
			in template (omit) RoadRegulatorID p_roadRegulatorID := omit
			) := {
			region := p_roadRegulatorID, // a globally unique regional assignment value typical assigned to a regional DOT authority the value zero shall be used for testing needs
			id := p_intersectionID // a unique mapping to the intersection in question within the above region of use
			}

			template (omit) Connection m_connction(
			in template (value) ConnectingLane p_connectingLane,
			in template (omit) IntersectionReferenceID p_remoteIntersection := omit,
			in template (omit) SignalGroupID p_signalGroup := omit,
			in template (omit) RestrictionClassID p_userClass := omit,
			in template (omit) LaneConnectionID p_connectionID := omit
			) := {
			connectingLane := p_connectingLane, // The index of the connecting lane and also the maneuver from the current lane to it
			remoteIntersection := p_remoteIntersection, // This entry is only used when the indicated connecting lane belongs to another intersection layout.
			signalGroup := p_signalGroup, // The matching signal group send by the SPAT message for this lane/maneuver.
			userClass := p_userClass, // The Restriction Class of users this applies to
			connectionID := p_connectionID // An optional connection index used to relate this lane connection to any dynamic clearance data in the SPAT
			}

	group mapemTemplates {		group mapemTemplates {

			group mapemTemplatesSend {

	/**		/**
	* @desc Send template for MAPEM Message		* @desc Send template for MAPEM Message
	*/		*/
	@@ -354,6 +378,98 @@ module LibItsMapemSpatem_Templates {
	regional := omit		regional := omit
	}		}

			/**
			* @desc Receive template for MAPEM Message
			*/
			template (omit) MapData m_mapem(
			in template (value) MsgCount p_msgIssueRevision,
			in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
			in template (omit) RoadSegmentList p_roadSegments := omit
			) modifies m_defaultMapem := {
			msgIssueRevision := p_msgIssueRevision,
			intersections := p_intersectionGeometryList,
			roadSegments := p_roadSegments
			}

			template (omit) IntersectionGeometry m_intersectionGeometry(
			in template (value) IntersectionReferenceID p_intersectionReferenceID,
			in template (value) MsgCount p_revision,
			in template (value) Position3D p_position3D,
			in template (value) LaneList p_laneList,
			in template (omit) LaneWidth p_laneWidth := 2000
			) := {
			name := omit, //For debug use only
			id := p_intersectionReferenceID, // A globally unique value set, consisting of a regionID and intersection ID assignment
			revision := p_revision, // Required default values about lane descriptions follow
			refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.
			laneWidth := p_laneWidth, // Reference width used by all subsequent lanes unless a new width is given speedLimits SpeedLimitList OPTIONAL,
			laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)
			preemptPriorityData := omit, // data about one or more regional preempt or priority zones
			regional := omit
			}

			template (value) Position3D m_position3D(
			in template (value) Latitude p_latitude,
			in template (value) Longitude p_longitude
			) := {
			lat := p_latitude, // in 1/10th micro degrees
			long := p_longitude, // in 1/10th micro degrees
			elevation := omit, // in 10 cm units
			regional := omit
			}

			template (omit) GenericLane m_laneList(
			in template (value) LaneID p_laneID,
			in template (value) LaneAttributes p_laneAttributes,
			in template (value) NodeListXY p_nodeListXY,
			in template (omit) ConnectsToList p_connectsToList := omit,
			in template (omit) ApproachID p_ingressApproach := omit,
			in template (omit) ApproachID p_egressApproach := omit,
			in template (omit) AllowedManeuvers p_allowedManeuvers := omit
			) := {
			laneID := p_laneID, // The unique ID number assigned to this lane object
			name := omit, // often for debug use only but at times used to name ped crossings
			ingressApproach := p_ingressApproach, // inbound Approach IDs to which this lane belongs
			egressApproach := p_egressApproach, // outbound Approach IDs to which this lane belongs
			laneAttributes := p_laneAttributes, // All Attribute information about the basic selected lane type
			maneuvers := p_allowedManeuvers, // the permitted maneuvers for this lane
			nodeList := p_nodeListXY, // Lane spatial path information as well as various Attribute information along the node path
			// Attributes found here are more general and may come and go over the length of the lane.
			connectsTo := p_connectsToList, // a list of other lanes and their signal group IDs each connecting lane and its signal group ID is given, therefore this element provides the information formerly in "signalGroups" in prior editions.
			overlays := omit,
			regional := omit
			}

			template (omit) RoadSegment m_roadSegment(
			in template (value) RoadSegmentReferenceID p_id,
			in template (value) MsgCount p_revision,
			in template (value) Position3D p_position3D,
			in template (value) RoadLaneSetList p_roadLaneSet,
			in template (omit) SpeedLimitList p_speedLimits := omit,
			in template (omit) LaneWidth p_laneWidth := 2000
			) := {
			name := omit,
			id := p_id, // a globally unique value for the segment
			revision := p_revision, // Required default values about the descriptions to follow
			refPoint := p_position3D, // the reference from which subsequent data points are offset until a new point is used.
			laneWidth := p_laneWidth, // Reference width used by all subsequent lanes unless a new width is given
			speedLimits := p_speedLimits, // Reference regulatory speed limits used by all subsequent lanes unless a new speed is given
			roadLaneSet := p_roadLaneSet,
			regional := omit
			}

			template (value) RegulatorySpeedLimit m_speedLimits(
			in template (value) SpeedLimitType p_speedLimitType,
			in template (value) Velocity p_velocity
			) := {
			type_ := p_speedLimitType, // The type of regulatory speed which follows
			speed := p_velocity // The speed in units of 0.02 m/s
			}

			} // End of group mapemTemplatesSend

			group mapemTemplatesRecv {

	/**		/**
	* @desc Receive template for MAPEM Message		* @desc Receive template for MAPEM Message
	*/		*/
	@@ -387,6 +503,40 @@ module LibItsMapemSpatem_Templates {
	layerID := p_layerID		layerID := p_layerID
	}		}

			template (present) IntersectionGeometry mw_intersectionGeometry(
			template (present) IntersectionReferenceID p_id := ?,
			template (present) MsgCount p_revision := ?,
			template (present) Position3D p_position3D := ?,
			template (present) LaneList p_laneList := ?
			) := {
			name := *, //For debug use only
			id := p_id, // A globally unique value set, consisting of a regionID and intersection ID assignment
			revision := p_revision, // Required default values about lane descriptions follow
			refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.
			laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given speedLimits SpeedLimitList OPTIONAL,
			laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)
			preemptPriorityData := *, // data about one or more regional preempt or priority zones
			regional := *
			}

			template (present) RoadSegment mw_roadSegment(
			template (present) RoadSegmentReferenceID p_id := ?,
			template (present) MsgCount p_revision := ?,
			template (present) Position3D p_position3D := ?,
			template (present) RoadLaneSetList p_roadLaneSet := ?
			) := {
			name := *,
			id := p_id, // a globally unique value for the segment
			revision := p_revision, // Required default values about the descriptions to follow
			refPoint := p_position3D, // the reference from which subsequent data points are offset until a new point is used.
			laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given
			speedLimits := *, // Reference regulatory speed limits used by all subsequent lanes unless a new speed is given
			roadLaneSet := p_roadLaneSet,
			regional := *
			}

			} // End of group mapemTemplatesRecv

	} // End of group mapemTemplates		} // End of group mapemTemplates

	group spatemTemplates {		group spatemTemplates {
	@@ -416,11 +566,6 @@ module LibItsMapemSpatem_Templates {
	regional := omit		regional := omit
	}		}

	template (value) IntersectionReferenceID m_intersectionReferenceID := {
	region := omit,
	id := PX_INTERSECTION_ID
	}

	template (value) MovementList m_movements := { m_movement };		template (value) MovementList m_movements := { m_movement };

	template (value) MovementState m_movement := {		template (value) MovementState m_movement := {

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -35,9 +35,9 @@ module LibItsMapemSpatem_TypesAndValues {
	type enumerated Event {		type enumerated Event {
	startTLMService (0),		startTLMService (0),
	stopTLMService (1),		stopTLMService (1),
	spatemNewContent (2),		mapemNewContent (2),
	mapemNewContent (3),		mapemNewContentWithFragmentation (3),
	mapemNewContentWithFragmentation (4),		spatemNewContent (4),
	mapemRepL10s (5),		mapemRepL10s (5),
	mapemRepG10s (6)		mapemRepG10s (6)
	}		}

ttcn/SremSsem/LibItsSremSsem_Functions.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -56,14 +56,14 @@ module LibItsSremSsem_Functions {
	* @param p_event The event to trigger.		* @param p_event The event to trigger.
	*/		*/
	function f_utTriggerEvent(		function f_utTriggerEvent(
	in template (value) UtSremSsemTrigger p_event		in template (value) UtSremTrigger p_event
	) runs on ItsSremSsem {		) runs on ItsSremSsem {
	var UtSremSsemTriggerResult v_result;		var UtSremTriggerResult v_result;

	utPort.send ( p_event );		utPort.send ( p_event );
	tc_wait.start;		tc_wait.start;
	alt {		alt {
	[] utPort.receive ( UtSremSsemTriggerResult:? ) -> value v_result {		[] utPort.receive ( UtSremTriggerResult:? ) -> value v_result {
	tc_wait.stop;		tc_wait.stop;
	if ( not v_result ) {		if ( not v_result ) {
	f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);		f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);

ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,9 +17,11 @@ module LibItsSremSsem_Pixits {
	// LibItsSremSsem		// LibItsSremSsem
	import from LibItsSremSsem_TypesAndValues all;		import from LibItsSremSsem_TypesAndValues all;

	modulepar DSecond PX_SECOND := 0;		modulepar BasicVehicleRole PX_BASICEVEHICLEROLE := emergency;

			modulepar RequestImportanceLevel PX_REQUESTIMPORTANCELEVEL := requestImportanceLevel13;

	modulepar RequestorDescription PX_REQUESTOR;		modulepar DSecond PX_SECOND := 0;

	modulepar SignalStatus PX_STATUS;		modulepar SignalStatus PX_STATUS;

Admin message