Taken latest changes from ITS CMS4. (0203c19d) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,9 @@ module LibItsCam_Functions {
		[] utPort.receive(UtChangePositionResult:?) {
		tc_wait.stop;
		}
		[] utPort.receive {
		tc_wait.stop;
		}
		[] tc_wait.timeout {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);

ttcn/CAM/LibItsCam_Templates.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ module LibItsCam_Templates {
		* @desc Change the speed
		* @param p_offset The speed value offset
		*/
		template (value) UtCamTrigger m_changeSpeed(SpeedValue p_changeSpeed) := {
		template (value) UtCamTrigger m_changeSpeed(Int16 p_changeSpeed) := {
		changeSpeed := p_changeSpeed
		}

		@@ -202,8 +202,8 @@ module LibItsCam_Templates {
		*/
		template (present) CAM mw_camMsg_any := {
		header := {
		protocolVersion := 1,
		messageID := 2,
		protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
		messageID := ItsPduHeader_messageID_cam_,
		stationID := ?
		},
		cam := {
		@@ -526,8 +526,8 @@ module LibItsCam_Templates {
		template (value) ReferencePosition p_referencePosition
		) := {
		header := {
		protocolVersion := 1,
		messageID := 2,
		protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
		messageID := ItsPduHeader_messageID_cam_,
		stationID := p_stationId
		},
		cam := {

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ module LibItsCam_TypesAndValues {
		*/
		type union UtCamTrigger {
		CurvatureValue changeCurvature,
		SpeedValue changeSpeed,
		Int16 changeSpeed,
		AccelerationControl setAccelerationControlStatus,
		ExteriorLights setExteriorLightsStatus,
		HeadingValue changeHeading,

ttcn/DENM/LibItsDenm_Templates.ttcn

+8 −8

Original line number	Diff line number	Diff line
		@@ -255,8 +255,8 @@ module LibItsDenm_Templates {
		template (present) DENM mw_denmPdu(
		template (present) DecentralizedEnvironmentalNotificationMessage p_denm,
		template (present) StationID p_stationID := ?,
		template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
		template (present) ItsPduHeader.messageID p_messageID := c_messageId
		template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
		template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
		) := {
		header := mw_itsPduHeader(p_stationID, p_protocolVersion, p_messageID),
		denm := p_denm
		@@ -274,8 +274,8 @@ module LibItsDenm_Templates {
		*/
		template (value) ItsPduHeader m_itsPduHeader(
		template (value) StationID p_stationID := f_getTsStationId(),
		template (value) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
		template (value) ItsPduHeader.messageID p_messageID := c_messageId
		template (value) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
		template (value) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
		) := {
		protocolVersion := p_protocolVersion,
		messageID := p_messageID,
		@@ -290,8 +290,8 @@ module LibItsDenm_Templates {
		*/
		template ItsPduHeader mw_itsPduHeader(
		template (present) StationID p_stationID := ?,
		template (present) ItsPduHeader.protocolVersion p_protocolVersion := c_protocolVersionDenm,
		template (present) ItsPduHeader.messageID p_messageID := c_messageId
		template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
		template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_denm_
		) := {
		protocolVersion := p_protocolVersion,
		messageID := p_messageID,
		@@ -447,7 +447,7 @@ module LibItsDenm_Templates {
		template (value) ManagementContainer m_denmMgmtCon(
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (value) ValidityDuration p_validityDuration := defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		template (value) TimestampIts p_referenceTime := f_getCurrentTime()
		@@ -477,7 +477,7 @@ module LibItsDenm_Templates {
		template (value) ManagementContainer m_denmMgmtConTermination (
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (value) ValidityDuration p_validityDuration := defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		template (value) TimestampIts p_referenceTime := f_getCurrentTime(),

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+0 −6

Original line number	Diff line number	Diff line
		@@ -38,16 +38,10 @@ module LibItsDenm_TypesAndValues {

		group denmConstants {

		const ItsPduHeader.protocolVersion c_protocolVersionDenm := 1;

		const ItsPduHeader.messageID c_messageId := 1;

		const ValidityDuration c_duration_2sec := 2;
		const ValidityDuration c_duration_5sec := 5;
		const ValidityDuration c_duration_10sec := 10;

		const ValidityDuration c_defaultValidity := 600;

		const TransmissionInterval c_interval_1sec := 1000;
		const TransmissionInterval c_interval_2sec := 2000;
		const TransmissionInterval c_interval_4sec := 4000;