X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c61d41422afe49ea1c31bc14913452ef3b571c21..ed1233982a70e0d9c816b00c8fa78a5521c9d347:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 7319a4be..a1e94996 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -15,6 +15,18 @@ DEFINE_REF(eDVBSatelliteEquipmentControl);
 
 eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
 
+int eDVBSatelliteEquipmentControl::m_params[MAX_PARAMS];
+/*
+   defaults are set in python lib/python/Components/NimManager.py
+   in InitSecParams function via setParam call
+*/
+
+void eDVBSatelliteEquipmentControl::setParam(int param, int value)
+{
+	if (param >= 0 && param < MAX_PARAMS)
+		m_params[param]=value;
+}
+
 eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends)
 	:m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false)
 {
@@ -93,12 +105,54 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	setRotorPosNum(1); // stored pos 1
 }
 
+static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor)
+{
+	eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
+	int oRotorPos = -1;
+	linked_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos);
+	if (linked_fe->m_inuse)
+	{
+		int ocsw = -1,
+			oucsw = -1,
+			oToneburst = -1;
+		linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
+		linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw);
+		linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst);
+#if 0
+		eDebug("compare csw %02x == lcsw %02x",
+			csw, ocsw);
+		if ( diseqc )
+			eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x",
+				ucsw, oucsw, toneburst, oToneburst);
+		if ( rotor )
+			eDebug("compare pos %d == current pos %d",
+				sat.orbital_position, oRotorPos);
+#endif
+		if ( (csw != ocsw) ||
+			( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+			( rotor && oRotorPos != sat.orbital_position ) )
+		{
+//			eDebug("can not tune this transponder with linked tuner in use!!");
+			ret=0;
+		}
+//		else
+//			eDebug("OK .. can tune this transponder with linked tuner in use :)");
+	}
+	else if (rotor && oRotorPos != -1)
+	{
+		ret -= abs(oRotorPos-sat.orbital_position);
+//		eDebug("decrement rotor pos for linked tuner!!");
+	}
+	linked_fe->m_frontend->getData(direction, linked_ptr);
+}
+
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
 {
 	int ret=0, satcount=0;
 
 	for (int idx=0; idx <= m_lnbidx; ++idx )
 	{
+		bool rotor=false;
 		eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
 		if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner?
 		{
@@ -129,7 +183,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 				if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
 					band |= 2;
 
-				bool rotor=false;
 				bool diseqc=false;
 
 				if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
@@ -144,88 +197,21 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 					if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
 						rotor = true;
 
-					ret = 1000;
+					ret=10000;
+					if (rotor && curRotorPos != -1)
+						ret -= abs(curRotorPos-sat.orbital_position);
 				}
 				else
 				{
 					csw = band;
-					ret = 2000;
+					ret = 15000;
 				}
 
-				while (linked_prev_ptr != -1)  // check for linked tuners..
-				{
-					eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
-					if (linked_fe->m_inuse)
-					{
-						int ocsw = -1,
-							oucsw = -1,
-							oToneburst = -1,
-							oRotorPos = -1;
-						linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
-						linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw);
-						linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst);
-						linked_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos);
-#if 0
-						eDebug("compare csw %02x == lcsw %02x",
-							csw, ocsw);
-						if ( diseqc )
-							eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x",
-								ucsw, oucsw, toneburst, oToneburst);
-						if ( rotor )
-							eDebug("compare pos %d == current pos %d",
-								sat.orbital_position, oRotorPos);
-#endif
-						if ( (csw != ocsw) ||
-							( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-							( rotor && oRotorPos != sat.orbital_position ) )
-						{
-//							eDebug("can not tune this transponder with linked tuner in use!!");
-							ret=0;
-							break;
-						}
-//						else
-//							eDebug("OK .. can tune this transponder with linked tuner in use :)");
-					}
-					linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
-				}
+				while (ret && linked_prev_ptr != -1)  // check for linked tuners..
+					checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor);
 
-				if (ret)
-					while (linked_next_ptr != -1)  // check for linked tuners..
-					{
-						eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
-						if (linked_fe->m_inuse)
-						{
-							int ocsw = -1,
-								oucsw = -1,
-								oToneburst = -1,
-								oRotorPos = -1;
-							linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
-							linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw);
-							linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst);
-							linked_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos);
-#if 0
-							eDebug("compare csw %02x == lcsw %02x",
-								csw, ocsw);
-							if ( diseqc )
-								eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x",
-									ucsw, oucsw, toneburst, oToneburst);
-							if ( rotor )
-								eDebug("compare pos %d == current pos %d",
-									sat.orbital_position, oRotorPos);
-#endif
-							if ( (csw != ocsw) ||
-								( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-								( rotor && oRotorPos != sat.orbital_position ) )
-							{
-//								eDebug("can not tune this transponder with linked tuner in use!!");
-								ret=0;
-								break;
-							}
-//							else
-//								eDebug("OK .. can tune this transponder with linked tuner in use :)");
-						}
-						linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
-					}
+				while (ret && linked_next_ptr != -1)  // check for linked tuners..
+					checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor);
 
 				if (ret)
 					if (satpos_depends_ptr != -1)
@@ -507,7 +493,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
 									RotorCmd |= 0xD000;
 								}
-								else					// west
+								else // west
 								{
 									int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
 									RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
@@ -521,11 +507,14 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 				if ( send_mask )
 				{
-					sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
 					eSecCommand::pair compare;
+					compare.steps = +3;
+					compare.tone = iDVBFrontend::toneOff;
+					sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
 					compare.voltage = iDVBFrontend::voltageOff;
-					compare.steps = +4;
+					compare.steps = +3;
 					// the next is a check if voltage is switched off.. then we first set a voltage :)
 					// else we set voltage after all diseqc stuff..
 					sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
@@ -533,26 +522,24 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 					{
 						if (rotor_param.m_inputpower_parameters.m_use)
-							compare.voltage = VOLTAGE(18);  // in input power mode turn rotor always with 18V (fast)
+							compare.voltage = VOLTAGE(18);  // in input power mode set 18V for measure input power
 						else
 							compare.voltage = VOLTAGE(13);  // in normal mode start turning with 13V
 					}
 					else
 						compare.voltage = voltage;
 
-					// voltage already correct ?
-					sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
-					compare.steps = +3;
 					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-					// voltage was disabled..so we wait a longer time .. for normal switches 750ms should be enough
-					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) );
+
+					// voltage was disabled..so we wait a longer time .. for normal switches 250ms should be enough
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
 
 					for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
 					{
 						if ( send_mask & 4 )
 						{
 							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
 						}
 
 						int loops=0;
@@ -562,8 +549,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						if ( send_mask & 2 )
 							++loops;
 
-						for ( int i=0; i < di_param.m_repeats; ++i )
-							loops *= 2;
+						loops <<= di_param.m_repeats;
 
 						for ( int i = 0; i < loops;)  // fill commands...
 						{
@@ -596,9 +582,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									cmd=0x39;
 								else if (diseqc.data[2] == 0x39 && (send_mask & 1))
 									cmd=0x38;
+								int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
 								if (cmd)
 								{
-									static int delay = (120 - 54) / 2;  // standard says 100msek between two repeated commands
+									int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // standard says 100msek between two repeated commands
 									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) );
 									diseqc.data[2]=cmd;
 									diseqc.data[3]=(cmd==0x38) ? csw : ucsw;
@@ -607,19 +594,19 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									if ( i < loops )
 										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
 									else
-										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
 								}
 								else  // delay 120msek when no command is in repeat gap
-									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 120) );
+									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) );
 							}
 							else
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
 						}
 
 						if ( send_mask & 8 )  // toneburst at end of sequence
 						{
 							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
 						}
 					}
 				}
@@ -629,6 +616,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					eSecCommand::pair compare;
 					if (!send_mask)
 					{
+						compare.steps = +3;
+						compare.tone = iDVBFrontend::toneOff;
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
+
 						compare.voltage = iDVBFrontend::voltageOff;
 						compare.steps = +4;
 						// the next is a check if voltage is switched off.. then we first set a voltage :)
@@ -636,19 +629,15 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
 
 						if (rotor_param.m_inputpower_parameters.m_use)
-							sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
+							sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // set 18V for measure input power
 						else
-							sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V
+							sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
 
-						// voltage was disabled..so we wait a longer time ..
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +8) );  // no need to send stop rotor cmd and recheck voltage
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD]) ); // wait 750ms when voltage was disabled
+						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +9) );  // no need to send stop rotor cmd and recheck voltage
 					}
 					else
-					{
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd
-						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +8) );  // no need to send stop rotor cmd and recheck voltage
-					}
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
 
 					eDVBDiseqcCommand diseqc;
 					diseqc.len = 3;
@@ -659,8 +648,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
 					sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-					// wait 300msec after send rotor stop cmd
-					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 300) );
+					// wait 150msec after send rotor stop cmd
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_MOTOR_STOP_CMD]) );
 
 					diseqc.data[0] = 0xE0;
 					diseqc.data[1] = 0x31;		// positioner
@@ -684,23 +673,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						eSecCommand::rotor cmd;
 						eSecCommand::pair compare;
 						compare.voltage = VOLTAGE(18);
-						compare.steps = +2;
+						compare.steps = +3;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
 // measure idle power values
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec after voltage change
 						sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-						compare.voltage = 1;
+						compare.val = 1;
 						compare.steps = -2;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec before measure
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec before measure
 						sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-						compare.voltage = 0;
+						compare.val = 0;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
 ////////////////////////////
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, 2) );  // 2 retries
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) );  // 2 retries
 						sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
@@ -714,20 +703,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );  // check if rotor has started
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) );  // timeout .. we assume now the rotor is already at the correct position
 						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // goto loop start
-						sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +9 ) );  // timeout .. we assume now the rotor is already at the correct position
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +10 ) );  // timeout .. we assume now the rotor is already at the correct position
 						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) );  // goto loop start
 ////////////////////
-						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 2400) );  // 2 minutes running timeout
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) );  // 2 minutes running timeout
 // rotor running loop
 						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
 						sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
 						cmd.direction=0;  // check for stopped rotor
-						cmd.steps=+3;
+						cmd.steps=+4;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) );  // timeout ? this should never happen
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +4 ) );  // timeout ? this should never happen
 						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
 					}
 					else
 					{  // use normal turning mode
@@ -736,10 +728,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						eSecCommand::rotor cmd;
 						eSecCommand::pair compare;
 						compare.voltage = VOLTAGE(13);
-						compare.steps = +2;
+						compare.steps = +3;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
 
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
@@ -751,22 +743,24 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
 
+						compare.tone = tone;
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
 
 						cmd.direction=1;  // check for running rotor
 						cmd.deltaA=0;
 						cmd.steps=+3;
 						cmd.okcount=0;
-
-						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 480) );  // 2 minutes running timeout
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*4) );  // 2 minutes running timeout
 						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );  // 250msec delay
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TUNER_LOCKED_GOTO, cmd ) );
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); 
 						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) );  // goto loop start
+						sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
 					}
-					sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-					sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
 					frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
 					frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
 				}
@@ -785,10 +779,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				compare.steps = +3;
 				sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
 				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 10) );
-
+				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_FINAL_VOLTAGE_CHANGE]) );
+				compare.tone = tone;
+				sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
 				sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
-				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
 			}
 
 			if (doSetFrontend)
@@ -1103,7 +1098,7 @@ struct sat_compare
 
 PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
 {
-	PyObject *ret=0;
+	ePyObject ret;
 
 	if (tu1 != tu2)
 	{
@@ -1208,25 +1203,26 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
-	if (tu1 == tu2)
-		return -1;
-
-	eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-
-	int cnt=0;
-	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
-	{
-		if (cnt == tu1)
-			p1 = *it;
-		else if (cnt == tu2)
-			p2 = *it;
-	}
-	if (p1 && p2)
+	if (tu1 != tu2)
 	{
-		p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
-		p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
-		return 0;
+		eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
+
+		int cnt=0;
+		for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+		{
+			if (cnt == tu1)
+				p1 = *it;
+			else if (cnt == tu2)
+				p2 = *it;
+		}
+		if (p1 && p2)
+		{
+			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
+			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
+			return 0;
+		}
 	}
+	return -1;
 }
 
 RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)