X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3df16a12b479b1d4cfddf75f9129ce652855f1b7..b5f1d8881aa8369ca05be952298425a85124b665:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 5d74753a..73294611 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -1,18 +1,13 @@
-#include <config.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
 
+#include <set>
+
 #if HAVE_DVB_API_VERSION < 3
-#define INVERSION Inversion
 #define FREQUENCY Frequency
-#define FEC_INNER FEC_inner
-#define SYMBOLRATE SymbolRate
 #else
-#define INVERSION inversion
 #define FREQUENCY frequency
-#define FEC_INNER fec_inner
-#define SYMBOLRATE symbol_rate
 #endif
 #include <lib/base/eerror.h>
 
@@ -127,7 +122,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 
 				if ( sat.frequency > lnb_param.m_lof_threshold )
 					band |= 1;
-				if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
+				if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
 					band |= 2;
 
 				bool rotor=false;
@@ -139,22 +134,25 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 					if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
 						csw = 0xF0 | (csw << 2);
 
-					csw |= band;
+					if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO)
+						csw |= band;
 
 					if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
 					{
 						rotor=true;
 						if ( curRotorPos == sat.orbital_position )
-							ret=20;
+							ret=20;  // rotor on correct orbpos = prio 20
 						else
-							ret=10;
+							ret=10;  // rotor must turn to correct orbpos = prio 10
 					}
+					else
+						ret = 30;  // no rotor = prio 30
 				}
 				else
+				{
 					csw = band;
-
-				if (!ret)
-					ret=40;
+					ret = 40;  // no diseqc = prio 40
+				}
 
 				if (linked_to != -1)  // check for linked tuners..
 				{
@@ -207,6 +205,19 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 //					else
 //						eDebug("OK .. can tune this transponder satpos is correct :)");
 				}
+				if (ret)
+				{
+					int lof = sat.frequency > lnb_param.m_lof_threshold ?
+						lnb_param.m_lof_hi : lnb_param.m_lof_lo;
+					int tuner_freq = abs(sat.frequency - lof);
+//					eDebug("tuner freq %d", tuner_freq);
+					if (tuner_freq < 900000 || tuner_freq > 2200000)
+					{
+						ret=0;
+//						eDebug("Transponder not tuneable with this lnb... %d Khz out of tuner range",
+//							tuner_freq);
+					}
+				}
 			}
 		}
 	}
@@ -215,7 +226,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 
 #define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x)
 
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)
 {
 	bool linked=false;
 	bool depend_satpos_mode=false;
@@ -233,7 +244,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 		if ( sit != lnb_param.m_satellites.end())
 		{
 			eDVBSatelliteSwitchParameters &sw_param = sit->second;
-
+			bool doSetVoltageToneFrontend = true;
+			bool doSetFrontend = true;
 			int band=0,
 				linked_to=-1, // linked tuner
 				satpos_depends_to=-1,
@@ -286,56 +298,19 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			else
 				parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo;
 
-			if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
-				band |= 2;
+			parm.FREQUENCY = abs(parm.FREQUENCY);
 
-			switch (sat.inversion)
-			{
-				case eDVBFrontendParametersCable::Inversion::On:
-					parm.INVERSION = INVERSION_ON;
-					break;
-				case eDVBFrontendParametersCable::Inversion::Off:
-					parm.INVERSION = INVERSION_OFF;
-					break;
-				default:
-				case eDVBFrontendParametersCable::Inversion::Unknown:
-					parm.INVERSION = INVERSION_AUTO;
-					break;
-			}
-
-			switch (sat.fec)
-			{
-				default:
-				case eDVBFrontendParametersSatellite::FEC::fNone:
-					eDebug("no fec set.. assume auto");
-				case eDVBFrontendParametersSatellite::FEC::fAuto:
-					parm.u.qpsk.FEC_INNER = FEC_AUTO;
-					break;
-				case eDVBFrontendParametersSatellite::FEC::f1_2:
-					parm.u.qpsk.FEC_INNER = FEC_1_2;
-					break;
-				case eDVBFrontendParametersSatellite::FEC::f2_3:
-					parm.u.qpsk.FEC_INNER = FEC_2_3;
-					break;
-				case eDVBFrontendParametersSatellite::FEC::f3_4:
-					parm.u.qpsk.FEC_INNER = FEC_3_4;
-					break;
-				case eDVBFrontendParametersSatellite::FEC::f5_6:
-					parm.u.qpsk.FEC_INNER = FEC_5_6;
-					break;
-				case eDVBFrontendParametersSatellite::FEC::f7_8: 
-					parm.u.qpsk.FEC_INNER = FEC_7_8;
-					break;
-			}
+			frontend.setData(9, sat.frequency - parm.FREQUENCY);
 
-			parm.u.qpsk.SYMBOLRATE = sat.symbol_rate;
+			if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
+				band |= 2;
 
 			if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V
-				|| ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical
+				|| ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical
 					&& sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
 				voltage = VOLTAGE(13);
 			else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V
-				|| ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal
+				|| ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)
 					&& sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
 				voltage = VOLTAGE(18);
 			if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
@@ -352,7 +327,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
 					csw = 0xF0 | (csw << 2);
 
-				csw |= band;
+				if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO)
+					csw |= band;
 
 				bool send_csw =
 					(di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);
@@ -394,7 +370,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				}
 				if (changed_csw) 
 				{
-					if ( di_param.m_use_fast && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) )
+					if ( di_param.m_use_fast
+						&& di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO
+						&& (lastcsw & 0xF0)
+						&& ((csw / 4) == (lastcsw / 4)) )
 						eDebug("dont send committed cmd (fast diseqc)");
 					else
 					{
@@ -416,103 +395,16 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				eDebug("");
 #endif
 
-				if ( send_mask )
-				{
-					sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-					eSecCommand::pair compare;
-					compare.voltage = voltage;
-					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, 50) );
-				}
-
-				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) );
-					}
-
-					int loops=0;
-
-					if ( send_mask & 1 )
-						++loops;
-					if ( send_mask & 2 )
-						++loops;
-
-					for ( int i=0; i < di_param.m_repeats; ++i )
-						loops *= 2;
-
-					for ( int i = 0; i < loops;)  // fill commands...
-					{
-						eDVBDiseqcCommand diseqc;
-						diseqc.len = 4;
-						diseqc.data[0] = i ? 0xE1 : 0xE0;
-						diseqc.data[1] = 0x10;
-						if ( (send_mask & 2) && (di_param.m_command_order & 4) )
-						{
-							diseqc.data[2] = 0x39;
-							diseqc.data[3] = ucsw;
-						}
-						else if ( send_mask & 1 )
-						{
-							diseqc.data[2] = 0x38;
-							diseqc.data[3] = csw;
-						}
-						else
-						{
-							diseqc.data[2] = 0x00;
-							diseqc.data[3] = 0x00;
-						}
-						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-
-						i++;
-						if ( i < loops )
-						{
-							int cmd=0;
-							if (diseqc.data[2] == 0x38 && (send_mask & 2))
-								cmd=0x39;
-							else if (diseqc.data[2] == 0x39 && (send_mask & 1))
-								cmd=0x38;
-							if (cmd)
-							{
-								static int delay = (120 - 54) / 2;  // 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;
-								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-								++i;
-								if ( i < loops )
-									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
-								else
-									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-							}
-							else  // delay 120msek when no command is in repeat gap
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 120) );
-						}
-						else
-							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-					}
-
-					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) );
-					}
-				}
-
-				if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
+				int RotorCmd=-1;
+				bool useGotoXX = false;
+				if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+					&& !sat.no_rotor_command_on_tune )
 				{
 					if (depend_satpos_mode || linked)
 						// in this both modes we dont really turn the rotor.... but in canTune we need the satpos
 						frontend.setData(6, sat.orbital_position);
 					else
 					{
-						int RotorCmd=0;
-						bool useGotoXX = false;
-
 						if (sw_param.m_rotorPosNum) // we have stored rotor pos?
 							RotorCmd=sw_param.m_rotorPosNum;
 						else  // we must calc gotoxx cmd
@@ -557,7 +449,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									RotorCmd |= 0xD000;
 								}
 								else					// west
-								{          
+								{
 									int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
 									RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
 									RotorCmd |= 0xE000;
@@ -565,93 +457,256 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							}
 							eDebug("RotorCmd = %04x", RotorCmd);
 						}
-						if ( RotorCmd != lastRotorCmd )
+					}
+				}
+
+				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.voltage = iDVBFrontend::voltageOff;
+					compare.steps = +4;
+					// 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) );
+
+					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)
+						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 200ms should be enough
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );
+
+					for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+					{
+						if ( send_mask & 4 )
 						{
-							if ( send_mask )
+							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+						}
+
+						int loops=0;
+
+						if ( send_mask & 1 )
+							++loops;
+						if ( send_mask & 2 )
+							++loops;
+
+						for ( int i=0; i < di_param.m_repeats; ++i )
+						loops *= 2;
+
+						for ( int i = 0; i < loops;)  // fill commands...
+						{
+							eDVBDiseqcCommand diseqc;
+							diseqc.len = 4;
+							diseqc.data[0] = i ? 0xE1 : 0xE0;
+							diseqc.data[1] = 0x10;
+							if ( (send_mask & 2) && (di_param.m_command_order & 4) )
 							{
-								// override first voltage change
-								*(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13));
-								// wait 1 second after first switch diseqc command
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) );
+								diseqc.data[2] = 0x39;
+								diseqc.data[3] = ucsw;
 							}
-							else  // no other diseqc commands before
+							else if ( send_mask & 1 )
 							{
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );  // wait 15msec after tone change
-								eSecCommand::pair compare;
-								compare.voltage = voltage;
-								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(13)) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
+								diseqc.data[2] = 0x38;
+								diseqc.data[3] = csw;
 							}
-
-							eDVBDiseqcCommand diseqc;
-							diseqc.data[0] = 0xE0;
-							diseqc.data[1] = 0x31;		// positioner
-							if ( useGotoXX )
+							else
 							{
-								diseqc.len = 5;
-								diseqc.data[2] = 0x6E;	// drive to angular position
-								diseqc.data[3] = ((RotorCmd & 0xFF00) / 0x100);
-								diseqc.data[4] = RotorCmd & 0xFF;
+								diseqc.data[2] = 0x00;
+								diseqc.data[3] = 0x00;
 							}
-							else
+							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+
+							i++;
+							if ( i < loops )
 							{
-								diseqc.len = 4;
-								diseqc.data[2] = 0x6B;	// goto stored sat position
-								diseqc.data[3] = RotorCmd;
-								diseqc.data[4] = 0x00;
+								int cmd=0;
+								if (diseqc.data[2] == 0x38 && (send_mask & 2))
+									cmd=0x39;
+								else if (diseqc.data[2] == 0x39 && (send_mask & 1))
+									cmd=0x38;
+								if (cmd)
+								{
+									static int delay = (120 - 54) / 2;  // 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;
+									sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+									++i;
+									if ( i < loops )
+										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
+									else
+										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+								}
+								else  // delay 120msek when no command is in repeat gap
+									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 120) );
 							}
+							else
+								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+						}
+
+						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) );
+						}
+					}
+				}
 
-							if ( rotor_param.m_inputpower_parameters.m_use )
-							{ // use measure rotor input power to detect rotor state
-								eSecCommand::rotor cmd;
+				if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+				{
+					eSecCommand::pair compare;
+					compare.voltage = iDVBFrontend::voltageOff;
+					compare.steps = +4;
+					// 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) );
+
+					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
+					else
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V
+
+					// voltage was disabled..so we wait a longer time ..
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 500) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +7) );  // no need to send stop rotor cmd
+
+					if (send_mask)
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd
+					else
+						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +1) );
+
+					eDVBDiseqcCommand diseqc;
+					diseqc.len = 3;
+					diseqc.data[0] = 0xE0;
+					diseqc.data[1] = 0x31;	// positioner
+					diseqc.data[2] = 0x60;	// stop
+					sec_sequence.push_back( eSecCommand(eSecCommand::IF_ROTORPOS_VALID_GOTO, +5) );
+					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) );
+
+					diseqc.data[0] = 0xE0;
+					diseqc.data[1] = 0x31;		// positioner
+					if ( useGotoXX )
+					{
+						diseqc.len = 5;
+						diseqc.data[2] = 0x6E;	// drive to angular position
+						diseqc.data[3] = ((RotorCmd & 0xFF00) / 0x100);
+						diseqc.data[4] = RotorCmd & 0xFF;
+					}
+					else
+					{
+						diseqc.len = 4;
+						diseqc.data[2] = 0x6B;	// goto stored sat position
+						diseqc.data[3] = RotorCmd;
+						diseqc.data[4] = 0x00;
+					}
+
+					if ( rotor_param.m_inputpower_parameters.m_use )
+					{ // use measure rotor input power to detect rotor state
+						eSecCommand::rotor cmd;
+						eSecCommand::pair compare;
+						compare.voltage = VOLTAGE(18);
+						compare.steps = +2;
+						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::IF_IDLE_INPUTPOWER_AVAIL_GOTO, +8) ); // already measured?
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
-								sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 100) );  // wait 100msec before measure
-								sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // back to lower voltage
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
+						sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
+						compare.voltage = 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::MEASURE_IDLE_INPUTPOWER, 0) );
+						compare.voltage = 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::SLEEP, 50) );  // wait 50msec after voltage change
-								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
+						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::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
 // rotor start loop
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // 50msec delay
-								sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
-								cmd.direction=1;  // check for running rotor
-								cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;
-								cmd.steps=+3;
-								cmd.okcount=0;
-								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, +9 ) );  // 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::SLEEP, 50) );  // 50msec delay
+						sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
+						cmd.direction=1;  // check for running rotor
+						cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;
+						cmd.steps=+5;
+						cmd.okcount=0;
+						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::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_TIMEOUT, 2400) );  // 2 minutes running timeout
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
 // 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;
-								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::GOTO, -4) );  // running loop start
+						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;
+						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::GOTO, -4) );  // running loop start
 /////////////////////
-								sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
-								frontend.setData(3, RotorCmd);
-								frontend.setData(4, sat.orbital_position);
-							}
-							else
-								eFatal("rotor turning without inputpowermeasure not implemented yet");
-						}
 					}
+					else
+					{  // use normal turning mode
+						doSetVoltageToneFrontend=false;
+						doSetFrontend=false;
+						eSecCommand::rotor cmd;
+						eSecCommand::pair compare;
+						compare.voltage = VOLTAGE(13);
+						compare.steps = +2;
+						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::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+
+						compare.voltage = voltage;
+						compare.steps = +3;
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
+
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, 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::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) );
+					frontend.setData(3, RotorCmd);
+					frontend.setData(4, sat.orbital_position);
 				}
 			}
 			else
@@ -661,19 +716,24 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			frontend.setData(1, ucsw);
 			frontend.setData(2, di_param.m_toneburst_param);
 
-			if ( linked )
-				return 0;
-
-			eSecCommand::pair compare;
-			compare.voltage = voltage;
-			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::SET_TONE, tone) );
-			sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
+			if (!linked && doSetVoltageToneFrontend)
+			{
+				eSecCommand::pair compare;
+				compare.voltage = voltage;
+				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::SET_TONE, tone) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
+			}
 
+			if (doSetFrontend)
+			{
+				sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+			}
 			frontend.setSecSequence(sec_sequence);
 
 			return 0;
@@ -686,7 +746,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 RESULT eDVBSatelliteEquipmentControl::clear()
 {
-	for (int i=0; i < m_lnbidx; ++i)
+	for (int i=0; i <= m_lnbidx; ++i)
 	{
 		m_lnbs[i].m_satellites.clear();
 		m_lnbs[i].tuner_mask = 0;
@@ -728,7 +788,7 @@ RESULT eDVBSatelliteEquipmentControl::setDependencyPointers( int tu1, int tu2, i
 /* LNB Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addLNB()
 {
-	if ( m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)))
+	if ( (m_lnbidx+1) < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)))
 		m_curSat=m_lnbs[++m_lnbidx].m_satellites.end();
 	else
 	{
@@ -975,6 +1035,110 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
 	return 0;
 }
 
+struct sat_compare
+{
+	int orb_pos, lofl, lofh;
+	sat_compare(int o, int lofl, int lofh)
+		:orb_pos(o), lofl(lofl), lofh(lofh)
+	{}
+	sat_compare(const sat_compare &x)
+		:orb_pos(x.orb_pos), lofl(x.lofl), lofh(x.lofh)
+	{}
+	bool operator < (const sat_compare & cmp) const
+	{
+		if (orb_pos == cmp.orb_pos)
+		{
+			if ( abs(lofl-cmp.lofl) < 200000 )
+			{
+				if (abs(lofh-cmp.lofh) < 200000)
+					return false;
+				return lofh<cmp.lofh;
+			}
+			return lofl<cmp.lofl;
+		}
+		return orb_pos < cmp.orb_pos;
+	}
+};
+
+PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
+{
+	PyObject *ret=0;
+
+	int tu1_mask = 1 << tu1,
+		tu2_mask = 1 << tu2;
+
+	if (tu1 != tu2)
+	{
+		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)
+		{
+			// check for linked tuners
+			int tmp1, tmp2;
+			p1->m_frontend->getData(7, tmp1);
+			p2->m_frontend->getData(7, tmp2);
+			if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+			{
+				// check for rotor dependency
+				p1->m_frontend->getData(8, tmp1);
+				p2->m_frontend->getData(8, tmp2);
+				if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+				{
+					std::set<sat_compare> tu1sats, tu2sats;
+					std::list<sat_compare> tu1difference, tu2difference;
+					std::insert_iterator<std::list<sat_compare> > insert1(tu1difference, tu1difference.begin()),
+						insert2(tu2difference, tu2difference.begin());
+					for (int idx=0; idx <= m_lnbidx; ++idx )
+					{
+						eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
+						for (std::map<int, eDVBSatelliteSwitchParameters>::iterator sit(lnb_param.m_satellites.begin());
+							sit != lnb_param.m_satellites.end(); ++sit)
+						{
+							if ( lnb_param.tuner_mask & tu1_mask )
+								tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
+							if ( lnb_param.tuner_mask & tu2_mask )
+								tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
+						}
+					}
+					std::set_difference(tu1sats.begin(), tu1sats.end(),
+						tu2sats.begin(), tu2sats.end(),
+						insert1);
+					std::set_difference(tu2sats.begin(), tu2sats.end(),
+						tu1sats.begin(), tu1sats.end(),
+						insert2);
+					if (!tu1sats.empty() || !tu2sats.empty())
+					{
+						int idx=0;
+						ret = PyList_New(2+tu1difference.size()+tu2difference.size());
+
+						PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu1difference.size()));
+						for(std::list<sat_compare>::iterator it(tu1difference.begin()); it != tu1difference.end(); ++it)
+							PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
+
+						PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu2difference.size()));
+						for(std::list<sat_compare>::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it)
+							PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
+					}
+				}
+			}
+		}
+	}
+	if (!ret)
+	{
+		ret = PyList_New(2);
+		PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
+		PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
+	}
+	return ret;
+}
+
 RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
 	return setDependencyPointers(tu1, tu2, 7);