DENM CAM update with new ASN 1 (080945ae) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Templates.ttcn

+5 −7

Original line number	Diff line number	Diff line
		@@ -149,10 +149,7 @@ module LibItsCam_Templates {
		positionConfidenceEllipse := {
		semiMajorConfidence := c_semiAxisLengthOneCentimeter,
		semiMinorConfidence := c_semiAxisLengthOneCentimeter,
		semiMajorOrientation := {
		headingValue := c_headingValue_wgs84North,
		headingConfidence := 10
		}
		semiMajorOrientation := c_headingValue_wgs84North
		},
		altitude := {
		altitudeValue := c_altitudeValue_seaLevel,
		@@ -240,11 +237,12 @@ module LibItsCam_Templates {
		curvatureCalculationMode := ?,
		yawRate := ?,
		accelerationControl := *,
		laneNumber := *,
		lanePosition := *,
		steeringWheelAngle := *,
		lateralAcceleration := *,
		verticalAcceleration := *,
		performanceClass := *
		performanceClass := *,
		cenDsrcTollingZone := *
		}

		/**
		@@ -531,7 +529,7 @@ module LibItsCam_Templates {
		yawRateConfidence := unavailable
		},
		accelerationControl := omit,
		laneNumber := omit,
		lanePosition := omit,
		steeringWheelAngle := omit,
		lateralAcceleration := omit,
		verticalAcceleration := omit,

ttcn/DENM/LibItsDenm_Functions.ttcn

+4 −7

Original line number	Diff line number	Diff line
		@@ -10,17 +10,16 @@ module LibItsDenm_Functions {
		// LibCommon
		import from LibCommon_Sync all;
		import from LibCommon_VerdictControl all;
		import from LibCommon_Time {
		modulepar PX_TNOAC;
		function f_sleep
		};
		import from LibCommon_Time { modulepar PX_TNOAC ; function f_sleep };

		// LibIts
		import from LibItsCommon_TypesAndValues all;
		import from LibItsCommon_Functions all;
		import from LibItsDenm_TestSystem all;
		import from LibItsDenm_TypesAndValues all;
		import from LibItsDenm_Templates all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		import from ITS_Container language "ASN.1:1997" all;

		group utFuntions {

		@@ -274,9 +273,7 @@ module LibItsDenm_Functions {
		var FncRetCode v_ret := e_success;

		if (valueof(p_trigger) == e_ets) {
		f_sendDenMessage(
		m_denmCancellation(p_actionId)
		);
		f_sendDenMessage( m_denmCancellation ( p_actionId , f_getTsStationId( ) ) );
		f_sleep(PX_TNOAC);
		}
		else {

ttcn/DENM/LibItsDenm_Templates.ttcn

+27 −35

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ module LibItsDenm_Templates {
		location := p_location,
		alacarte := p_alacarte,
		relevanceDistance := lessThan50m,
		relevanceTrafficDirection := allTrafficDirection,
		relevanceTrafficDirection := allTrafficDirections,
		trafficClass := 0,
		transmissionInterval := p_transmissionInterval,
		keepAliveForwardingRequest := p_keepAliveForwardingRequest
		@@ -283,27 +283,18 @@ module LibItsDenm_Templates {
		* @desc Send template for the position confidence
		* @param p_semiMajorConfidence The major confidence (Default: 1cm)
		* @param p_semiMinorConfidence The minor confidence (Default: 1cm)
		* @param p_semiMajorOrientation The major orientation (Default: m_direction)
		* @see m_direction
		* @param p_semiMajorOrientation The major orientation (Default: HeadingValue_wgs84North)
		*/
		template (value) PosConfidenceEllipse m_posConfidenceEllipse(
		template (value) SemiAxisLength p_semiMajorConfidence := c_semiAxisLengthOneCentimeter,
		template (value) SemiAxisLength p_semiMinorConfidence := c_semiAxisLengthOneCentimeter,
		template (value) Heading p_semiMajorOrientation := m_direction
		template (value) HeadingValue p_semiMajorOrientation := HeadingValue_wgs84North
		) := {
		semiMajorConfidence := p_semiMajorConfidence,
		semiMinorConfidence := p_semiMinorConfidence,
		semiMajorOrientation := p_semiMajorOrientation
		}

		/**
		* @desc Send template for north direction with 0.1 confidence
		*/
		template (value) Heading m_direction := {
		headingValue := HeadingValue_wgs84North,
		headingConfidence := HeadingConfidence_withinZeroPointOneDegree
		}

		/**
		* @desc Send template for altitude
		* @param p_altitudeValue The altitude (Default: Sea level)
		@@ -374,9 +365,10 @@ module LibItsDenm_Templates {
		* @param p_actionID The action id
		*/
		template (value) DecentralizedEnvironmentalNotificationMessage m_denmCancellation(
		template (value) ActionID p_actionID
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType
		) := {
		management := m_denmMgmtCon(p_actionID, -, true),
		management := m_denmMgmtCon(p_actionID, p_stationType, -, -),
		situation := omit,
		location := omit,
		alacarte := omit
		@@ -398,23 +390,23 @@ module LibItsDenm_Templates {
		*/
		template (value) ManagementContainer m_denmMgmtCon(
		template (value) ActionID p_actionID,
		template (value) boolean p_isNegation := false,
		template (value) boolean p_isCancellation := false,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (omit) ValidityDuration p_validityDuration := omit,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		template (value) TimestampIts p_referenceTime := f_getCurrentTime()
		template (value) TimestampIts p_referenceTime := f_getCurrentTime(),
		template (omit) Termination p_termination := omit
		) := {
		actionID := p_actionID,
		detectionTime := p_detectionTime,
		referenceTime := p_referenceTime,
		isNegation := p_isNegation,
		isCancellation := p_isCancellation,
		termination := p_termination,
		eventPosition := m_tsPosition,
		relevanceDistance := lessThan50m,
		relevanceTrafficDirection := allTrafficDirection,
		relevanceTrafficDirection := allTrafficDirections,
		validityDuration := p_validityDuration,
		transmissionInterval := p_transmissionInterval
		transmissionInterval := p_transmissionInterval,
		stationType := p_stationType
		}

		/**
		@@ -428,22 +420,22 @@ module LibItsDenm_Templates {
		*/
		template (present) ManagementContainer mw_denmMgmtCon(
		template (present) ActionID p_actionID,
		template (present) StationType p_stationType := f_getTsStationId(),
		template (present) TimestampIts p_referenceTime := ?,
		template (present) boolean p_isNegation := false,
		template (present) boolean p_isCancellation := false,
		template ValidityDuration p_validityDuration := *,
		template TransmissionInterval p_transmissionInterval := *
		template TransmissionInterval p_transmissionInterval := *,
		template Termination p_termination := *
		) := {
		actionID := p_actionID,
		detectionTime := ?,
		referenceTime := p_referenceTime,
		isNegation := p_isNegation,
		isCancellation := p_isCancellation,
		termination := p_termination,
		eventPosition := ?,
		relevanceDistance := ?,
		relevanceTrafficDirection := ?,
		validityDuration := p_validityDuration,
		transmissionInterval := p_transmissionInterval
		transmissionInterval := p_transmissionInterval,
		stationType := p_stationType
		}

		/**
		@@ -453,7 +445,7 @@ module LibItsDenm_Templates {
		template (value) ActionID m_tsActionId(
		template (value) SequenceNumber p_sequenceNumber := 0
		) := {
		originatorStationID := f_getTsStationId(),
		originatingStationID := f_getTsStationId(),
		sequenceNumber := p_sequenceNumber
		}

		@@ -464,13 +456,13 @@ module LibItsDenm_Templates {
		actionID := ?,
		detectionTime := ?,
		referenceTime := ?,
		isNegation := ?,
		isCancellation := ?,
		termination := ?,
		eventPosition := ?,
		relevanceDistance := ?,
		relevanceTrafficDirection := ?,
		validityDuration := *,
		transmissionInterval := *
		transmissionInterval := *,
		stationType := ?
		}

		/**
		@@ -502,7 +494,7 @@ module LibItsDenm_Templates {
		template (value) SequenceNumber p_sequenceNumber,
		template (value) ITS_Container.StationID p_originatorStationID := f_getIutStationId()
		) := {
		originatorStationID := p_originatorStationID,
		originatingStationID := p_originatorStationID,
		sequenceNumber := p_sequenceNumber
		}

		@@ -515,7 +507,7 @@ module LibItsDenm_Templates {
		template (present) ITS_Container.StationID p_originatorStationID := ?,
		template (present) SequenceNumber p_sequenceNumber := ?
		) := {
		originatorStationID := p_originatorStationID,
		originatingStationID := p_originatorStationID,
		sequenceNumber := p_sequenceNumber
		}

		@@ -631,7 +623,7 @@ module LibItsDenm_Templates {
		* @desc Send template for Alacarte Container including lane count
		*/
		template (value) AlacarteContainer m_alacarteConLaneCount := {
		laneNumber := 2,
		lanePosition := 0,
		impactReduction := omit,
		externalTemperature := omit,
		roadWorks := omit,