Commit bc8af424 authored by petersenj's avatar petersenj
Browse files

Some TODOs removed, and some validation code made...

parent 0dedeaf9

ttcn/dPMR_Pixits.ttcn

+9 −10
Original line number Diff line number Diff line
@@ -45,12 +45,11 @@ module dPMR_Pixits { 
		/**

		* @desc T1 data for frame 1, 2, 3 and 4, must be chosen 

		* 		

		* @remark TODO 

		*/

		modulepar {Payload PXT_DATA_T1_F1}//modulepar {T1Payload PXT_DATA_T1_F1}

		modulepar {Payload PXT_DATA_T1_F2}

		modulepar {Payload PXT_DATA_T1_F3}

		modulepar {Payload PXT_DATA_T1_F4}

		modulepar {Payload PXT_DATA_T1_F1 := {'090807060504030201'O, '090807060504030201'O, '090807060504030201'O, '090807060504030201'O}}

		modulepar {Payload PXT_DATA_T1_F2 := {'090807060504030201'O, '090807060504030201'O, '090807060504030201'O, '090807060504030201'O}}

		modulepar {Payload PXT_DATA_T1_F3 := {'090807060504030201'O, '090807060504030201'O, '090807060504030201'O, '090807060504030201'O}}

		modulepar {Payload PXT_DATA_T1_F4 := {'090807060504030201'O, '090807060504030201'O, '090807060504030201'O, '090807060504030201'O}}



		/**

		* @desc 	Data Length in Slow Data Field.
@@ -59,10 +58,10 @@ module dPMR_Pixits { 
		* 	

		* @remark 	see clause clause 5.9.2

		*/

		modulepar {DataLength PXT_DATA_T1_F1_length}

		modulepar {DataLength PXT_DATA_T1_F2_length}

		modulepar {DataLength PXT_DATA_T1_F3_length}

		modulepar {DataLength PXT_DATA_T1_F4_length}

		modulepar {DataLength PXT_DATA_T1_F1_length := '100100'B}

		modulepar {DataLength PXT_DATA_T1_F2_length := '100100'B}

		modulepar {DataLength PXT_DATA_T1_F3_length := '100100'B}

		modulepar {DataLength PXT_DATA_T1_F4_length := '100100'B}



		/**

		* @desc 	Preset Slow Data.
@@ -145,7 +144,7 @@ module dPMR_Pixits { 
	

	group additional {

		

		modulepar {boolean PXT_DEBUG := true;}

		modulepar {boolean PXT_DEBUG := true}

	

	}//end additional

	group ValidationGroup {

ttcn/dPMR_TestCases.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -7457,14 +7457,14 @@ module dPMR_TestCases { 
			//Test Body

			tc_ac.start ;

			alt {

			[] dp1Port.receive(	m_headerFrame(

			[] dp1Port.receive(	mw_plt_val(m_headerFrame(

									m_headerInformation(

										e_commStartHeader,

										vc_mse.testerId, 

										vc_mse.iutId,

										e_dataT1, // this is '010b' as in TP

										e_p2p),

									vc_mse.colourCode))

									vc_mse.colourCode),?,?))

				{

					// received correctly

					tc_ac.stop ;
@@ -8501,8 +8501,8 @@ module dPMR_TestCases { 
									m_headerFrame(	

										m_headerInformation(

											e_commStartHeader, 

											vc_mse.iutId, 

											vc_mse.testerId, 

											vc_mse.iutId, 

											e_dataT1, 

											e_p2p),

										vc_mse.colourCode),

ttcn/dPMR_Types.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module dPMR_Types { 
	// ------------ Information elements ---------------





	//// This needs to be declared in "LibCommon_DataStrings.ttcn" ????????????????

	//// TODO This needs to be declared in "LibCommon_DataStrings.ttcn" ????????????????

	type bitstring  Bit72   length(72) with {encode "length(72)"};

	

	group FrameCodingTypes {