Commit 4db73ea0 authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate SREM ATS

parent d55e0af5
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -56,7 +56,9 @@ module LibItsSremSsem_Pixits {
    }; 
    }; 
    
    
    modulepar charstring PX_SREM_CERTIFICATE_X := "CERT_IUT_SREM_SSP_01";
    modulepar charstring PX_SREM_CERTIFICATE_X := "CERT_IUT_SREM_SSP_01";
    
    modulepar octetstring PX_SREM_CERTIFICATE_X_SSP := '024000'O;
    modulepar octetstring PX_SREM_CERTIFICATE_X_SSP := '024000'O;
    
    modulepar BasicVehicleRole PX_SREM_CERTIFICATE_X_ROLE := publicTransport;
    modulepar BasicVehicleRole PX_SREM_CERTIFICATE_X_ROLE := publicTransport;
    
    
} // end LibItsSremSsem_Pixits
} // end LibItsSremSsem_Pixits
+22 −10
Original line number Original line Diff line number Diff line
@@ -594,7 +594,20 @@ module LibItsSremSsem_Templates {
                timeStamp       := omit,
                timeStamp       := omit,
                second          := PX_SECOND,
                second          := PX_SECOND,
                sequenceNumber  := omit,
                sequenceNumber  := omit,
                status          := { m_signalStatus(PX_SEQUENCE_NUMBER, m_requestorDescription(m_vehicleID(f_getIutStationId())), m_signalRequest(m_intersectionReferenceID, 17, priorityRequestTypeReserved, { lane := 2 } )) },
                status          := { 
                                      m_signalStatus(
                                                     PX_SEQUENCE_NUMBER, 
                                                     m_requestorDescription(
                                                                            m_vehicleID(f_getIutStationId()
                                                                            )), 
                                                     m_signalRequest(
                                                                     m_intersectionReferenceID, 
                                                                     PX_REQUEST_ID, 
                                                                     priorityRequestTypeReserved, 
                                                                     { lane := 1 } 
                                                                     )
                                                     ) 
                                      },
                regional        := omit
                regional        := omit
            }
            }
            
            
@@ -630,7 +643,7 @@ module LibItsSremSsem_Templates {
            ) := {
            ) := {
                sequenceNumber  := p_sequenceNumber,
                sequenceNumber  := p_sequenceNumber,
                id              := p_signalRequest.id,
                id              := p_signalRequest.id,
                sigStatus       := { m_signalStatusPackage(m_requester(p_requestor.id, p_signalRequest.requestID, p_sequenceNumber, p_requestor.type_.role)) },
                sigStatus       := { m_signalStatusPackage(m_requester(p_requestor, p_signalRequest.requestID, p_sequenceNumber)) },
                regional        := omit
                regional        := omit
            }
            }
            
            
@@ -645,17 +658,16 @@ module LibItsSremSsem_Templates {
                regional        := *
                regional        := *
            }
            }
            
            
            template (omit) SignalRequesterInfo m_requester(
            template (value) SignalRequesterInfo m_requester(
                                                            in template (value) VehicleID p_id,
                                                             in template (value) RequestorDescription p_requestor,
                                                             in template (value) RequestID p_request,
                                                             in template (value) RequestID p_request,
                                                            in template (value) MsgCount p_sequenceNumber,
                                                             in template (value) MsgCount p_sequenceNumber
                                                            in template (omit) BasicVehicleRole p_role := omit
            ) := {
            ) := {
                id             := p_id,
                id             := p_requestor.id,
                request        := p_request,
                request        := p_request,
                sequenceNumber := p_sequenceNumber,
                sequenceNumber := p_sequenceNumber,
                role           := p_role,
                role           := omit,//p_requestor.type_.role,
                typeData       := omit
                typeData       := p_requestor.type_
            }
            }
            
            
            template SignalRequesterInfo mw_requester(
            template SignalRequesterInfo mw_requester(