Merge branch 'TTF0002' into cygwin (d2da42bd) · Commits · TTCN-3 Libraries / LibIts

ttcn/MapemSpatem/LibItsMapemSpatem_Pics.ttcn

+6 −12

Original line number	Diff line number	Diff line
		@@ -88,13 +88,13 @@ module LibItsMapemSpatem_Pics {
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_PEDESTRIAN_MANOEUVRES := false;
		modulepar boolean PICS_SPATEM_PEDESTRIAN_MANOEUVRES := true;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_SPECIALIZED_MANOEUVRES := false;
		modulepar boolean PICS_SPATEM_SPECIALIZED_MANOEUVRES := true;

		/**
		* @desc Support for SPATEM reception
		@@ -112,31 +112,25 @@ module LibItsMapemSpatem_Pics {
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_PEDESTRIAN_MAOEUVRES := false;
		modulepar boolean PICS_SPATEM_HAS_OPTIMAL_SPEED := true;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_OPTIMAL_SPEED := false;
		modulepar boolean PICS_SPATEM_HAS_SIGNAL_PROGRESSION_SPEED := true;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_SIGNAL_PROGRESSION_SPEED := false;
		modulepar boolean PICS_SPATEM_HAS_EGRESS_QUEUE := true;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_HAS_EGRESS_QUEUE := false;

		/**
		* @desc Support for SPATEM reception
		* @see TODO
		*/
		modulepar boolean PICS_SPATEM_TRANSMISSION_RATE := false;
		modulepar boolean PICS_SPATEM_TRANSMISSION_RATE := true;

		modulepar float PICS_T_GEN_SPATEM_MIN := 0.1;

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

+58 −43

Original line number	Diff line number	Diff line
		@@ -590,6 +590,21 @@ module LibItsMapemSpatem_Templates {
		regional := *
		}

		template (present) LaneAttributes mw_laneAttributes := {
		directionalUse := ?,
		sharedWith := ?,
		laneType := ?,
		regional := *
		}

		template (present) LaneAttributes mw_laneAttributes_crosswak(
		template (present) LaneAttributes_Crosswalk p_crosswalk := ?
		) modifies mw_laneAttributes := {
		laneType := {
		crosswalk := p_crosswalk
		}
		}

		/**
		* @desc Receive template for MAPEM Message with no LayerType
		*/
		@@ -863,20 +878,20 @@ module LibItsMapemSpatem_Templates {
		}

		template (present) MovementEvent mw_movementEvent(
		in template (present) MovementPhaseState p_eventState := ?,
		in template TimeChangeDetails p_timing := *,
		in template MovementEvent.speeds p_speeds := *
		template (present) MovementPhaseState p_eventState := ?,
		template TimeChangeDetails p_timing := *,
		template MovementEvent.speeds p_speeds := *
		) := {
		eventState := stop_Then_Proceed, // Consisting of: Phase state (the basic 11 states) and Directional, protected, or permissive state
		eventState := p_eventState, // Consisting of: Phase state (the basic 11 states) and Directional, protected, or permissive state
		timing := p_timing, // Timing Data in UTC time stamps for event includes start and min/max end times of phase confidence and estimated next occurrence
		speeds := p_speeds, // Various speed advisories for use by general and specific types of vehicles supporting green-wave and other flow needs
		regional := *
		}

		template (present) TimeChangeDetails mw_timeChangeDetails(
		in template (present) TimeMark p_minEndTime := ?,
		in template TimeMark p_startTime := *,
		in template TimeMark p_nextTime := *
		template (present) TimeMark p_minEndTime := ?,
		template TimeMark p_startTime := *,
		template TimeMark p_nextTime := *
		) := {
		startTime := p_startTime,
		minEndTime := p_minEndTime,
		@@ -887,8 +902,8 @@ module LibItsMapemSpatem_Templates {
		}

		template (present) ConnectionManeuverAssist mw_connectionManeuverAssist(
		in template (present) LaneConnectionID p_connectionID := ?,
		in template PedestrianBicycleDetect p_pedBicycleDetect := ?
		template (present) LaneConnectionID p_connectionID := ?,
		template (present) PedestrianBicycleDetect p_pedBicycleDetect := ?
		) := {
		connectionID := p_connectionID,
		queueLength := *,
		@@ -899,9 +914,9 @@ module LibItsMapemSpatem_Templates {
		}

		template (present) ConnectionManeuverAssist mw_connectionManeuverAssist_queueAndAvailableStorageLength(
		in template (present) LaneConnectionID p_connectionID := ?,
		in template ZoneLength p_queueLength := ?,
		in template ZoneLength p_availableStorageLength := ?
		template (present) LaneConnectionID p_connectionID := ?,
		template (present) ZoneLength p_queueLength := ?,
		template (present) ZoneLength p_availableStorageLength := ?
		) := {
		connectionID := p_connectionID,
		queueLength := p_queueLength,

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

+9 −4

Original line number	Diff line number	Diff line
		@@ -76,7 +76,12 @@ module LibItsMapemSpatem_TypesAndValues {
		mapProfile0 (0),
		mapProfile1 (1),
		mapProfile2 (2),
		spatProfile0 (3)
		spatProfile0 (3),
		spatProfile1 (4),
		spatProfile2 (5),
		spatProfile3 (6),
		tlmPedestrianDetected (10),
		stopTLMService (20)
		} with {
		variant "FIELDLENGTH(8)"
		}

Admin message