Mantis #6127: c_multipleMessagesCount (ffde45f0) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+19 −10

Original line number	Original line	Diff line number	Diff line
	@@ -520,7 +520,7 @@ module LibItsGeoNetworking_Functions {

	vc_neighbourDefault := activate(a_neighbourDefault());		vc_neighbourDefault := activate(a_neighbourDefault());
	f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));		f_acTriggerEvent(m_startBeaconing(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader));
	f_sleepIgnoreDef(5.0);//TODO maybe a module parameter: 1.0, 5.0 only for test		f_sleepIgnoreDef(PX_NEIGHBOUR_DISCOVERY_DELAY);
	} // end f_startBeingNeighbour		} // end f_startBeingNeighbour

	/**		/**
	@@ -1366,15 +1366,6 @@ module LibItsGeoNetworking_Functions {
	return v_timestamp;		return v_timestamp;
	}		}

	/**
	* @desc Creates an initial seqence number
	* @return Time based initial sequence number (increasing with time)
	*/
	function f_getInitialSequenceNumber() return UInt16 {

	return (f_computeGnTimestamp() / 1000) mod c_uInt16Max;
	}

	} // end commonFunctions		} // end commonFunctions

	group testerFunctions {		group testerFunctions {
	@@ -1427,6 +1418,24 @@ module LibItsGeoNetworking_Functions {
	vc_localSeqNumber := (vc_localSeqNumber + 1) mod c_uInt16Max;		vc_localSeqNumber := (vc_localSeqNumber + 1) mod c_uInt16Max;
	}		}

			/**
			* @desc Creates an initial seqence number
			* @return Time based initial sequence number (increasing with time)
			*/
			function f_getInitialSequenceNumber() return UInt16 {

			return (f_computeGnTimestamp() / 1000) mod c_uInt16Max;
			}

			/**
			* @desc Number of messages to be sent
			* @return Number of messages to be sent
			*/
			function f_getMessageCount() return integer {

			return PX_MESSAGE_COUNT;
			}

	} // end testerFunctions		} // end testerFunctions

	group iutFunctions {		group iutFunctions {

ttcn/GeoNetworking/LibItsGeoNetworking_Pixits.ttcn

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,20 @@ module LibItsGeoNetworking_Pixits {
	modulepar NextHeader PX_GN_UPPER_LAYER := e_any;		modulepar NextHeader PX_GN_UPPER_LAYER := e_any;
	}		}

			group parametrisation {

			/**
			* @desc Number of messages to be sent
			*/
			modulepar integer PX_MESSAGE_COUNT := 5;

			/**
			* @desc Time necessary for IUT to detect neighbours
			*/
			modulepar float PX_NEIGHBOUR_DISCOVERY_DELAY := 1.0

			}

	} // end geoNetworkingPixits		} // end geoNetworkingPixits

	} // end LibItsGeoNetworking_Pixits		} // end LibItsGeoNetworking_Pixits

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,7 @@ module LibItsGeoNetworking_TestSystem {
	var GeoAreaTable vc_areaTable := {};		var GeoAreaTable vc_areaTable := {};
	var charstring vc_componentName := "";		var charstring vc_componentName := "";
	var default vc_neighbourDefault;		var default vc_neighbourDefault;
			var integer vc_multipleMessagesCount := f_getMessageCount();

	} // End of component ItsGeoNetworking		} // End of component ItsGeoNetworking

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,6 @@ module LibItsGeoNetworking_TypesAndValues {

	group geoTestingConstants {		group geoTestingConstants {

	const integer c_multipleMessagesCount := 5;
	const UInt6 c_defaultLifetime := 10; // in seconds		const UInt6 c_defaultLifetime := 10; // in seconds

	} // end geoTestingConstants		} // end geoTestingConstants

Admin message