diseqc 1.1 should be working now

1 files changed, 131 insertions, 35 deletions

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 78e5949e..c59f9280 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -28,7 +28,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 	lnb_ref.m_lof_threshold = 11700000;
 
 	diseqc_ref.m_diseqc_mode = eDVBSatelliteDiseqcParameters::V1_0;
-	diseqc_ref.m_commited_cmd = eDVBSatelliteDiseqcParameters::BB;
+	diseqc_ref.m_committed_cmd = eDVBSatelliteDiseqcParameters::BB;
 	diseqc_ref.m_repeats = 0;
 	diseqc_ref.m_seq_repeat = false;
 	diseqc_ref.m_swap_cmds = false;
@@ -50,12 +50,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			lnb_param.m_satellites.find(sat.orbital_position);
 		if ( sit != lnb_param.m_satellites.end())
 		{
-			int hi=0;
-			int voltage = iDVBFrontend::voltageOff;
-			int tone = iDVBFrontend::toneOff;
-
 			eDVBSatelliteDiseqcParameters &di_param = sit->second.m_diseqc_parameters;
 			eDVBSatelliteSwitchParameters &sw_param = sit->second.m_switch_parameters;
+			int hi=0,
+				voltage = iDVBFrontend::voltageOff,
+				tone = iDVBFrontend::toneOff,
+				csw = di_param.m_committed_cmd,
+				ucsw = di_param.m_uncommitted_cmd,
+				toneburst = di_param.m_toneburst_param,
+				lastcsw = -1,
+				lastucsw = -1,
+				lastToneburst = -1,
+				curRotorPos = -1;
+
+			frontend.getData(0, lastcsw);
+			frontend.getData(1, lastucsw);
+			frontend.getData(2, lastToneburst);
+			frontend.getData(3, curRotorPos);
 
 			if ( sat.frequency > lnb_param.m_lof_threshold )
 				hi = 1;
@@ -69,11 +80,27 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 			switch (sat.fec)
 			{
-		//		case 1:
-		//		case ...:
-			default:
-				parm.u.qpsk.FEC_INNER = FEC_AUTO;
-				break;
+				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;
 			}
 
 			parm.u.qpsk.SYMBOLRATE = sat.symbol_rate;
@@ -96,40 +123,109 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 			eSecCommandList sec_sequence;
 
-			if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
-			{
-				eDebug("rotor...");
-			}
-			else if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
+			if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
 			{
-				if ( di_param.m_commited_cmd < eDVBSatelliteDiseqcParameters::SENDNO ||
-					di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
+				if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
 				{
-					sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );
+					csw = 0xF0 | (csw << 2);
+					if (hi)
+						csw |= 1;
+					if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
+						csw |= 2;
 				}
 
-				if ( di_param.m_commited_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
-				{
-					eDVBDiseqcCommand diseqc;
-					diseqc.len = 4;
-					diseqc.data[0] = 0xe0;
-					diseqc.data[1] = 0x10;
-					diseqc.data[2] = 0x38;
-					diseqc.data[3] = 0xF0 | (di_param.m_commited_cmd << 2);
+				bool send_csw =
+					(di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);
+				bool changed_csw = send_csw && csw != lastcsw;
 
-					if (hi)
-						diseqc.data[3] |= 1;
+				bool send_ucsw =
+					(di_param.m_uncommitted_cmd && di_param.m_diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0);
+				bool changed_ucsw = send_ucsw && ucsw != lastucsw;
 
-					if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
-						diseqc.data[3] |= 2;
+				bool send_burst =
+					(di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
+				bool changed_burst = send_burst && toneburst != lastToneburst;
 
-					sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );
+				bool send_diseqc = changed_ucsw;
+				if (!send_diseqc)
+					send_diseqc = changed_burst && (send_ucsw || send_csw);
+				if (!send_diseqc)
+				{
+					send_diseqc = changed_csw;
+					if ( send_diseqc && di_param.m_use_fast && (csw & 0xF0) && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) )
+						send_diseqc = false;
 				}
 
-				if ( di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
+				if ( send_diseqc || changed_burst )
+				{
+					sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
+					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );  // standard says 15 msek here
+				}
+
+				if ( send_diseqc )
+				{
+					int loops=0;
+
+					if ( send_csw )
+						++loops;
+					if ( send_ucsw )
+						++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_csw || (di_param.m_swap_cmds && send_ucsw) )
+						{
+							diseqc.data[2] = 0x39;
+							diseqc.data[3] = ucsw;
+						}
+						else
+						{
+							diseqc.data[2] = 0x38;
+							diseqc.data[3] = csw;
+						}
+						sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+
+						i++;
+						if ( i < loops )
+						{
+							int cmd=0;
+							if (diseqc.data[2] == 0x38 && send_ucsw)
+								cmd=0x39;
+							else if (diseqc.data[2] == 0x39 && send_csw)
+								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, 30) );
+							}
+							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, 30) );
+					}
+				}
+				if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 && curRotorPos != sat.orbital_position )
+				{
+				}
+				if ( (changed_burst || send_diseqc) && di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
 				{
 					sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
 					sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 30) );