Corrected function //end functions and log messages. (ec37d322) · Commits · DMR / dPMR

ttcn/dPMR_ExtFunctions.ttcn

+6 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,12 @@ module dPMR_ExtFunctions {
		*/
		external function xf_transmitVoiceToCsfGroup(ChannelNumber p_chNr, ColourCode p_cc, Int8 p_dbM, DialString p_groupDialString);

		/**
		* @desc xf_stopTransmittingVoice stop transmit voice
		*/
		external function xf_stopTransmittingVoice();


		} // end group ChannelAccessExternalFunctions

		} // end module dPMR_ExtFunctions

ttcn/dPMR_Functions.ttcn

+13 −13

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@
		if (c_grpBcf16 == v_csf_cc) {ret_csfChannelNr := e_csfChannelNr_16}
		return { csfChannelNr := ret_csfChannelNr };
		}
		}
		} // end f_getChannelNrFromColourCode



		@@ -287,7 +287,7 @@
		} //end f_getColourCode

		/**
		* @desc f_createMsAddress returns an MsAddress.
		* @desc f_createMsAddressIUT returns an MsAddress.
		*
		* @param a booloan if the unit is IUT
		* @remark This function should perhaps be rewritten (split) , and the enumerated type UseAllCallCommonId removed
		@@ -311,7 +311,7 @@
		v_retAdr := { csfAddress := PXT_CSF_ADDRESS_IUT };
		}
		return v_retAdr;
		}//end f_createMsAddress
		}//end f_createMsAddressIUT

		/**
		* @desc f_createMsAddressTester returns an MsAddress.
		@@ -337,7 +337,7 @@
		v_retAdr := { csfAddress := PXT_CSF_ADDRESS_TESTER };
		}
		return v_retAdr;
		}//end f_createMsAddress
		}//end f_createMsAddressTester

		}//end converterFunctions

		@@ -358,10 +358,10 @@ group UtilityFunctions {
		var bitstring v_bs_commanId := p_msAddress.csfAddress;
		return v_bs_commanId >> 12;
		}
		}
		} // end f_msAddress2Upper

		/**
		* @desc f_msAddress2Upper returns lower part of the MsAddress.
		* @desc f_msAddress2Lower returns lower part of the MsAddress.
		*
		* @param MsAddress
		*/
		@@ -375,7 +375,7 @@ group UtilityFunctions {
		var bitstring v_bs_commanId := p_msAddress.csfAddress;
		return v_bs_commanId and4b c_lowerPartSelector;
		}
		}
		} // end f_msAddress2Lower

		/*
		* @desc f_getWrongColourCode returns wrong colourcode i.e. != inparam
		@@ -394,7 +394,7 @@ group UtilityFunctions {
		}
		}
		return v_retcc;
		}
		} // end f_getWrongColourCode

		} //end UtilityFunctions

		@@ -402,7 +402,7 @@ group UtilityFunctions {
		group UtFunctions {

		/**
		* @desc This function will put the MS in an idle mode listening to a
		* @desc f_msToStandby_UT will put the MS in an idle mode listening to a
		* certain channel using the Pixit id or address
		* @param p_cc the colour code (the channel)
		*/
		@@ -429,7 +429,7 @@ group UtilityFunctions {
		} // end f_msToStandby_UT

		/**
		* @desc This function will put the MS in an idle mode listening to a
		* @desc f_msToStandbyPoliteLevel_UT will put the MS in an idle mode listening to a
		* certain channel using the Pixit id or address
		* @param p_cc the colour code (the channel), The polite level
		*/
		@@ -460,7 +460,7 @@ group UtilityFunctions {
		group taFunctions {

		/**
		* @desc This function will put the Test Adapter in an idle mode listening to a
		* @desc f_taToStandby function will put the Test Adapter in an idle mode listening to a
		* certain channel using the Pixit id or address
		* @param p_cc the colour code (the channel)
		*/
		@@ -477,9 +477,9 @@ group UtilityFunctions {

		return v_ret;

		} // end taFunctions
		} // end f_taToStandby


		}//end testerFunctions
		}//end taFunctions

		} // end module dPMR_Functions

ttcn/dPMR_TestCases.ttcn

+261 −279

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestSystem.ttcn

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ group componentDefs {
		timer tc_noac := PXT_TNOAC;
		timer tc_wait := PXT_TWAIT;
		timer tc_t_ack := 3.0; // TODO JP cannot use the pics, get circular reference!!! Check why
		timer tc_t_toStopInterference := 1.0;

		//Component variable
		var MseParams vc_mse ;

ttcn/dPMR_Types.ttcn

+3 −1

Original line number	Diff line number	Diff line
		@@ -593,7 +593,9 @@ module dPMR_Types {
		e_makeT1DataCallWithShortFileTransfer (70), // Make a T1 data with short file transfer
		e_makeT2DataCallStatusMessage (71), // Make a T2 data with status message
		e_makeT2DataCallPrecodedMessage (72), // Make a T2 data with precoded message
		e_makeT2DataCallWithShortFileTransfer (73) // Make a T2 data with short file transfer
		e_makeT2DataCallWithShortFileTransfer (73), // Make a T2 data with short file transfer
		e_toStandbyAndUseAckTimer (74), // go to standby and config to use AckTimer T_ack
		e_toStandbyAndUseAckTimerAndMultipleAcks (75) // go to standby and config to use AckTimer T_ack config to use multiple acks
		}

		/**