Change SREM PX_STATUS typing (95f4fa9f) · Commits · TTCN-3 Libraries / LibIts

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

+15 −2

Original line number	Original line	Diff line number	Diff line
	@@ -542,15 +542,28 @@ module LibItsMapemSpatem_Templates {
	group spatemTemplates {		group spatemTemplates {

	/**		/**
	* @desc Send template for SPAT Message		* @desc Send default template for SPAT Message
	*/		*/
	template (value) SPAT m_spat := {		template (value) SPAT m_defaultSpatem := {
	timeStamp := omit,		timeStamp := omit,
	name := omit,		name := omit,
	intersections := m_intersections,		intersections := m_intersections,
	regional := omit		regional := omit
	}		}

			/**
			* @desc Send template for SPAT Message
			*/
			template (omit) SPAT m_spatem(
			in template (value) IntersectionStateList p_intersections,
			in template (omit) DescriptiveName p_name := omit
			) modifies m_defaultSpatem:= {
			timeStamp := omit,
			name := p_name,
			intersections := p_intersections,
			regional := omit
			}

	template (value) IntersectionStateList m_intersections := { m_intersection };		template (value) IntersectionStateList m_intersections := { m_intersection };

	template (value) IntersectionState m_intersection := {		template (value) IntersectionState m_intersection := {

ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,10 @@ module LibItsSremSsem_Pixits {

	modulepar DSecond PX_SECOND := 0;		modulepar DSecond PX_SECOND := 0;

	modulepar SignalStatus PX_STATUS;		modulepar IntersectionReferenceID PX_STATUS := {
			region := omit,
			id := 0
			};

	/**		/**
	* @desc MsgCount for MAPEM sending		* @desc MsgCount for MAPEM sending

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -375,7 +375,7 @@ module LibItsSremSsem_Templates {
	m_signalRequest(		m_signalRequest(
	m_intersectionReferenceID,		m_intersectionReferenceID,
	1,		1,
	PriorityRequestType.priorityRequestTypeReserved,		priorityRequestTypeReserved,
	{ lane := 1 }		{ lane := 1 }
	)) },		)) },
	requestor := m_requestorDescription(m_vehicleID(f_getIutStationId())),		requestor := m_requestorDescription(m_vehicleID(f_getIutStationId())),
	@@ -388,7 +388,7 @@ module LibItsSremSsem_Templates {
	request := p_request,		request := p_request,
	minute := omit,		minute := omit,
	second := omit,		second := omit,
	duration_ := omit,		duration := omit,
	regional := omit		regional := omit
	}		}

	@@ -486,7 +486,7 @@ module LibItsSremSsem_Templates {
	timeStamp := omit,		timeStamp := omit,
	second := PX_SECOND,		second := PX_SECOND,
	sequenceNumber := omit,		sequenceNumber := omit,
	status := { PX_STATUS },		status := { m_signalStatus(PX_STATUS) },
	regional := omit		regional := omit
	}		}

	@@ -497,16 +497,16 @@ module LibItsSremSsem_Templates {
	in SignalRequestMessage p_signalRequestMessage		in SignalRequestMessage p_signalRequestMessage
	) modifies m_defaultSsem := {		) modifies m_defaultSsem := {
	second := p_signalRequestMessage.second,		second := p_signalRequestMessage.second,
	status := { m_signalStatus(p_signalRequestMessage.requests[0].request) },		status := { m_signalStatus(p_signalRequestMessage.requests[0].request.id) },
	regional := omit		regional := omit
	}		}


	template (value) SignalStatus m_signalStatus(		template (value) SignalStatus m_signalStatus(
	in SignalRequest p_signalRequest		in IntersectionReferenceID p_id
	) := {		) := {
	sequenceNumber := 1, // FIXME To be reviewed		sequenceNumber := 1, // FIXME To be reviewed
	id := p_signalRequest.id,		id := p_id,
	sigStatus := { m_signalStatusPackage },		sigStatus := { m_signalStatusPackage },
	regional := omit		regional := omit
	}		}

Admin message