Commit 5b2096a1 authored by petersenj's avatar petersenj
Browse files

Changed Pixits to reflect execution environment 

Changed Types to use Oct strings for ColourCodes
Started change of TestExecution
parent 784b8a81

ttcn/dPMR_Pixits.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ module dPMR_Pixits { 


	// @desc: Colour Code (Channel) to be used in test case, must be chosen 

	// in the correct range (Group A or B) dependent on if IUT is an ISF or CSF radio.

	modulepar {ColourCode PXT_SELECTED_COLOURCODE := c_grpAcf1 }

	modulepar {ISFColourcode PXT_SELECTED_ISF_COLOURCODE  }

	modulepar {CSFColourcode PXT_SELECTED_CSF_COLOURCODE  }

ttcn/dPMR_TestExecution.ttcn

+9 −1
Original line number Diff line number Diff line
@@ -16,7 +16,15 @@ module dPMR_TestExecution { 


 	control{



		execute(TC_PMR_0406_01( PXT_SELECTED_COLOURCODE ) ); 

		

//		if (PIC_ISF) {

//			execute(TC_PMR_0824_01( PXT_SELECTED_ISF_COLOURCODE ) );

//		}





//		if (PIC_CSF) {

			execute(TC_PMR_0406_01( {csfColourCode := PXT_SELECTED_CSF_COLOURCODE} ) ); 

//		}





	} // end control

ttcn/dPMR_Types.ttcn

+40 −1
Original line number Diff line number Diff line
@@ -345,11 +345,50 @@ type Bit48 FrameSync48; 


// 6.1.5  Coulour code



type Bit24 ColourCode;









type Oct3 ISFColourcode ('577577'O,

                         '57F775'O,

                         '55577D'O,

                         '557D7D'O,

                         '55D57F'O,

                         '55FF7F'O,

                         '5F555F'O,

                         '5F7F5F'O,

                         '5FD75D'O,

                         '5FFD5D'O,

                         '5D5D55'O,

                         '5D7755'O,

                         '5DDF57'O,

                         '5DF557'O,

                         '775DD7'O

);





type Oct3 CSFColourcode('F75757'O,

                        'F77D57'O,

                        'F7D555'O,

                        'F7FF55'O,

                        'F55F5D'O,

                        'F5755D'O,

                        'F5DD5F'O,

                        'F5F75F'O,

                        'FF5D7F'O,

                        'FF777F'O,

                        'FFDF7D'O,

                        'FFF57D'O,

                        'FD5575'O,

                        'FD7F75'O,

                        'FDD777'O,

                        'FDFD77'O

);



type union  ColourCode {

	ISFColourcode isfColourCode,

	CSFColourcode csfColourCode

}



// 8.3.3 Packet frame coding

ttcn/dPMR_Values.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ const FrameSync48 c_fs4 := '111111010101010111110101110111110111111111011101'B; 
// 6.1.5 Colour code values



// Group A channel values

/*

const ColourCode c_grpAcf1  := '010101110111010101110111'B;

const ColourCode c_grpAcf2  := '010101111101110101110101'B;

const ColourCode c_grpAcf3  := '010101111111011101110101'B;
@@ -56,7 +57,7 @@ const ColourCode c_grpBcf13 := '111111010101010101110101'B; 
const ColourCode c_grpBcf14 := '111111010111111101110101'B;

const ColourCode c_grpBcf15 := '111111011101011101110111'B;

const ColourCode c_grpBcf16 := '111111011111110101110111'B;



*/

// 6.1.6 Preamble



const Preamble c_preamble := hex2bit('5F5F5F5F5F5F5F5F5F'H);