X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fsec.cpp;h=e4f00add729eb17c86f92658ef5c8ccfa058070a;hp=0e3e7e0ab1bf03bef65115c75d44f8d275f831da;hb=2a42c0a723a4013263ba08e745a26994c237d928;hpb=cd176a16cb54350617ea202de983e8d643978971

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 0e3e7e0..e4f00ad 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -108,6 +108,9 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 	{
 		bool rotor=false;
 		eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
+		bool is_unicable = lnb_param.SatCR_idx != -1;
+		bool is_unicable_position_switch = lnb_param.SatCR_positions > 1;
+
 		if ( lnb_param.m_slot_mask & slot_id ) // lnb for correct tuner?
 		{
 			int ret = 0;
@@ -163,7 +166,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 
 				eSecDebugNoSimulate("ret1 %d", ret);
 
-				if (linked_in_use)
+				if (linked_in_use && !is_unicable)
 				{
 					// compare tuner data
 					if ( (csw != linked_csw) ||
@@ -176,7 +179,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 						ret += 15;
 					eSecDebugNoSimulate("ret2 %d", ret);
 				}
-				else if (satpos_depends_ptr != -1)
+				else if ((satpos_depends_ptr != -1) && !(is_unicable && is_unicable_position_switch))
 				{
 					eSecDebugNoSimulate("satpos depends");
 					eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
@@ -209,7 +212,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 
 				eSecDebugNoSimulate("ret5 %d", ret);
 
-				if (ret)
+				if (ret && !is_unicable)
 				{
 					int lof = sat.frequency > lnb_param.m_lof_threshold ?
 						lnb_param.m_lof_hi : lnb_param.m_lof_lo;
@@ -297,11 +300,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 		if ( sit != lnb_param.m_satellites.end())
 		{
 			eSecCommandList sec_sequence;
-
-			lnb_param.guard_offset = 0; //HACK
-
-			frontend.setData(eDVBFrontend::SATCR, lnb_param.SatCR_idx);
-			
 			eDVBSatelliteSwitchParameters &sw_param = sit->second;
 			bool doSetFrontend = true;
 			bool doSetVoltageToneFrontend = true;
@@ -324,6 +322,15 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			eDVBSatelliteDiseqcParameters::t_diseqc_mode diseqc_mode = di_param.m_diseqc_mode;
 			eDVBSatelliteSwitchParameters::t_voltage_mode voltage_mode = sw_param.m_voltage_mode;
 			bool diseqc13V = voltage_mode == eDVBSatelliteSwitchParameters::HV_13;
+			bool is_unicable = lnb_param.SatCR_idx != -1;
+
+			bool useGotoXX = false;
+			int RotorCmd=-1;
+			int send_mask = 0;
+
+			lnb_param.guard_offset = 0; //HACK
+
+			frontend.setData(eDVBFrontend::SATCR, lnb_param.SatCR_idx);
 
 			if (diseqc13V)
 				voltage_mode = eDVBSatelliteSwitchParameters::HV;
@@ -368,15 +375,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 			int lof = (band&1)?lnb_param.m_lof_hi:lnb_param.m_lof_lo;
 
-			int local=0;
-
-
-			if(lnb_param.SatCR_idx == -1)
+			if(!is_unicable)
 			{
-			// calc Frequency
-				local = abs(sat.frequency 
-					- ((lof - (lof % 1000)) + ((lof % 1000)>500 ? 1000 : 0)) ); //TODO für den Mist mal ein Macro schreiben
-				parm.FREQUENCY = (local - (local % 125)) + ((local % 125)>62 ? 125 : 0);
+				// calc Frequency
+				int local= abs(sat.frequency 
+					- lof);
+				parm.FREQUENCY = ((((local * 2) / 125) + 1) / 2) * 125;
 				frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
 
 				if ( voltage_mode == eDVBSatelliteSwitchParameters::_14V
@@ -396,20 +400,22 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			}
 			else
 			{
-				unsigned int tmp = abs(sat.frequency 
-						- ((lof - (lof % 1000)) + ((lof % 1000)>500 ? 1000 : 0)) )
+				int tmp1 = abs(sat.frequency 
+						-lof)
 						+ lnb_param.SatCRvco
 						- 1400000
 						+ lnb_param.guard_offset;
-				parm.FREQUENCY = (lnb_param.SatCRvco - (tmp % 4000))+((tmp%4000)>2000?4000:0)+lnb_param.guard_offset;
-				lnb_param.UnicableTuningWord = (((tmp / 4000)+((tmp%4000)>2000?1:0)) 
+				int tmp2 = ((((tmp1 * 2) / 4000) + 1) / 2) * 4000;
+				parm.FREQUENCY = lnb_param.SatCRvco - (tmp1-tmp2) + lnb_param.guard_offset;
+				lnb_param.UnicableTuningWord = ((tmp2 / 4000) 
 						| ((band & 1) ? 0x400 : 0)			//HighLow
 						| ((band & 2) ? 0x800 : 0)			//VertHor
 						| ((lnb_param.LNBNum & 1) ? 0 : 0x1000)			//Umschaltung LNB1 LNB2
 						| (lnb_param.SatCR_idx << 13));		//Adresse des SatCR
 						eDebug("[prepare] UnicableTuningWord %#04x",lnb_param.UnicableTuningWord);
 						eDebug("[prepare] guard_offset %d",lnb_param.guard_offset);
-				frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - ((lnb_param.UnicableTuningWord & 0x3FF) *4000 + 1400000 - lnb_param.SatCRvco + lof));
+				frontend.setData(eDVBFrontend::FREQ_OFFSET, (lnb_param.UnicableTuningWord & 0x3FF) *4000 + 1400000 + lof - (2 * (lnb_param.SatCRvco - (tmp1-tmp2))) );
+				voltage = VOLTAGE(13);
 			}
 
 			if (diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
@@ -432,7 +438,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					(di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
 				bool changed_burst = send_burst && (forceChanged || toneburst != lastToneburst);
 
-				int send_mask = 0; /*
+				/* send_mask
 					1 must send csw
 					2 must send ucsw
 					4 send toneburst first
@@ -486,8 +492,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 #endif
 				if (doSetVoltageToneFrontend)
 				{
-					int RotorCmd=-1;
-					bool useGotoXX = false;
+
 					if ( diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
 						&& !sat.no_rotor_command_on_tune )
 					{
@@ -547,6 +552,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 					if ( send_mask )
 					{
+						int diseqc_repeats = diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0 ? di_param.m_repeats : 0;
 						int vlt = iDVBFrontend::voltageOff;
 						eSecCommand::pair compare;
 						compare.steps = +3;
@@ -559,7 +565,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							vlt = iDVBFrontend::voltage13;
 						else if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 						{
-							if (rotor_param.m_inputpower_parameters.m_use)
+							if (rotor_param.m_inputpower_parameters.m_use && !is_unicable)
 								vlt = VOLTAGE(18);  // in input power mode set 18V for measure input power
 							else
 								vlt = VOLTAGE(13);  // in normal mode start turning with 13V
@@ -619,7 +625,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							if ( send_mask & 2 )
 								++loops;
 
-							loops <<= di_param.m_repeats;
+							loops <<= diseqc_repeats;
 
 							for ( int i = 0; i < loops;)  // fill commands...
 							{
@@ -656,7 +662,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
 									if (cmd)
 									{
-										int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // standard says 100msek between two repeated commands
+										int delay = diseqc_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;
@@ -685,187 +691,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						}
 					}
 
-					eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
-					if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
-					{
-						eSecCommand::pair compare;
-						if (!send_mask && lnb_param.SatCR_idx == -1)
-						{
-							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_DISABLE_BEFORE_DISEQC]) );
-
-							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(18)) ); // set 18V for measure input power
-							else
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
-
-							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, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
-
-						eDVBDiseqcCommand diseqc;
-						memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
-						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 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
-						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(lnb_param.SatCR_idx == -1)
-						{
-							int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
-							if ( rotor_param.m_inputpower_parameters.m_use )
-							{ // use measure rotor input power to detect rotor state
-								bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
-								eSecCommand::rotor cmd;
-								eSecCommand::pair compare;
-								if (turn_fast)
-									compare.voltage = VOLTAGE(18);
-								else
-									compare.voltage = VOLTAGE(13);
-								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
-								compare.steps = -2;
-								if (turn_fast) {
-									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.val = 1;
-									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, 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.val = 0;
-								sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
-	////////////////////////////
-								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
-	// 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=+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, turn_fast ? 10 : 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_ROTOR_MOVING) );
-								if (turn_fast)
-									sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*20) );  // mrt is in seconds... our SLEEP time is 50ms.. so * 20
-	// 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, +2 ) );  // 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_ROTOR_STOPPED) );
-							}
-							else
-							{  // use normal turning mode
-								if (curRotorPos != -1)
-								{		
-									mrt = abs(curRotorPos - sat.orbital_position);
-									if (mrt > 1800)
-										mrt = 3600 - mrt;
-									if (mrt % 10)
-										mrt += 10; // round a little bit
-									mrt *= 2000;  // (we assume a very slow rotor with just 0.5 degree per second here)
-									mrt /= 10000;
-									mrt += 3; // a little bit overhead
-								}
-								doSetVoltageToneFrontend=false;
-								doSetFrontend=false;
-								eSecCommand::rotor cmd;
-								eSecCommand::pair compare;
-								compare.voltage = VOLTAGE(13);
-								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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
-	
-								sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) ); // sleep one second before change voltage or tone
-
-								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) );
-
-								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_FINAL_CONT_TONE_CHANGE]) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 0) );
-	
-								cmd.direction=1;  // check for running rotor
-								cmd.deltaA=0;
-								cmd.steps = +3;
-								cmd.okcount=0;
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*4) );  // mrt is in seconds... our SLEEP time is 250ms.. so * 4
-								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, +5 ) );
-								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_ROTOR_STOPPED) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +4) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -5) );
-							}
-							eDebug("set rotor timeout to %d seconds", mrt);
-							sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
-							sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
-						}
-					}
 				}
 			}
 			else
@@ -878,33 +703,17 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
 			sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 
-			if ((doSetVoltageToneFrontend) && (lnb_param.SatCR_idx == -1))
-			{
-				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, 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, m_params[DELAY_AFTER_FINAL_CONT_TONE_CHANGE]) );
-			}
-
-			sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
-
-			if(lnb_param.SatCR_idx != -1)
+			if(is_unicable)
 			{
 				// check if voltage is disabled
 				eSecCommand::pair compare;
 				compare.steps = +3;
 				compare.voltage = iDVBFrontend::voltageOff;
 				sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
-				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
 				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS] ) );
 
-				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18_5) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
 				sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
 				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );  // wait 20 ms after voltage change
 	
@@ -919,9 +728,209 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 				sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 				sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
-				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+				sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
+				if ( RotorCmd != -1 && RotorCmd != lastRotorCmd && !rotor_param.m_inputpower_parameters.m_use)
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
 			}
 
+			eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
+			if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+			{
+				eSecCommand::pair compare;
+				if (!send_mask && !is_unicable)
+				{
+					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_DISABLE_BEFORE_DISEQC]) );
+
+					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(18)) ); // set 18V for measure input power
+					else
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
+
+					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, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
+
+				eDVBDiseqcCommand diseqc;
+				memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+				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 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
+				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;
+				}
+
+				{
+					int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
+					if ( rotor_param.m_inputpower_parameters.m_use)
+					{ // use measure rotor input power to detect rotor state
+						bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed) && !is_unicable;
+						eSecCommand::rotor cmd;
+						eSecCommand::pair compare;
+						if (turn_fast)
+							compare.voltage = VOLTAGE(18);
+						else
+							compare.voltage = VOLTAGE(13);
+						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
+						compare.steps = -2;
+						if (turn_fast) {
+							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.val = 1;
+							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, 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.val = 0;
+						sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
+	////////////////////////////
+						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
+	// 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=+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, turn_fast ? 10 : 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_ROTOR_MOVING) );
+						if (turn_fast)
+							sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*20) );  // mrt is in seconds... our SLEEP time is 50ms.. so * 20
+	// 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, +2 ) );  // 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_ROTOR_STOPPED) );
+					}
+					else
+					{ // use normal turning mode
+						if (curRotorPos != -1)
+						{
+							mrt = abs(curRotorPos - sat.orbital_position);
+							if (mrt > 1800)
+								mrt = 3600 - mrt;
+							if (mrt % 10)
+								mrt += 10; // round a little bit
+							mrt *= 2000;  // (we assume a very slow rotor with just 0.5 degree per second here)
+							mrt /= 10000;
+							mrt += 3; // a little bit overhead
+						}
+						doSetVoltageToneFrontend=false;
+						doSetFrontend=false;
+						eSecCommand::rotor cmd;
+						eSecCommand::pair compare;
+						compare.voltage = VOLTAGE(13);
+						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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
+
+						sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) ); // sleep one second before change voltage or tone
+
+						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) );
+
+						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_FINAL_CONT_TONE_CHANGE]) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 0) );
+
+						cmd.direction=1;  // check for running rotor
+						cmd.deltaA=0;
+						cmd.steps = +3;
+						cmd.okcount=0;
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*4) );  // mrt is in seconds... our SLEEP time is 250ms.. so * 4
+						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, +5 ) );
+						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_ROTOR_STOPPED) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +4) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -5) );
+					}
+					eDebug("set rotor timeout to %d seconds", mrt);
+					sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+					sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+				}
+			}
+
+			if (doSetVoltageToneFrontend && !is_unicable)
+			{
+				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, 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, m_params[DELAY_AFTER_FINAL_CONT_TONE_CHANGE]) );
+			}
+
+			sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
+
 			if (doSetFrontend)
 			{
 				sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
@@ -950,6 +959,40 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 	return -1;
 }
 
+void eDVBSatelliteEquipmentControl::prepareTurnOffSatCR(iDVBFrontend &frontend, int satcr)
+{
+	eSecCommandList sec_sequence;
+
+	// check if voltage is disabled
+	eSecCommand::pair compare;
+	compare.steps = +9;	//only close frontend
+	compare.voltage = iDVBFrontend::voltageOff;
+
+	sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
+
+	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18_5) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );
+
+	eDVBDiseqcCommand diseqc;
+	memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+	diseqc.len = 5;
+	diseqc.data[0] = 0xE0;
+	diseqc.data[1] = 0x10;
+	diseqc.data[2] = 0x5A;
+	diseqc.data[3] = satcr << 5;
+	diseqc.data[4] = 0x00;
+
+	sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+	sec_sequence.push_back( eSecCommand(eSecCommand::DELAYED_CLOSE_FRONTEND) );
+
+	frontend.setSecSequence(sec_sequence);
+}
+
 RESULT eDVBSatelliteEquipmentControl::clear()
 {
 	eSecDebug("eDVBSatelliteEquipmentControl::clear()");
@@ -966,19 +1009,6 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 	//reset some tuner configuration
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
 	{
-		long tmp;
-		char c;
-		if (sscanf(it->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1 && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
-		{
-			FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
-			if (!f || fwrite("B", 1, 1, f) != 1)
-				eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)");
-			else
-			{
-				eDebug("set /proc/stb/tsmux/lnb_b_input to B OK");
-				fclose(f);
-			}
-		}
 		it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1);
 		it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1);
 		it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1);
@@ -1254,6 +1284,26 @@ RESULT eDVBSatelliteEquipmentControl::setLNBSatCRvco(int SatCRvco)
 		return -ENOENT;
 	return 0;
 }
+
+RESULT eDVBSatelliteEquipmentControl::setLNBSatCRpositions(int SatCR_positions)
+{
+	eSecDebug("eDVBSatelliteEquipmentControl::setLNBSatCRpositions(%d)", SatCR_positions);
+	if(SatCR_positions < 1 || SatCR_positions > 2)
+		return -EPERM;
+	if ( currentLNBValid() )
+		m_lnbs[m_lnbidx].SatCR_positions = SatCR_positions;
+	else
+		return -ENOENT;
+	return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::getLNBSatCRpositions()
+{
+	if ( currentLNBValid() )
+		return m_lnbs[m_lnbidx].SatCR_positions;
+	return -ENOENT;
+}
+
 RESULT eDVBSatelliteEquipmentControl::getLNBSatCR()
 {
 	if ( currentLNBValid() )
@@ -1390,17 +1440,6 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 			char c;
 			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
 			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
-			if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && sscanf(p1->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1)
-			{
-				FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
-				if (!f || fwrite("A", 1, 1, f) != 1)
-					eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)");
-				else
-				{
-					eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
-					fclose(f);
-				}
-			}
 		}
 
 		p1=p2=NULL;