X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d0d9ad2cf4891c5386a3d8ca040c2738b5c2532..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index c4d64122..d8301db8 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1069,10 +1069,8 @@ PyObject *eDVBFrontend::readTransponderData(bool original)
 		}
 	}
 	else
-	{
-		Py_INCREF(Py_None);
-		ret = Py_None;
-	}
+		Py_RETURN_NONE;
+
 	return ret;
 }
 
@@ -1147,7 +1145,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 			case eSecCommand::IF_VOLTAGE_GOTO:
 			{
 				eSecCommand::pair &compare = m_sec_sequence.current()->compare;
-				if ( compare.voltage == m_curVoltage && setSecSequencePos(compare.steps) )
+				if ( compare.voltage == m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
 					break;
 				++m_sec_sequence.current();
 				break;
@@ -1155,7 +1153,23 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 			case eSecCommand::IF_NOT_VOLTAGE_GOTO:
 			{
 				eSecCommand::pair &compare = m_sec_sequence.current()->compare;
-				if ( compare.voltage != m_curVoltage && setSecSequencePos(compare.steps) )
+				if ( compare.voltage != m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
+					break;
+				++m_sec_sequence.current();
+				break;
+			}
+			case eSecCommand::IF_TONE_GOTO:
+			{
+				eSecCommand::pair &compare = m_sec_sequence.current()->compare;
+				if ( compare.tone == m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
+					break;
+				++m_sec_sequence.current();
+				break;
+			}
+			case eSecCommand::IF_NOT_TONE_GOTO:
+			{
+				eSecCommand::pair &compare = m_sec_sequence.current()->compare;
+				if ( compare.tone != m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
 					break;
 				++m_sec_sequence.current();
 				break;
@@ -1214,7 +1228,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 			case eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO:
 			{
 				eSecCommand::pair &compare = m_sec_sequence.current()->compare;
-				int idx = compare.voltage;
+				int idx = compare.val;
 				if ( idx == 0 || idx == 1 )
 				{
 					int idle = readInputpower();
@@ -1261,7 +1275,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				break;
 			case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
 			{
-				int idleInputpower = m_idleInputpower[ (m_curVoltage&1) ? 0 : 1];
+				int idleInputpower = m_idleInputpower[ (m_data[CUR_VOLTAGE]&1) ? 0 : 1];
 				eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
 				const char *txt = cmd.direction ? "running" : "stopped";
 				eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d",
@@ -1834,7 +1848,7 @@ RESULT eDVBFrontend::setVoltage(int voltage)
 	bool increased=false;
 	fe_sec_voltage_t vlt;
 #endif
-	m_curVoltage=voltage;
+	m_data[CUR_VOLTAGE]=voltage;
 	switch (voltage)
 	{
 	case voltageOff:
@@ -1889,7 +1903,7 @@ RESULT eDVBFrontend::setTone(int t)
 #else
 	fe_sec_tone_mode_t tone;
 #endif
-
+	m_data[CUR_TONE]=t;
 	switch (t)
 	{
 	case toneOn:
@@ -1999,7 +2013,8 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
 	{
 		ASSERT(m_sec);
 		eDVBFrontendParametersSatellite sat_parm;
-		ASSERT(!feparm->getDVBS(sat_parm));
+		int ret = feparm->getDVBS(sat_parm);
+		ASSERT(!ret);
 		return m_sec->canTune(sat_parm, this, 1 << m_fe);
 	}
 	else if (m_type == eDVBFrontend::feCable)