fix for 0006831: rename half/full OECON states (ef1ddcfd) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/AtsECall_IVS_Testcases.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -1184,7 +1184,7 @@ module AtsECall_IVS_Testcases {
		testcase CTP_1_1_15_3() runs on PsapMtc system PsapSystem {

		// Local variables
		var ModemConfiguration v_locaPsapSimCfg := modifies c_defaultPsapSimulatorConfiguration := {inbandState := OFF, inbandControl := MANUAL}
		var ModemConfiguration v_locaPsapSimCfg := modifies c_defaultPsapSimulatorConfiguration := {inbandDirection := PUSH, ignoreSendSignal := true}

		// Test component configuration
		f_configIvsUp(v_locaPsapSimCfg);
		@@ -1192,7 +1192,7 @@ module AtsECall_IVS_Testcases {
		// Test Body
		f_establishCall(ANY, TEST);

		f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));
		f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER), PX_TIMEOUT, true);

		f_userVerify("Was 2-way voice communication possible after T5 has expired?",
		"2-way speech was possible between the IVS and PSAP test point",

ttcn/LibItsECall_Functions.ttcn

+0 −4

Original line number	Diff line number	Diff line
		@@ -502,10 +502,6 @@ module LibItsECall_Functions {
		repeat;
		}

		[] modem.receive(mw_inbandStateChanged(PX_WORKERS[0].id)) {
		repeat;
		}

		[] modem.receive(mw_inbandSendSignalReceived(PX_WORKERS[0].id)) {
		repeat;
		}

ttcn/LibItsECall_Templates.ttcn

+0 −40

Original line number	Diff line number	Diff line
		@@ -205,27 +205,6 @@ module LibItsECall_Templates {
		}
		}

		/**
		* @desc Receive template for InbandStateChanged event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_fromState Previous state (OFF, HALF, FULL)
		* @param p_toState Current state (OFF, HALF, FULL)
		*/
		template Event mw_inbandStateChanged (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,
		template(present) ModemStateType p_fromState := ?,
		template(present) ModemStateType p_toState := ?
		) := {
		inbandStateChanged := {
		worker := p_worker,
		time := p_time,
		fromState := p_fromState,
		toState := p_toState
		}
		}

		/**
		* @desc Receive template for InbandSendSignalReceived event
		* @param p_worker Target worker process
		@@ -596,8 +575,6 @@ module LibItsECall_Templates {
		eCallMessage := p_parameters.eCallMessage,
		automaticAlAck := *,
		alAckValue := *,
		inbandState := p_parameters.inbandState,
		inbandControl := p_parameters.inbandControl,
		inbandDirection := p_parameters.inbandDirection,
		internalSubscriber := p_parameters.internalSubscriber,
		ignoreAlClearDown := p_parameters.ignoreAlClearDown,
		@@ -636,8 +613,6 @@ module LibItsECall_Templates {
		eCallMessage := *,
		automaticAlAck := p_parameters.automaticAlAck,
		alAckValue := p_parameters.alAckValue,
		inbandState := p_parameters.inbandState,
		inbandControl := p_parameters.inbandControl,
		inbandDirection := p_parameters.inbandDirection,
		internalSubscriber := p_parameters.internalSubscriber,
		ignoreAlClearDown := *,
		@@ -664,21 +639,6 @@ module LibItsECall_Templates {
		parameters := p_parameters
		}

		/**
		* @desc Send template for InbandModelState configuration command
		* @param p_worker Target worker process
		* @param p_state Inband model state
		*/
		template (value) SetConfigCmd m_setInbandModelState (
		integer p_worker,
		ModemStateType p_state
		) := {
		worker := p_worker,
		parameters := {
		inbandState := p_state
		}
		}

		/**
		* @desc Send template for AutomaticAlAck configuration command
		* @param p_worker Target worker process

ttcn/LibItsECall_TypesAndValues.ttcn

+1 −34

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@ module LibItsECall_TypesAndValues {

		type enumerated SimulatorModeType {PSAP, IVS};
		type integer AckNumberType (0 .. 20);
		type enumerated ModemStateType {OFF, HALF, FULL, UNDEFINED};
		type enumerated ModemControlType {AUTO, MANUAL};
		type enumerated ModemDirectionType {PUSH, PULL};
		type charstring TelephoneNumber;
		type integer AckValueType (0 .. 15);
		@@ -98,8 +96,6 @@ module LibItsECall_TypesAndValues {
		ECallMessageUnion eCallMessage optional,
		boolean automaticAlAck optional,
		AckValueType alAckValue optional,
		ModemStateType inbandState optional,
		ModemControlType inbandControl optional,
		ModemDirectionType inbandDirection optional,
		TelephoneNumber internalSubscriber optional,
		boolean ignoreAlClearDown optional,
		@@ -120,8 +116,6 @@ module LibItsECall_TypesAndValues {
		variant (eCallMessage) "msd";
		variant (alAckValue) "al_ack_value";
		variant (automaticAlAck) "automatic_al_ack";
		variant (inbandState) "inband_state";
		variant (inbandControl) "inband_control";
		variant (inbandDirection) "inband_direction";
		variant (internalSubscriber) "internal_subscriber";
		variant (ignoreAlClearDown) "ignore_al_clear_down";
		@@ -141,7 +135,6 @@ module LibItsECall_TypesAndValues {
		* @member inbandLlAckReceived
		* @member inbandAlAckSent
		* @member inbandAlAckReceived
		* @member inbandStateChanged
		* @member inbandSendSignalReceived
		* @member inbandNackSent
		* @member inbandNackReceived
		@@ -155,7 +148,6 @@ module LibItsECall_TypesAndValues {
		InbandLlAckReceivedEvent inbandLlAckReceived,
		InbandAlAckSentEvent inbandAlAckSent,
		InbandAlAckReceivedEvent inbandAlAckReceived,
		InbandStateChangedEvent inbandStateChanged,
		InbandSendSignalReceivedEvent inbandSendSignalReceived,
		InbandNackSentEvent inbandNackSent,
		InbandNackReceivedEvent inbandNackReceived,
		@@ -267,27 +259,6 @@ module LibItsECall_TypesAndValues {
		variant (reliable) "reliable";
		}

		/**
		* @desc Generated whenever the state of the in-band modem changes
		* @member worker Worker process that generated this event
		* @member time Event timestamp
		* @member fromState Previous state (OFF, HALF, FULL)
		* @member toState Current state (OFF, HALF, FULL)
		* @remark mode: PSAP, IVS
		*/
		type record InbandStateChangedEvent {
		integer worker,
		charstring time,
		ModemStateType fromState,
		ModemStateType toState
		} with {
		variant "event;inband_state_changed";
		variant (worker) "worker";
		variant (time) "time";
		variant (fromState) "from-state";
		variant (toState) "to-state";
		}

		/**
		* @desc Indicates the reception of a SEND signal
		* @member worker Worker process that generated this event
		@@ -762,8 +733,6 @@ module LibItsECall_TypesAndValues {
		t6Timer := c_t6_timer,
		t7Timer := c_t7_timer,
		//eCallMessage := f_expandMsdValue(PX_ECALL_MESSAGE),
		inbandState := OFF,
		inbandControl := AUTO,
		inbandDirection := PULL,
		internalSubscriber := "",
		ignoreAlClearDown := false,
		@@ -785,8 +754,6 @@ module LibItsECall_TypesAndValues {
		numberOfLlAcks := 5,
		automaticAlAck := true,
		alAckValue := 0,
		inbandState := OFF,
		inbandControl := AUTO,
		inbandDirection := PULL,
		internalSubscriber := "",
		noAckOfMsd := false,