Commit 95f4fa9f authored by garciay's avatar garciay
Browse files

Change SREM PX_STATUS typing

Update SREM templates
parent 275d86b2
......@@ -542,15 +542,28 @@ module LibItsMapemSpatem_Templates {
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,
name := omit,
intersections := m_intersections,
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) IntersectionState m_intersection := {
......
......@@ -23,7 +23,10 @@ module LibItsSremSsem_Pixits {
modulepar DSecond PX_SECOND := 0;
modulepar SignalStatus PX_STATUS;
modulepar IntersectionReferenceID PX_STATUS := {
region := omit,
id := 0
};
/**
* @desc MsgCount for MAPEM sending
......
......@@ -375,7 +375,7 @@ module LibItsSremSsem_Templates {
m_signalRequest(
m_intersectionReferenceID,
1,
PriorityRequestType.priorityRequestTypeReserved,
priorityRequestTypeReserved,
{ lane := 1 }
)) },
requestor := m_requestorDescription(m_vehicleID(f_getIutStationId())),
......@@ -388,7 +388,7 @@ module LibItsSremSsem_Templates {
request := p_request,
minute := omit,
second := omit,
duration_ := omit,
duration := omit,
regional := omit
}
......@@ -486,7 +486,7 @@ module LibItsSremSsem_Templates {
timeStamp := omit,
second := PX_SECOND,
sequenceNumber := omit,
status := { PX_STATUS },
status := { m_signalStatus(PX_STATUS) },
regional := omit
}
......@@ -497,16 +497,16 @@ module LibItsSremSsem_Templates {
in SignalRequestMessage p_signalRequestMessage
) modifies m_defaultSsem := {
second := p_signalRequestMessage.second,
status := { m_signalStatus(p_signalRequestMessage.requests[0].request) },
status := { m_signalStatus(p_signalRequestMessage.requests[0].request.id) },
regional := omit
}
template (value) SignalStatus m_signalStatus(
in SignalRequest p_signalRequest
in IntersectionReferenceID p_id
) := {
sequenceNumber := 1, // FIXME To be reviewed
id := p_signalRequest.id,
id := p_id,
sigStatus := { m_signalStatusPackage },
regional := omit
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment