Commit 3099a2dd authored by Yann Garcia's avatar Yann Garcia
Browse files

Rebuild AtsDENM full Release 2

parent 8587c415
Loading
Loading
Loading
Loading
+136 −135

File changed.

Preview size limit exceeded, changes collapsed.

+37 −43
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ module LibItsDenm_Templates {
                validityDuration := p_validityDuration,
                repetitionDuration := p_repetitionDuration,
                situation := p_situation,
                relevanceDistance := lessThan50m,
                relevanceTrafficDirection := allTrafficDirections,
                awarenessDistance := lessThan50m,
                trafficDirection := allTrafficDirections,
                transmissionInterval := p_transmissionInterval,
                repetitionInterval := p_repetitionInterval,
                alacarte := p_alacarte
@@ -182,8 +182,8 @@ module LibItsDenm_Templates {
             * @param p_situation                   The Situation Container (Default: omit)
             * @param p_location                    The Location Container (Default: omit)
             * @param p_validityDuration            The validity duration (Default: omit)
             * @param p_relevanceDistance           The relevance distance (Default: omit)
             * @param p_relevanceTrafficDirection   The relevance traffic direction (Default: omit)
             * @param p_awarenessDistance           The relevance distance (Default: omit)
             * @param p_trafficDirection            The relevance traffic direction (Default: omit)
             * @param p_trafficClass                The traffic class (Default: omit)
             * @param p_repetitionInterval          The repetition interval (Default: omit)
             * @param p_transmissionInterval        The transmission interval (Default: omit)
@@ -194,8 +194,8 @@ module LibItsDenm_Templates {
                template (omit) SituationContainer p_situation := omit,
                template (omit) LocationContainer p_location := omit,
                template (omit) ValidityDuration p_validityDuration := omit,
                template (omit) RelevanceDistance p_relevanceDistance := omit,
                template (omit) RelevanceTrafficDirection p_relevanceTrafficDirection := omit,
                template (omit) StandardLength3b p_awarenessDistance := omit,
                template (omit) TrafficDirection p_trafficDirection := omit,
                template (omit) ValidityDuration p_repetitionDuration := omit,
                template (omit) TransmissionInterval p_repetitionInterval := omit,
                template (omit) TransmissionInterval p_transmissionInterval := omit,
@@ -206,8 +206,8 @@ module LibItsDenm_Templates {
                validityDuration := p_validityDuration,
                situation := p_situation,
                location := p_location,
                relevanceDistance := p_relevanceDistance,
                relevanceTrafficDirection := p_relevanceTrafficDirection,
                awarenessDistance := p_awarenessDistance,
                trafficDirection := p_trafficDirection,
                transmissionInterval := p_transmissionInterval,
                repetitionInterval := p_repetitionInterval,
                alacarte := p_alacarte
@@ -250,7 +250,7 @@ module LibItsDenm_Templates {
         * @param   p_denm  The DEN Message
         */
        template (value) DENM m_denmPdu(
            template (value) DecentralizedEnvironmentalNotificationMessage p_denm
            template (value) DenmPayload p_denm
        ) := {
            header := m_itsPduHeader,
            denm := p_denm
@@ -263,7 +263,7 @@ module LibItsDenm_Templates {
         */
        template DENM mw_anyDenmPdu(
            template (present) ItsPduHeader p_itsPduHeader := ?,
            template (present) DecentralizedEnvironmentalNotificationMessage p_denm := ?
            template (present) DenmPayload p_denm := ?
        ) := {
            header := p_itsPduHeader,
            denm := p_denm
@@ -277,7 +277,7 @@ module LibItsDenm_Templates {
         * @param   p_messageId         The expected message id (Default: DEN message id)
         */
        template (present) DENM mw_denmPdu(
            template (present) DecentralizedEnvironmentalNotificationMessage p_denm,
            template (present) DenmPayload p_denm,
            template (present) StationId p_stationId := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageId p_messageId := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageId_denm_
@@ -400,7 +400,7 @@ module LibItsDenm_Templates {
         * @param   p_location      The Location Container
         * @param   p_alacarte      The Alacarte Container (Default: omit)
         */
        template (value) DecentralizedEnvironmentalNotificationMessage m_denm(
        template (value) DenmPayload m_denm(
            template (value) ManagementContainer p_management,
            template (omit) SituationContainer p_situation,
            template (omit) LocationContainer p_location,
@@ -415,7 +415,7 @@ module LibItsDenm_Templates {
        /**
         * @desc    Default receive template for DEN Message
         */
        template (present) DecentralizedEnvironmentalNotificationMessage mw_anyDenm := {
        template (present) DenmPayload mw_anyDenm := {
            management := ?, 
            situation := *, 
            location := *,
@@ -429,7 +429,7 @@ module LibItsDenm_Templates {
         * @param   p_location      The expected location Container (Default: any or omit)
         * @param   p_alacarte      The expected Alacarte Container (Default: any or omit)
         */
        template DecentralizedEnvironmentalNotificationMessage mw_denm(
        template DenmPayload mw_denm(
            template (present) ManagementContainer p_management := ?,
            template SituationContainer p_situation := *,
            template LocationContainer p_location := *,
@@ -445,7 +445,7 @@ module LibItsDenm_Templates {
         * @desc    Send template for DEN Message for event termination.
         * @param   p_actionID  The action id
         */
        template (value) DecentralizedEnvironmentalNotificationMessage m_denmCancellation(
        template (value) DenmPayload m_denmCancellation(
            template (value) ActionId p_actionID,
            template (value) StationType p_stationType
        ) := {
@@ -476,13 +476,13 @@ module LibItsDenm_Templates {
            template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
            template (value) TimestampIts p_referenceTime := f_getCurrentTime()
        ) := {
            actionID := p_actionID,
            actionId := p_actionID,
            detectionTime := p_detectionTime,
            referenceTime := p_referenceTime,
            termination := omit,
            eventPosition := m_tsPosition,
            relevanceDistance := lessThan50m,
            relevanceTrafficDirection := allTrafficDirections,
            awarenessDistance := lessThan50m,
            trafficDirection := allTrafficDirections,
            validityDuration := p_validityDuration,
            transmissionInterval := p_transmissionInterval,
            stationType := p_stationType
@@ -547,13 +547,13 @@ module LibItsDenm_Templates {
            template TransmissionInterval p_transmissionInterval := *,
            template Termination p_termination := *
        ) := {
            actionID := p_actionID,
            actionId := p_actionID,
            detectionTime := ?,
            referenceTime := p_referenceTime,
            termination    := p_termination,
            eventPosition := ?,
            relevanceDistance := *,//?,
            relevanceTrafficDirection := *,//?,
            awarenessDistance := *,//?,
            trafficDirection := *,//?,
            validityDuration := p_validityDuration,
            transmissionInterval := p_transmissionInterval,
            stationType    := p_stationType
@@ -574,13 +574,13 @@ module LibItsDenm_Templates {
         * @desc    Default receive template for Management Container
         */
        template (present) ManagementContainer mw_anyDenmMgmtCon := {
            actionID := ?,
            actionId := ?,
            detectionTime := ?,
            referenceTime := ?,
            termination    := *,
            eventPosition := ?,
            relevanceDistance := *,
            relevanceTrafficDirection := *,
            awarenessDistance := *,
            trafficDirection := *,
            validityDuration := ?,
            transmissionInterval := *,
            stationType    := ?
@@ -593,7 +593,7 @@ module LibItsDenm_Templates {
        template (present) ManagementContainer mw_denmMgmtConWithActionId(
            template (present) ActionId p_actionId := ?
        ) modifies mw_anyDenmMgmtCon := {
            actionID := p_actionId
            actionId := p_actionId
        }
        
        /**
@@ -650,17 +650,14 @@ module LibItsDenm_Templates {
             * @param   p_informationQuality    The information quality (Default: 0)
             */
            template (value) SituationContainer m_situation(
                template (value) CauseCodeType p_cause, 
                template (value) SubCauseCodeType p_subCause,
                template (value) CauseCodeChoice p_cause,
                template (value) InformationQuality p_informationQuality := 0
            ) := {
                informationQuality := p_informationQuality,
                eventType := {
                    causeCode := p_cause,
                    subCauseCode := p_subCause
                    ccAndScc := p_cause
                },
                linkedCause := omit,
                eventHistory := omit
                linkedCause := omit
            }
            
            /**
@@ -670,17 +667,14 @@ module LibItsDenm_Templates {
             * @param   p_informationQuality    The expected information quality (Default: any)
             */
            template (present) SituationContainer mw_situation(
                template (present) CauseCodeType p_cause, 
                template (present) SubCauseCodeType p_subCause,
                template (present) CauseCodeChoice p_cause,
                template (present) InformationQuality p_informationQuality := ?
            ) := {
                informationQuality := p_informationQuality,
                eventType := {
                    causeCode := p_cause,
                    subCauseCode := p_subCause
                    ccAndScc := p_cause
                },
                linkedCause := *,
                eventHistory := *
                linkedCause := *
            }
            
            /**
@@ -700,7 +694,7 @@ module LibItsDenm_Templates {
        template (value) LocationContainer m_denmLocation_zeroDelta := {
            eventSpeed := omit,
            eventPositionHeading := omit,
            traces := {
            detectionZonesToEventPosition := {
                {
                    {
                        pathPosition := {
@@ -721,20 +715,20 @@ module LibItsDenm_Templates {
        template (present) LocationContainer mw_anyDenmLocation := {
            eventSpeed := *,
            eventPositionHeading := *,
            traces := ?,
            detectionZonesToEventPosition := ?,
            roadType := *
        }
        
        /**
         * @desc    Receive template for Location Container with the given traces
         * @param   p_traces    The expected traces.
         * @desc    Receive template for Location Container with the given detectionZonesToEventPosition
         * @param   p_traces    The expected detectionZonesToEventPosition.
         */
        template (present) LocationContainer mw_denmLocationWithTrace(
            template (present) Traces p_traces
        ) := {
            eventSpeed := *,
            eventPositionHeading := *,
            traces := p_traces,
            detectionZonesToEventPosition := p_traces,
            roadType := *
        }
        
+4 −4
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ module LibItsDenm_TypesAndValues {
      ValidityDuration validityDuration optional,
      ValidityDuration repetitionDuration optional,
      SituationContainer situation,
      RelevanceDistance relevanceDistance,
      RelevanceTrafficDirection relevanceTrafficDirection,
      StandardLength3b awarenessDistance,
      TrafficDirection trafficDirection,
      TransmissionInterval transmissionInterval optional,
      TransmissionInterval repetitionInterval optional,
      AlacarteContainer alacarte optional
@@ -124,8 +124,8 @@ module LibItsDenm_TypesAndValues {
      ValidityDuration validityDuration optional,
      SituationContainer situation optional,
      LocationContainer location optional,
      RelevanceDistance relevanceDistance optional,
      RelevanceTrafficDirection relevanceTrafficDirection optional,
      StandardLength3b awarenessDistance optional,
      TrafficDirection trafficDirection optional,
      TransmissionInterval transmissionInterval optional,
      TransmissionInterval repetitionInterval optional,
      AlacarteContainer alacarte optional
Compare 0bf7b9ce to 005c8f71
Original line number Diff line number Diff line
Subproject commit 0bf7b9cecfcd4b903801d5fcd06c53a4c890af6b
Subproject commit 005c8f718b5d89dba026697e5794c858dad9de92
+3 −1
Original line number Diff line number Diff line
sources := LibItsDenm_EncdecDeclarations.ttcn  \
sources := \
  LibItsDenm_EncdecDeclarations.ttcn  \
  LibItsDenm_Pics.ttcn                         \
  LibItsDenm_Pixits.ttcn                       \
  LibItsDenm_Templates.ttcn                    \
  LibItsDenm_TypesAndValues.ttcn


modules := asn1
Loading