X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2a42c0a723a4013263ba08e745a26994c237d928..ea33c2a4181fc803b23830feba68bebe0d9f0852:/lib/dvb/sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index e4f00add..851e9b1d 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -378,7 +378,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			if(!is_unicable)
 			{
 				// calc Frequency
-				int local= abs(sat.frequency 
+				int local= abs(sat.frequency
 					- lof);
 				parm.FREQUENCY = ((((local * 2) / 125) + 1) / 2) * 125;
 				frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
@@ -400,7 +400,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			}
 			else
 			{
-				int tmp1 = abs(sat.frequency 
+				int tmp1 = abs(sat.frequency
 						-lof)
 						+ lnb_param.SatCRvco
 						- 1400000
@@ -464,7 +464,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					if (di_param.m_command_order==4 && send_burst)
 						send_mask |= 8;
 				}
-				if (changed_csw) 
+				if (changed_csw)
 				{
 					if ( di_param.m_use_fast
 						&& di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO
@@ -490,207 +490,202 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						eDebugNoNewLine("0");
 				eDebug("");
 #endif
-				if (doSetVoltageToneFrontend)
+				if ( diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+					&& !sat.no_rotor_command_on_tune )
 				{
-
-					if ( diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
-						&& !sat.no_rotor_command_on_tune )
+					if (sw_param.m_rotorPosNum) // we have stored rotor pos?
+						RotorCmd=sw_param.m_rotorPosNum;
+					else  // we must calc gotoxx cmd
 					{
-						if (sw_param.m_rotorPosNum) // we have stored rotor pos?
-							RotorCmd=sw_param.m_rotorPosNum;
-						else  // we must calc gotoxx cmd
+						eDebugNoSimulate("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
+						useGotoXX = true;
+
+						double	SatLon = abs(sat.orbital_position)/10.00,
+								SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
+								SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
+
+						if ( rotor_param.m_gotoxx_parameters.m_la_direction == eDVBSatelliteRotorParameters::SOUTH )
+							SiteLat = -SiteLat;
+
+						if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
+							SiteLon = 360 - SiteLon;
+
+						eDebugNoSimulate("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
+						double satHourAngle =
+							calcSatHourangle( SatLon, SiteLat, SiteLon );
+						eDebugNoSimulate("PolarmountHourAngle=%lf", satHourAngle );
+
+						static int gotoXTable[10] =
+							{ 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
+
+						if (SiteLat >= 0) // Northern Hemisphere
 						{
-							eDebugNoSimulate("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
-							useGotoXX = true;
-	
-							double	SatLon = abs(sat.orbital_position)/10.00,
-									SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
-									SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
-	
-							if ( rotor_param.m_gotoxx_parameters.m_la_direction == eDVBSatelliteRotorParameters::SOUTH )
-								SiteLat = -SiteLat;
-	
-							if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
-								SiteLon = 360 - SiteLon;
-	
-							eDebugNoSimulate("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
-							double satHourAngle =
-								calcSatHourangle( SatLon, SiteLat, SiteLon );
-							eDebugNoSimulate("PolarmountHourAngle=%lf", satHourAngle );
-	
-							static int gotoXTable[10] =
-								{ 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
-	
-							if (SiteLat >= 0) // Northern Hemisphere
+							int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 );
+							RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+
+							if (satHourAngle < 180) // the east
+								RotorCmd |= 0xE000;
+							else					// west
+								RotorCmd |= 0xD000;
+						}
+						else // Southern Hemisphere
+						{
+							if (satHourAngle < 180) // the east
 							{
-								int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 );
+								int tmp=(int)round( fabs( satHourAngle ) * 10.0 );
 								RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-	
-								if (satHourAngle < 180) // the east
-									RotorCmd |= 0xE000;
-								else					// west
-									RotorCmd |= 0xD000;
+								RotorCmd |= 0xD000;
 							}
-							else // Southern Hemisphere
+							else // west
 							{
-								if (satHourAngle < 180) // the east
-								{
-									int tmp=(int)round( fabs( satHourAngle ) * 10.0 );
-									RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-									RotorCmd |= 0xD000;
-								}
-								else // west
-								{
-									int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
-									RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-									RotorCmd |= 0xE000;
-								}
+								int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
+								RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+								RotorCmd |= 0xE000;
 							}
-							eDebugNoSimulate("RotorCmd = %04x", RotorCmd);
 						}
+						eDebugNoSimulate("RotorCmd = %04x", RotorCmd);
 					}
+				}
 
-					if ( send_mask )
+				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;
+					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]) );
+
+					if (diseqc13V)
+						vlt = iDVBFrontend::voltage13;
+					else if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 					{
-						int diseqc_repeats = diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0 ? di_param.m_repeats : 0;
-						int vlt = iDVBFrontend::voltageOff;
-						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_DISABLE_BEFORE_DISEQC]) );
-
-						if (diseqc13V)
-							vlt = iDVBFrontend::voltage13;
-						else if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
-						{
-							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
-						}
+						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;
+							vlt = VOLTAGE(13);  // in normal mode start turning with 13V
+					}
+					else
+						vlt = voltage;
 
-						// check if voltage is already correct..
-						compare.voltage = vlt;
-						compare.steps = +7;
-						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
+					// check if voltage is already correct..
+					compare.voltage = vlt;
+					compare.steps = +7;
+					sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 
-						// check if voltage is disabled
-						compare.voltage = iDVBFrontend::voltageOff;
-						compare.steps = +4;
-						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
+					// check if voltage is disabled
+					compare.voltage = iDVBFrontend::voltageOff;
+					compare.steps = +4;
+					sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 
-						// voltage is changed... use DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS
-						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
+					// voltage is changed... use DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS
+					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
 
-						// voltage was disabled.. use DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS
-						sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
-						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
+					// voltage was disabled.. use DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS
+					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
 
-						sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
-						if (needDiSEqCReset)
-						{
-							eDVBDiseqcCommand diseqc;
-							memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
-							diseqc.len = 3;
-							diseqc.data[0] = 0xE0;
-							diseqc.data[1] = 0;
-							diseqc.data[2] = 0;
-							// diseqc reset
-							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_RESET_CMD]) );
-							diseqc.data[2] = 3;
-							// diseqc peripherial powersupply on
-							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD]) );
-						}
+					sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
+					if (needDiSEqCReset)
+					{
+						eDVBDiseqcCommand diseqc;
+						memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+						diseqc.len = 3;
+						diseqc.data[0] = 0xE0;
+						diseqc.data[1] = 0;
+						diseqc.data[2] = 0;
+						// diseqc reset
+						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_RESET_CMD]) );
+						diseqc.data[2] = 3;
+						// diseqc peripherial powersupply on
+						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+						sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD]) );
+					}
 
-						for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+					for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+					{
+						if ( send_mask & 4 )
 						{
-							if ( send_mask & 4 )
-							{
-								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
-							}
+							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
+						}
 
-							int loops=0;
+						int loops=0;
 
-							if ( send_mask & 1 )
-								++loops;
-							if ( send_mask & 2 )
-								++loops;
+						if ( send_mask & 1 )
+							++loops;
+						if ( send_mask & 2 )
+							++loops;
 
-							loops <<= diseqc_repeats;
+						loops <<= diseqc_repeats;
 
-							for ( int i = 0; i < loops;)  // fill commands...
+						for ( int i = 0; i < loops;)  // fill commands...
+						{
+							eDVBDiseqcCommand diseqc;
+							memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+							diseqc.len = 4;
+							diseqc.data[0] = i ? 0xE1 : 0xE0;
+							diseqc.data[1] = 0x10;
+							if ( (send_mask & 2) && (di_param.m_command_order & 4) )
 							{
-								eDVBDiseqcCommand diseqc;
-								memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
-								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  // no committed command confed.. so send uncommitted..
-								{
-									diseqc.data[2] = 0x39;
-									diseqc.data[3] = ucsw;
-								}
-								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;
-									int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
-									if (cmd)
-									{
-										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;
-										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, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
-									}
-									else  // delay 120msek when no command is in repeat gap
-										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) );
-								}
-								else
-									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+								diseqc.data[2] = 0x39;
+								diseqc.data[3] = ucsw;
+							}
+							else if ( send_mask & 1 )
+							{
+								diseqc.data[2] = 0x38;
+								diseqc.data[3] = csw;
 							}
+							else  // no committed command confed.. so send uncommitted..
+							{
+								diseqc.data[2] = 0x39;
+								diseqc.data[3] = ucsw;
+							}
+							sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
-							if ( send_mask & 8 )  // toneburst at end of sequence
+							i++;
+							if ( i < loops )
 							{
-								sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
+								int cmd=0;
+								if (diseqc.data[2] == 0x38 && (send_mask & 2))
+									cmd=0x39;
+								else if (diseqc.data[2] == 0x39 && (send_mask & 1))
+									cmd=0x38;
+								int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
+								if (cmd)
+								{
+									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;
+									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, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+								}
+								else  // delay 120msek when no command is in repeat gap
+									sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) );
 							}
+							else
+								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+						}
 
-							if (di_param.m_seq_repeat && seq_repeat == 0)
-								sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
+						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, m_params[DELAY_AFTER_TONEBURST]) );
 						}
-					}
 
+						if (di_param.m_seq_repeat && seq_repeat == 0)
+							sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
+					}
 				}
 			}
 			else
@@ -736,6 +731,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
 			if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 			{
+				int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
 				eSecCommand::pair compare;
 				if (!send_mask && !is_unicable)
 				{
@@ -792,127 +788,126 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					diseqc.data[4] = 0x00;
 				}
 
+			// use measure rotor input power to detect motor state
+				if ( rotor_param.m_inputpower_parameters.m_use)
 				{
-					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) );
-					}
+					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
-					{ // 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) );
+					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) );
+				}
+			// use normal motor turning mode
+				else
+				{
+					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);
 				}
+				sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+				sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
 			}
 
 			if (doSetVoltageToneFrontend && !is_unicable)