Commit b051e978 authored by petersenj's avatar petersenj
Browse files

added Priority, and cleaned up unnecessary templates

parent ed65b8fe

ttcn/dPMR_Templates.ttcn

+11 −11
Original line number Diff line number Diff line
@@ -376,17 +376,17 @@ 
		} // end template m_endInformationNoAck





		template EndFrame m_endFrameAck := {

			frameSync3 := c_fs3,

			endInformation0 := m_endInformationAck,

			endInformation1 := m_endInformationAck

		} // end template m_endFrameAck



		template EndFrame m_endFrameNoAck := {

			frameSync3 := c_fs3,

			endInformation0 := m_endInformationNoAck,

			endInformation1 := m_endInformationNoAck

		} // end template m_endFrameNoAck

//		template EndFrame m_endFrameAck := {

//			frameSync3 := c_fs3,

//			endInformation0 := m_endInformationAck,

//			endInformation1 := m_endInformationAck

//		} // end template m_endFrameAck



//		template EndFrame m_endFrameNoAck := {

//			frameSync3 := c_fs3,

//			endInformation0 := m_endInformationNoAck,

//			endInformation1 := m_endInformationNoAck

//		} // end template m_endFrameNoAck



		template EndFrame m_endFrame ( in template EndInformation p_endInfo ) := {

			frameSync3 := c_fs3,

ttcn/dPMR_TestCases.ttcn

+30 −7
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ module dPMR_TestCases { 
			/**

			* @param p_cc The colour code (channel) used

			*/

//**************************************** TBD

//*

			testcase TC_PMR_0407_02( ColourCode p_cc  )

			runs on ServerSyncComp

			system TestAdapter {
@@ -259,9 +257,33 @@ module dPMR_TestCases { 


				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

//****************************************

			} // end TC_PMR_0406_01



			/**

			* @param p_cc The colour code (channel) used

			*/

			testcase TC_PMR_0811_01( ColourCode p_cc  )

			runs on ServerSyncComp

			system TestAdapter {

		      	var Mse v_mse;

				var Ut v_ut;

				var FncRetCode v_ret := e_success;



				//Configuration Up

				f_cfMseUp(v_mse, v_ut);



				//Test body  

				v_mse.start(f_TC_voiceTx_MS01(p_cc));

				v_ut.start(f_TC_msPressPttThenDekeyPtt_UT(p_cc));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_0811_01

			



			group SuperFrame {



				group Voice {
@@ -338,7 +360,7 @@ module dPMR_TestCases { 
										m_frame4AudibleTestTone(vc_mse.testerIdLP, PXT_VOICE_TEST_TONE_F4, p_cc)

									)

								),

								m_endFrameNoAck) 

								m_endFrame(m_endInformationNoAck))

						);

			f_clientSyncAndVerdict(c_tbDone, v_ret);
@@ -384,7 +406,7 @@ module dPMR_TestCases { 
										m_frame4AudibleTestTone(vc_mse.testerIdLP, PXT_VOICE_TEST_TONE_F4, p_cc)

									)

								),

								m_endFrameNoAck)

								m_endFrame(m_endInformationNoAck))

						);

			f_clientSyncAndVerdict(c_tbDone, v_ret);
@@ -419,7 +441,7 @@ module dPMR_TestCases { 
							m_headerFrame(

								m_headerInformation(e_connReqHeader, vc_mse.iutId, vc_mse.testerId, e_voice, e_p2p),

								p_cc),

							m_endFrameAck)

							m_endFrame(m_endInformationAck))

						);

			alt {

				[] dp1Port.receive(m_acknowledgement(
@@ -500,7 +522,7 @@ module dPMR_TestCases { 
																			e_shortFileTransfer,

																			e_finishAfterFrame,

																			PXT_DATA_T1_F4_length)))),

								m_endFrameAck));

										m_endFrame(m_endInformationNoAck)));



			alt {

				[] dp1Port.receive(m_acknowledgement(
@@ -580,6 +602,7 @@ module dPMR_TestCases { 


		} // end function f_TC_voiceTx_MS01





		/**

		* @desc	Check that a voice transmission from the MS (IUT) consists of a Header Frame, a list of

		*       Super Frames, and an End Frame,

ttcn/dPMR_Types.ttcn

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,15 @@ module dPMR_Types { 
		  e_other     (4)

		} with {encode "4 bits"}



		// 5.X Priority Format // TODO get definition when included in standard!



		type enumerated PriorityFormat { // 2 bits

			e_priority1 (0),

			e_priority2 (1),

			e_priority3 (2),

			e_priority4 (3)

		} with {encode "2 bits"}





		// 5.9 SLD format