Misc changes in CAM (86f7bc1e) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+21 −27

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ module LibItsCam_Functions {
	// basic default altstep		// basic default altstep
	activate(a_basicDefault());		activate(a_basicDefault());

	f_utInitialzeIUT();		f_utInitializeIut();

	} // end f_prInitialState		} // end f_prInitialState

	@@ -108,7 +108,7 @@ module LibItsCam_Functions {
	* @desc Requests to bring the IUT in an initial state		* @desc Requests to bring the IUT in an initial state
	* @return		* @return
	*/		*/
	function f_utInitialzeIUT() runs on ItsNt {		function f_utInitializeIut() runs on ItsFa {

	utPort.send(UtCamInitialize:{});		utPort.send(UtCamInitialize:{});
	tc_ac.start;		tc_ac.start;
	@@ -173,49 +173,43 @@ module LibItsCam_Functions {

	} // end group upperTester		} // end group upperTester

	group externalFunctions {		group getIutFunctions {

	/**		/**
	* @desc function to get the PT Line Description		* @desc function to get the PT Line Description
	* currently return the PIXIT value		* currently return the PIXIT value
	* @see PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE		* @see PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE
	*		*
	*/		*/
	function f_getPtLineDescription()		function f_getIutPtLineDescription()
	return PTLineDescription {		return PTLineDescription {
	//Variables
	var PTLineDescription v_ptLineDescription := { "a", "b", "c" };

	v_ptLineDescription := { PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE }; // PIXIT used!		var PTLineDescription v_ptLineDescription := {"", "", ""};
	log("* f_getPtLineDescription: INFO: OK *");
			v_ptLineDescription := {PX_PTLINE_COURSE, PX_PTLINE_REF, PX_PTLINE_ROUTE};

	return v_ptLineDescription ;		return v_ptLineDescription ;

	} // end function f_getPtLineDescription		} // end function f_getIutPtLineDescription

	/**		} // end getIutFunctions
	* @desc get the stationCharacteristics of the tester
	* @return CoopAwareness.stationCharacteristics<br>
	*/
	external function fx_getStationCharacteristics()
	return CoopAwareness.stationCharacteristics;

			group getTesterFunctions {
	/**		/**
	* @desc Wrapper function for fx_getStationCharacteristics		* @desc Gets tester's station characteristics
	*		* @return Station characteristics
	* @see fx_getStationCharacteristics		* @see PXT_TESTER_IS_MOBILE, PXT_TESTER_IS_PRIVATE, PXT_TESTER_IS_PHYSICAL_RELEVANT
	*
	*/		*/
	function f_getStationCharacteristics()		function f_getTesterStationCharacteristics()
	return CoopAwareness.stationCharacteristics {		return CoopAwareness.stationCharacteristics {
	//Variables
	var CoopAwareness.stationCharacteristics v_stationCharacteristics := { true, true, true };		var CoopAwareness.stationCharacteristics v_stationCharacteristics := { true, true, true };

	v_stationCharacteristics := fx_getStationCharacteristics();		v_stationCharacteristics := {PXT_TESTER_IS_MOBILE, PXT_TESTER_IS_PRIVATE, PXT_TESTER_IS_PHYSICAL_RELEVANT};
	log("* f_getStationCharacteristics: INFO: OK - stationCharacteristics received *");
	return v_stationCharacteristics ;		return v_stationCharacteristics ;

	} // end function f_getStationCharacteristics		} // end f_getTesterStationCharacteristics

	} // end group externalFunctions		} // end getTesterFunctions

	} // end LibItsCam_Functions		} // end LibItsCam_Functions
			No newline at end of file

ttcn/CAM/LibItsCam_Pixits.ttcn

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -15,34 +15,34 @@ module LibItsCam_Pixits {
	group camPixits {		group camPixits {

	/**		/**
	* @desc Tester longitude reference position		* @desc IUT Course of Journey (PT Line Description)
	*/		*/
	modulepar Longitude PX_LONGITUDE;		modulepar CourseOfJourney PX_PTLINE_COURSE;

	/**		/**
	* @desc Tester latitude reference position		* @desc IUT Line Reference (PT Line Description)
	*/		*/
	modulepar Latitude PX_LATITUDE;		modulepar LineRef PX_PTLINE_REF;

	/**		/**
	* @desc Tester elevation reference position		* @desc IUT Route Reference (PT Line Description)
	*/		*/
	modulepar Elevation PX_ELEVATION;		modulepar RouteRef PX_PTLINE_ROUTE;

	/**		/**
	* @desc IUT Course of Journey (PT Line Description)		* @desc Determines whether Tester is a mobile ITS station
	*/		*/
	modulepar CourseOfJourney PX_PTLINE_COURSE;		modulepar boolean PXT_TESTER_IS_MOBILE := true;

	/**		/**
	* @desc IUT Line Reference (PT Line Description)		* @desc Determines whether Tester is a private ITS station
	*/		*/
	modulepar LineRef PX_PTLINE_REF;		modulepar boolean PXT_TESTER_IS_PRIVATE := true;

	/**		/**
	* @desc IUT Route Reference (PT Line Description)		* @desc Determines whether Tester is a physically relevant ITS station
	*/		*/
	modulepar RouteRef PX_PTLINE_ROUTE;		modulepar boolean PXT_TESTER_IS_PHYSICAL_RELEVANT := true;


	} // end of group cam_Pixits		} // end of group cam_Pixits

ttcn/LibIts_Interface.ttcn

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,9 +17,8 @@ module LibIts_Interface {
	import from LibItsDenm_TypesAndValues all;		import from LibItsDenm_TypesAndValues all;
	import from LibItsGeoNetworking_TypesAndValues all;		import from LibItsGeoNetworking_TypesAndValues all;

	import from LibCommon_BasicTypesAndValues all;

	// LibCommon		// LibCommon
			import from LibCommon_BasicTypesAndValues all;
	import from LibCommon_Time {modulepar all;}		import from LibCommon_Time {modulepar all;}
	import from LibCommon_Sync all;		import from LibCommon_Sync all;

Admin message