Updated TC 0406_02 (3e308abb) · Commits · DMR / dPMR

ttcn/dPMR_Pixits.ttcn

+5 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,11 @@ module dPMR_Pixits {
		modulepar {Payload PXT_DATA_T1_F2}
		modulepar {Payload PXT_DATA_T1_F3}
		modulepar {Payload PXT_DATA_T1_F4}

		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}
		} // end InputData

		group AddressesAndIdsUsed {

ttcn/dPMR_Templates.ttcn

+30 −56

Original line number	Diff line number	Diff line
		@@ -101,54 +101,72 @@
		payload := p_payload
		} // end tamplate m_frame4AudibleTestTone

		template SlowData m_slowDataT1Data (DataPosition p_dataPos,
		DataFormat p_dataFormat,
		ContFlag p_contFlag,
		DataLength p_dataLength) := {
		slowDataInDataT1OrT2 := {
		reserved5bit := '00000'B,
		dataPosition := p_dataPos,
		format := p_dataFormat,
		contFlag := p_contFlag,
		dataLength := p_dataLength
		}
		}

		template Frame1 m_frame1T1Data (CalledIdUP p_calledIdUP,
		Payload p_payload) := {
		Payload p_payload,
		in template SlowData p_slowData) := {
		frameSync := c_fs2,
		frameNumber := e_frame1,
		calledIdUP := p_calledIdUP,
		communicationsMode := e_dataT1,
		commsFormat := e_p2p,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		slowData := p_slowData,
		payload := p_payload
		} // end template m_frame1T1Data



		template Frame2 m_frame2T1Data (CalledIdLP p_calledIdLP,
		Payload p_payload, ColourCode p_cc) := {
		Payload p_payload, ColourCode p_cc,
		in template SlowData p_slowData) := {
		colourCode := p_cc,
		frameNumber := e_frame2,
		calledIdLP := p_calledIdLP,
		communicationsMode := e_dataT1,
		commsFormat := e_p2p,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		slowData := p_slowData,
		payload := p_payload
		} // end template m_frame2T1Data


		template Frame3 m_frame3T1Data (OwnIdUP p_ownIdUP,
		Payload p_payload) := {
		Payload p_payload,
		in template SlowData p_slowData) := {
		frameSync := c_fs2,
		frameNumber := e_frame3,
		ownIdUP := p_ownIdUP,
		communicationsMode := e_dataT1,
		commsFormat := e_p2p,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		slowData := p_slowData,
		payload := p_payload
		} // end template m_frame3T1Data


		template Frame4 m_frame4T1Data (OwnIdLP p_ownIdLP,
		Payload p_payload, ColourCode p_cc) := {
		Payload p_payload, ColourCode p_cc,
		in template SlowData p_slowData) := {
		colourCode := p_cc,
		frameNumber := e_frame4,
		ownIdLP := p_ownIdLP,
		communicationsMode := e_dataT1,
		commsFormat := e_p2p,
		reserved2bit := c_reserved2bits,
		slowData := c_slowDataInVoiceEmpty,
		slowData := p_slowData,
		payload := p_payload
		} // end tamplate m_frame4T1Data

		@@ -511,50 +529,6 @@
		utActParams := p_utActParameter
		}

		template UtRequest m_msMakeManualDisconnectionRequest_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialstr ,
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,
		utActParams := p_utActParameter
		}

		template UtRequest m_msVoiceWithAutomaticConnectionRequest_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialstr ,
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,
		utActParams := p_utActParameter
		}


		template UtRequest m_msCfgParamsCsfPoliteRx( ChannelNumber p_channelNumber, DialString p_dialstr ) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,
		utActParams := omit
		}



		//TODO JP is this used?
		template UtRequest m_msAct_utReq( ChannelNumber p_channelNumber) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		dialString := omit ,
		isfCidAddr := omit ,
		utActParams := e_pressPtt
		}

		} // end group ConfigurationTemplates

ttcn/dPMR_TestCases.ttcn

+27 −5

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ module dPMR_TestCases {
		f_clientSyncAndVerdict(c_prDone, v_ret);

		//Test Body
		tc_ac.start ; // TODO JP is it ok to use three sen instead of on embedded?
		tc_ac.start ;
		dp1Port.send( m_payloadTransmission(
		m_packetDataHeaderFrame(
		m_headerInformation(
		@@ -477,10 +477,32 @@ module dPMR_TestCases {
		p_cc),
		m_superFrameListWith4SuperFrames(
		m_superFrame(
		m_frame1T1Data(vc_mse.testerIdUP, PXT_DATA_T1_F1),
		m_frame2T1Data(vc_mse.testerIdLP, PXT_DATA_T1_F2, p_cc),
		m_frame3T1Data(vc_mse.iutIdUP, PXT_DATA_T1_F3),
		m_frame4T1Data(vc_mse.iutIdLP, PXT_DATA_T1_F4,p_cc))),
		m_frame1T1Data( vc_mse.testerIdUP,
		PXT_DATA_T1_F1,
		m_slowDataT1Data( e_DataInFrame,
		e_shortFileTransfer,
		e_continueAfterFrame,
		PXT_DATA_T1_F1_length)),
		m_frame2T1Data( vc_mse.testerIdLP,
		PXT_DATA_T1_F2,
		p_cc,
		m_slowDataT1Data( e_DataInFrame,
		e_shortFileTransfer,
		e_continueAfterFrame,
		PXT_DATA_T1_F2_length)),
		m_frame3T1Data( vc_mse.iutIdUP,
		PXT_DATA_T1_F3,
		m_slowDataT1Data( e_DataInFrame,
		e_shortFileTransfer,
		e_continueAfterFrame,
		PXT_DATA_T1_F3_length)),
		m_frame4T1Data( vc_mse.iutIdLP,
		PXT_DATA_T1_F4,
		p_cc,
		m_slowDataT1Data( e_DataInFrame,
		e_shortFileTransfer,
		e_continueAfterFrame,
		PXT_DATA_T1_F4_length)))),
		m_endFrameAck));

		alt {