Merged revision(s) 960-1043 from trunk (913db53d) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+17 −0

Original line number	Diff line number	Diff line
		@@ -247,4 +247,21 @@ module LibItsCam_Functions {

		} // end group camPositionFunctions

		group camGenerators {
		function f_generateDefaultCam()
		return octetstring {
		return bit2oct(
		encvalue(
		m_camReq(
		m_camMsg_vehicle(
		f_getTsStationId(),
		f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
		m_tsPosition
		)
		)
		)
		);
		}
		} // end of group camGenerators

		} // end LibItsCam_Functions
		No newline at end of file

ttcn/CAM/LibItsCam_Templates.ttcn

+29 −7

Original line number	Diff line number	Diff line
		@@ -8,13 +8,17 @@
		module LibItsCam_Templates {

		// LibIts
		import from ITS_Container language "ASN.1:1997" all;
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		// LibItsCommon
		import from LibItsCommon_Functions all;
		import from LibItsCommon_TypesAndValues all;

		// LibItsCam
		import from LibItsCam_TestSystem all;
		import from LibItsCam_TypesAndValues all;
		import from ITS_Container language "ASN.1:1997" all;
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		group camPrimitives {

		@@ -466,7 +470,7 @@ module LibItsCam_Templates {
		* @param p_generationTime Timestamp of the generated message
		* @param p_referencePosition Position of the sending station
		*/
		template (value) CAM m_camMsg_vehicle(
		template (value) CAM m_camMsg_vehicle_HF_BV(
		StationID p_stationId,
		GenerationDeltaTime p_generationTime,
		template (value) ReferencePosition p_referencePosition
		@@ -521,14 +525,32 @@ module LibItsCam_Templates {
		cenDsrcTollingZone := omit
		}
		},
		lowFrequencyContainer := omit,
		specialVehicleContainer := omit
		}
		}
		}; // End of template m_camMsg_vehicle_HF_BV

		/**
		* @desc Send template for Vehicle CAM PDU
		* @param p_stationId Station ID of the source
		* @param p_generationTime Timestamp of the generated message
		* @param p_referencePosition Position of the sending station
		*/
		template (value) CAM m_camMsg_vehicle(
		StationID p_stationId,
		GenerationDeltaTime p_generationTime,
		template (value) ReferencePosition p_referencePosition
		) modifies m_camMsg_vehicle_HF_BV := {
		cam := {
		camParameters := {
		lowFrequencyContainer := {
		basicVehicleContainerLowFrequency := {
		vehicleRole := default_,
		exteriorLights := c_exteriorLights_daytimeRunningLightsOn,
		pathHistory := {}
		}
		},
		specialVehicleContainer := omit
		}
		}
		}
		};

ttcn/CAM/LibItsCam_TestSystem.ttcn

+10 −7

Original line number	Diff line number	Diff line
		@@ -12,12 +12,15 @@ module LibItsCam_TestSystem {
		import from LibCommon_Sync all;

		// LibIts
		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		// LibItsCommon
		import from LibItsCommon_TestSystem all;
		import from LibItsCommon_TypesAndValues all;
		import from LibItsCam_TypesAndValues all;

		import from CAM_PDU_Descriptions language "ASN.1:1997" all;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;
		// LibItsCam
		import from LibItsCam_TypesAndValues all;

		group portDefinitions {

ttcn/Common/LibItsCommon_Functions.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ module LibItsCommon_Functions {
		function f_getCurrentTime() return TimestampIts {
		var TimestampIts v_timeStamp := 0;

		log("* f_getCurrentTime: INFO: calling fx_getCurrentTime() *");
		// log("* f_getCurrentTime: INFO: calling fx_getCurrentTime() *");
		v_timeStamp := fx_getCurrentTime();

		return v_timeStamp;
		@@ -153,7 +153,7 @@ module LibItsCommon_Functions {

		/**
		* @desc This external function gets the current time
		* @return Timestamp - current time in Epoch format
		* @return Timestamp - current time since 01/01/2014 in milliseconds
		*/
		external function fx_getCurrentTime() return TimestampIts;

ttcn/DENM/LibItsDenm_Functions.ttcn

+5 −2

Original line number	Diff line number	Diff line
		@@ -12,14 +12,17 @@ module LibItsDenm_Functions {
		import from LibCommon_VerdictControl all;
		import from LibCommon_Time { modulepar PX_TNOAC ; function f_sleep };

		// LibIts
		// LibItsCommon
		import from LibItsCommon_TypesAndValues all;
		import from LibItsCommon_Functions all;

		// LibIts
		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;
		import from DENM_PDU_Descriptions language "ASN.1:1997" all;

		group utFuntions {