X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c650b2ace739188d451031e19d116a4669a61326..6aa0ed7fff929c4b2651667ab809d0ace1dac56d:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 25eb9766..cfd2610d 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -290,6 +290,8 @@ RESULT eDVBFrontendParameters::calculateDifference(const iDVBFrontendParameters
 			diff = 1<<28;
 		else if (exact && sat.fec != osat.fec && sat.fec != eDVBFrontendParametersSatellite::FEC::fAuto && osat.fec != eDVBFrontendParametersSatellite::FEC::fAuto)
 			diff = 1<<27;
+		else if (exact && sat.modulation != osat.modulation && sat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto && osat.modulation != eDVBFrontendParametersSatellite::Modulation::Auto)
+			diff = 1<<27;
 		else
 		{
 			diff = abs(sat.frequency - osat.frequency);
@@ -1348,8 +1350,9 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				break;
 			}
 			default:
+				eDebug("[SEC] unhandled sec command %d",
+					++m_sec_sequence.current()->cmd);
 				++m_sec_sequence.current();
-				eDebug("[SEC] unhandled sec command");
 		}
 		m_tuneTimer->start(delay,true);
 	}
@@ -1386,13 +1389,14 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm)
 	res = m_sec->prepare(*this, parm, feparm, 1 << m_fe);
 	if (!res)
 	{
-		eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d",
+		eDebug("prepare_sat System %d Freq %d Pol %d SR %d INV %d FEC %d orbpos %d",
 			feparm.system,
 			feparm.frequency,
 			feparm.polarisation,
 			feparm.symbol_rate,
 			feparm.inversion,
-			feparm.fec);
+			feparm.fec,
+			feparm.orbital_position);
 		parm_u_qpsk_symbol_rate = feparm.symbol_rate;
 		switch (feparm.inversion)
 		{
@@ -1716,11 +1720,15 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	if (!m_sn)
 	{
 		eDebug("no frontend device opened... do not try to tune !!!");
-		return -ENODEV;
+		res = -ENODEV;
+		goto tune_error;
 	}
 
 	if (m_type == -1)
-		return -ENODEV;
+	{
+		res = -ENODEV;
+		goto tune_error;
+	}
 
 	m_sn->stop();
 	m_sec_sequence.clear();
@@ -1733,23 +1741,30 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		if (where.getDVBS(feparm))
 		{
 			eDebug("no dvbs data!");
-			return -EINVAL;
+			res = -EINVAL;
+			goto tune_error;
 		}
-		res=prepare_sat(feparm);
 		m_sec->setRotorMoving(false);
+		res=prepare_sat(feparm);
+		if (res)
+			goto tune_error;
+
 		break;
 	}
 	case feCable:
 	{
 		eDVBFrontendParametersCable feparm;
 		if (where.getDVBC(feparm))
-			return -EINVAL;
-		res=prepare_cable(feparm);
-		if (!res)
 		{
-			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
-			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+			res = -EINVAL;
+			goto tune_error;
 		}
+		res=prepare_cable(feparm);
+		if (res)
+			goto tune_error;
+
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
 		break;
 	}
 	case feTerrestrial:
@@ -1758,40 +1773,43 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		if (where.getDVBT(feparm))
 		{
 			eDebug("no -T data");
-			return -EINVAL;
+			res = -EINVAL;
+			goto tune_error;
 		}
 		res=prepare_terrestrial(feparm);
-		if (!res)
-		{
-			std::string enable_5V;
-			char configStr[255];
-			snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe);
-			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
-			ePythonConfigQuery::getConfigValue(configStr, enable_5V);
-			if (enable_5V == "on")
-				m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
-			else
-				m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
-			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
-		}
+		if (res)
+			goto tune_error;
+
+		std::string enable_5V;
+		char configStr[255];
+		snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe);
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+		ePythonConfigQuery::getConfigValue(configStr, enable_5V);
+		if (enable_5V == "on")
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+		else
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
+		m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+
 		break;
 	}
 	}
 
-	if (!res)  // prepare ok
-	{
-		m_tuneTimer->start(0,true);
-		m_sec_sequence.current() = m_sec_sequence.begin();
+	m_tuneTimer->start(0,true);
+	m_sec_sequence.current() = m_sec_sequence.begin();
 
-		if (m_state != stateTuning)
-		{
-			m_tuning = 1;
-			m_state = stateTuning;
-			m_stateChanged(this);
-		}
+	if (m_state != stateTuning)
+	{
+		m_tuning = 1;
+		m_state = stateTuning;
+		m_stateChanged(this);
 	}
 
 	return res;
+
+tune_error:
+	m_tuneTimer->stop();
+	return res;
 }
 
 RESULT eDVBFrontend::connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)