Many changes due to ASN.1 modification (87bb2b52) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

+25 −1

Original line number	Diff line number	Diff line
		@@ -349,6 +349,30 @@ module LibItsDenm_Functions {

		group getFunctions {

		group iutGetFunctions {



		} // end iutGetFunctions

		group testerGetFunctions {

		/**
		* @desc Gets the station identifier of IUT.
		* @return
		*/
		function f_getIutDefaultEventDuration() return TimeStamp {
		var TimeStamp v_iutDefaultEventDuration;

		//TODO get the value from PIXIT or MIB

		return v_iutDefaultEventDuration;
		}

		} // end testerGetFunctions

		// TODO: Clean up

		/**
		* @desc Gets the station identifier of IUT.
		* @return
		@@ -380,7 +404,7 @@ module LibItsDenm_Functions {
		function f_getCurrentTime() return TimeStamp {
		var TimeStamp v_timeStamp;

		//TODO get the value from PIXIT or ...
		//TODO get the value from xf ...

		return v_timeStamp;
		}

ttcn/DENM/LibItsDenm_Templates.ttcn

+9 −6

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@ module LibItsDenm_Templates {
		template (value) DecentralizedSituation p_sit,
		template (value) DecentralizedSituationLocation p_loc
		) := {
		protocolVersion := c_protocolVersion_DENM,
		messageID := c_messageId,
		generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
		management := p_mgmt,
		situation := p_sit,
		location := p_loc
		@@ -46,6 +49,9 @@ module LibItsDenm_Templates {
		template (present) DecentralizedSituation p_sit,
		template (present) DecentralizedSituationLocation p_loc
		) := {
		protocolVersion := c_protocolVersion_DENM,
		messageID := c_messageId,
		generationTime := ?,
		management := p_mgmt,
		situation := p_sit,
		location := p_loc
		@@ -57,6 +63,9 @@ module LibItsDenm_Templates {
		template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
		template (value) StationID p_stationId
		) := {
		protocolVersion := c_protocolVersion_DENM,
		messageID := c_messageId,
		generationTime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
		management := m_denmMgmtCon(p_dataVersion, p_stationId),
		situation := m_denmSitCon(p_sit, informative),
		location := m_denmSitLoc(
		@@ -82,9 +91,6 @@ module LibItsDenm_Templates {
		template (value) DataVersion p_dataVersion,
		template (value) StationID p_stationId
		) := {
		protocolVersion := c_protocolVersion_DENM,
		messageID := c_messageId,
		generationtime := 0, //TODO document: 0 indicates that the lower layer should add the time while sending
		actionID := {
		stationID := p_stationId,
		sequenceNo := 0
		@@ -99,9 +105,6 @@ module LibItsDenm_Templates {
		template DecentralizedSituationManagement mw_denmMgmtCon (
		template (present) DataVersion p_dataVersion
		):= {
		protocolVersion := c_protocolVersion_DENM,
		messageID := c_messageId,
		generationtime := ?,
		actionID := {
		stationID := ?,
		sequenceNo := ?

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+19 −18

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ module LibItsDenm_TypesAndValues {

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

		group actionTypes {

		@@ -21,10 +22,10 @@ module LibItsDenm_TypesAndValues {

		group denmConstants {

		const DecentralizedSituationManagement.protocolVersion c_protocolVersion_DENM := 0;
		const DecentralizedEnvironmentalNotificationMessage.protocolVersion c_protocolVersion_DENM := 0;

		//TODO check which value or value handling should be applied
		const MessageID c_messageId := 0;
		const DecentralizedEnvironmentalNotificationMessage.messageID c_messageId := 0;

		const DataVersion c_dataVersionCancellation := 255;

		@@ -43,22 +44,22 @@ module LibItsDenm_TypesAndValues {
		group causeCodes {

		//TODO check this values for final release
		const CauseCode c_causeReserved := 0;
		const CauseCode c_causeTrafficJam := 1;
		const CauseCode c_causeAccident := 2;
		const CauseCode c_causeRoadWork := 3;
		const CauseCode c_causeHazardousDrivingCondition := 25;
		const CauseCode c_causeWrongWayDriving := 35;
		const CauseCode c_causeRescueOnTheWay := 36;
		const CauseCode c_causeExtremWeatherCondition := 42;
		const CauseCode c_causeVisibilityReduced := 43;
		const CauseCode c_causePrecipitation := 45;
		const CauseCode c_causeSlowVehicle := 62;
		const CauseCode c_causeDangerousDriving := 101;
		const CauseCode c_causeIntersectionViolation := 102;
		const CauseCode c_causeVehicleProblem := 103;
		const CauseCode c_causeIntersectionCollision := 104;
		const CauseCode c_causeHazardousLocation := 105;
		const DENM_PDU_Descriptions.CauseCode c_causeReserved := 0;
		const DENM_PDU_Descriptions.CauseCode c_causeTrafficJam := 1;
		const DENM_PDU_Descriptions.CauseCode c_causeAccident := 2;
		const DENM_PDU_Descriptions.CauseCode c_causeRoadWork := 3;
		const DENM_PDU_Descriptions.CauseCode c_causeHazardousDrivingCondition := 25;
		const DENM_PDU_Descriptions.CauseCode c_causeWrongWayDriving := 35;
		const DENM_PDU_Descriptions.CauseCode c_causeRescueOnTheWay := 36;
		const DENM_PDU_Descriptions.CauseCode c_causeExtremWeatherCondition := 42;
		const DENM_PDU_Descriptions.CauseCode c_causeVisibilityReduced := 43;
		const DENM_PDU_Descriptions.CauseCode c_causePrecipitation := 45;
		const DENM_PDU_Descriptions.CauseCode c_causeSlowVehicle := 62;
		const DENM_PDU_Descriptions.CauseCode c_causeDangerousDriving := 101;
		const DENM_PDU_Descriptions.CauseCode c_causeIntersectionViolation := 102;
		const DENM_PDU_Descriptions.CauseCode c_causeVehicleProblem := 103;
		const DENM_PDU_Descriptions.CauseCode c_causeIntersectionCollision := 104;
		const DENM_PDU_Descriptions.CauseCode c_causeHazardousLocation := 105;

		} // end group causeCodes

Admin message