X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9d1ad359d7baaa92ebd79b1aaa774c39a1d06163..44ae7fe03c0b6f58b502640593ffb2f0cd9b58a7:/lib/dvb/sec.cpp diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 96729306..23d386eb 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -1,18 +1,11 @@ -#include #include #include #include #if HAVE_DVB_API_VERSION < 3 -#define INVERSION Inversion #define FREQUENCY Frequency -#define FEC_INNER FEC_inner -#define SYMBOLRATE SymbolRate #else -#define INVERSION inversion #define FREQUENCY frequency -#define FEC_INNER fec_inner -#define SYMBOLRATE symbol_rate #endif #include @@ -28,7 +21,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrListgetData(6, curRotorPos); fe->getData(7, linked_to); + fe->getData(8, satpos_depends_to); if ( sat.frequency > lnb_param.m_lof_threshold ) band |= 1; - if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal) + if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)) band |= 2; bool rotor=false; @@ -143,25 +130,27 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite { diseqc=true; if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO ) - { csw = 0xF0 | (csw << 2); + + if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO) csw |= band; - } if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 ) // ROTOR { rotor=true; if ( curRotorPos == sat.orbital_position ) - ret=20; + ret=20; // rotor on correct orbpos = prio 20 else - ret=10; + ret=10; // rotor must turn to correct orbpos = prio 10 } + else + ret = 30; // no rotor = prio 30 } else + { csw = band; - - if (!ret) - ret=40; + ret = 40; // no diseqc = prio 40 + } if (linked_to != -1) // check for linked tuners.. { @@ -197,15 +186,48 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite // eDebug("OK .. can tune this transponder with linked tuner in use :)"); } } + + if (satpos_depends_to != -1) // check for linked tuners.. + { + eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_to; + if ( satpos_depends_to_fe->m_inuse ) + { + int oRotorPos = -1; + satpos_depends_to_fe->m_frontend->getData(6, oRotorPos); + if (!rotor || oRotorPos != sat.orbital_position) + { +// eDebug("can not tune this transponder ... rotor on other tuner is positioned to %d", oRotorPos); + ret=0; + } + } +// else +// eDebug("OK .. can tune this transponder satpos is correct :)"); + } + if (ret) + { + int lof = sat.frequency > lnb_param.m_lof_threshold ? + lnb_param.m_lof_hi : lnb_param.m_lof_lo; + int tuner_freq = abs(sat.frequency - lof); +// eDebug("tuner freq %d", tuner_freq); + if (tuner_freq < 900000 || tuner_freq > 2200000) + { + ret=0; +// eDebug("Transponder not tuneable with this lnb... %d Khz out of tuner range", +// tuner_freq); + } + } } } } return ret; } -RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id) +#define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x) + +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id) { bool linked=false; + bool depend_satpos_mode=false; for (int idx=0; idx <= m_lnbidx; ++idx ) { @@ -220,9 +242,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( sit != lnb_param.m_satellites.end()) { eDVBSatelliteSwitchParameters &sw_param = sit->second; - + bool doSetVoltageToneFrontend = true; int band=0, linked_to=-1, // linked tuner + satpos_depends_to=-1, voltage = iDVBFrontend::voltageOff, tone = iDVBFrontend::toneOff, csw = di_param.m_committed_cmd, @@ -240,6 +263,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA frontend.getData(5, lastRotorCmd); frontend.getData(6, curRotorPos); frontend.getData(7, linked_to); + frontend.getData(8, satpos_depends_to); if (linked_to != -1) { @@ -251,6 +275,18 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA } } + if (satpos_depends_to != -1) + { + eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_to; + if (satpos_fe->m_inuse) + { + if ( di_param.m_diseqc_mode != eDVBSatelliteDiseqcParameters::V1_2 ) + continue; + eDebug("[SEC] frontend is depending on satpos of other one.. so we dont turn rotor!!"); + depend_satpos_mode=true; + } + } + if ( sat.frequency > lnb_param.m_lof_threshold ) band |= 1; @@ -259,47 +295,21 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA else parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo; - if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal) - band |= 2; - - parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF; + parm.FREQUENCY = abs(parm.FREQUENCY); - switch (sat.fec) - { - 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; - } + frontend.setData(9, sat.frequency - parm.FREQUENCY); - parm.u.qpsk.SYMBOLRATE = sat.symbol_rate; + if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)) + band |= 2; if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V - || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical + || ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV ) ) - voltage = iDVBFrontend::voltage13; + voltage = VOLTAGE(13); else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V - || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal + || ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical) && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV ) ) - voltage = iDVBFrontend::voltage18; - + voltage = VOLTAGE(18); if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON) || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) ) tone = iDVBFrontend::toneOn; @@ -312,10 +322,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0) { if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO ) - { csw = 0xF0 | (csw << 2); + + if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO) csw |= band; - } bool send_csw = (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO); @@ -329,50 +339,168 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA (di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO); bool changed_burst = send_burst && toneburst != lastToneburst; - bool send_diseqc = changed_ucsw; - if (!send_diseqc) - send_diseqc = changed_burst && (send_ucsw || send_csw); - if (!send_diseqc) + int send_mask = 0; /* + 1 must send csw + 2 must send ucsw + 4 send toneburst first + 8 send toneburst at end */ + if (changed_burst) // toneburst first and toneburst changed { - send_diseqc = changed_csw; - if ( send_diseqc && di_param.m_use_fast && (csw & 0xF0) && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) ) + if (di_param.m_command_order&1) { - frontend.setData(0, csw); // needed for linked tuner handling - send_diseqc = false; + send_mask |= 4; + if ( send_csw ) + send_mask |= 1; + if ( send_ucsw ) + send_mask |= 2; } + else + send_mask |= 8; + } + if (changed_ucsw) + { + send_mask |= 2; + if ((di_param.m_command_order&4) && send_csw) + send_mask |= 1; + if (di_param.m_command_order==4 && send_burst) + send_mask |= 8; } + if (changed_csw) + { + if ( di_param.m_use_fast + && di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO + && (lastcsw & 0xF0) + && ((csw / 4) == (lastcsw / 4)) ) + eDebug("dont send committed cmd (fast diseqc)"); + else + { + send_mask |= 1; + if (!(di_param.m_command_order&4) && send_ucsw) + send_mask |= 2; + if (!(di_param.m_command_order&1) && send_burst) + send_mask |= 8; + } + } + +#if 0 + eDebugNoNewLine("sendmask: "); + for (int i=3; i >= 0; --i) + if ( send_mask & (1<= 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( 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; + } + } + eDebug("RotorCmd = %04x", RotorCmd); + } + } } - for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat) + if ( send_mask ) { - if ( di_param.m_command_order & 1 && // toneburst at begin of sequence - changed_burst && di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO ) + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) ); + eSecCommand::pair compare; + 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 ( RotorCmd != -1 && RotorCmd != lastRotorCmd ) { - sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); + if (rotor_param.m_inputpower_parameters.m_use) + compare.voltage = VOLTAGE(18); // in input power mode turn rotor always with 18V (fast) + else + compare.voltage = VOLTAGE(13); // in normal mode start turning with 13V } + else + compare.voltage = voltage; - if ( send_diseqc ) + // voltage already correct ? + sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); + compare.steps = +3; + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) ); + // voltage was disabled..so we wait a longer time .. for normal switches 200ms should be enough + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) ); + + for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat) { + if ( send_mask & 4 ) + { + sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); + } + int loops=0; - if ( send_csw ) + if ( send_mask & 1 ) ++loops; - if ( send_ucsw ) + if ( send_mask & 2 ) ++loops; for ( int i=0; i < di_param.m_repeats; ++i ) - loops *= 2; + loops *= 2; for ( int i = 0; i < loops;) // fill commands... { @@ -380,26 +508,30 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA diseqc.len = 4; diseqc.data[0] = i ? 0xE1 : 0xE0; diseqc.data[1] = 0x10; - - if ( !send_csw || (send_ucsw && (di_param.m_command_order & 4) ) ) + if ( (send_mask & 2) && (di_param.m_command_order & 4) ) { diseqc.data[2] = 0x39; diseqc.data[3] = ucsw; } - else + else if ( send_mask & 1 ) { diseqc.data[2] = 0x38; diseqc.data[3] = csw; } + else + { + diseqc.data[2] = 0x00; + diseqc.data[3] = 0x00; + } sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); i++; if ( i < loops ) { int cmd=0; - if (diseqc.data[2] == 0x38 && send_ucsw) + if (diseqc.data[2] == 0x38 && (send_mask & 2)) cmd=0x39; - else if (diseqc.data[2] == 0x39 && send_csw) + else if (diseqc.data[2] == 0x39 && (send_mask & 1)) cmd=0x38; if (cmd) { @@ -419,196 +551,184 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA } else sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); - - frontend.setData(0, csw); - frontend.setData(1, ucsw); - frontend.setData(2, di_param.m_toneburst_param); } - } - if ( !(di_param.m_command_order & 1) && // toneburst at end of sequence - (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, 50) ); - frontend.setData(2, di_param.m_toneburst_param); + 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, 50) ); + } } } - if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 ) + if ( RotorCmd != -1 && RotorCmd != lastRotorCmd ) { - int RotorCmd=0; - bool useGotoXX = false; + eSecCommand::pair compare; + 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(13)) ); // in normal mode start turning with 13V + else + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V + + // voltage was disabled..so we wait a longer time .. + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 500) ); + sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +7) ); // no need to send stop rotor cmd + + if (send_mask) + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd + else + sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +1) ); + + eDVBDiseqcCommand diseqc; + 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 300msec after send rotor stop cmd + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 300) ); - if (sw_param.m_rotorPosNum) // we have stored rotor pos? - RotorCmd=sw_param.m_rotorPosNum; - else // we must calc gotoxx cmd + diseqc.data[0] = 0xE0; + diseqc.data[1] = 0x31; // positioner + if ( useGotoXX ) { - eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 ); - useGotoXX = true; - - int satDir = sat.orbital_position < 0 ? - eDVBSatelliteRotorParameters::WEST : - eDVBSatelliteRotorParameters::EAST; - - 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; - - if (satDir == eDVBSatelliteRotorParameters::WEST ) - SatLon = 360 - SatLon; - - eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon ); - double satHourAngle = - calcSatHourangle( SatLon, SiteLat, SiteLon ); - eDebug("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( 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; - } - } - eDebug("RotorCmd = %04x", RotorCmd); + diseqc.len = 5; + diseqc.data[2] = 0x6E; // drive to angular position + diseqc.data[3] = ((RotorCmd & 0xFF00) / 0x100); + diseqc.data[4] = RotorCmd & 0xFF; } - if ( RotorCmd != lastRotorCmd ) + else { - if ( changed_burst || send_diseqc ) - { - // override first voltage change - *(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13); - // wait 1 second after first switch diseqc command - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) ); - } - else // no other diseqc commands before - { - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) ); // wait 15msec after tone change - 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, iDVBFrontend::voltage13) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec after voltage change - } - - eDVBDiseqcCommand diseqc; - 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.len = 4; + diseqc.data[2] = 0x6B; // goto stored sat position + diseqc.data[3] = RotorCmd; + diseqc.data[4] = 0x00; + } - if ( rotor_param.m_inputpower_parameters.m_use ) - { // use measure rotor input power to detect rotor state - eSecCommand::rotor cmd; + if ( rotor_param.m_inputpower_parameters.m_use ) + { // use measure rotor input power to detect rotor state + eSecCommand::rotor cmd; + eSecCommand::pair compare; + compare.voltage = VOLTAGE(18); + compare.steps = +2; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) ); // measure idle power values - sec_sequence.push_back( eSecCommand(eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO, +8) ); // already measured? - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec after voltage change - sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 100) ); // wait 100msec before measure - sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); // back to lower voltage - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) ); // wait 200msec after voltage change + sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) ); + compare.voltage = 1; + compare.steps = -2; + 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, 200) ); // wait 200msec before measure + sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) ); + compare.voltage = 0; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) ); //////////////////////////// - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec after voltage change - sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) ); // 2 seconds rotor start timout + sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, 2) ); // 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=+3; - 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, +10 ) ); // 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::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, +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_TIMEOUT, 2400) ); // 2 minutes running timeout - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 2400) ); // 2 minutes running timeout + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // 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, +3 ) ); // timeout ? this should never happen - sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // running loop start + 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, +3 ) ); // 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) ); - if ( linked ) - { - frontend.setData(5, RotorCmd); - frontend.setData(6, sat.orbital_position); - } - else - { - frontend.setData(3, RotorCmd); - frontend.setData(4, sat.orbital_position); - } - } - else - eFatal("rotor turning without inputpowermeasure not implemented yet"); } + else + { // use normal turning mode + doSetVoltageToneFrontend=false; + eSecCommand::rotor cmd; + eSecCommand::pair compare; + compare.voltage = VOLTAGE(13); + compare.steps = +2; + 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, 200) ); // wait 200msec after voltage change + + sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); + + 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) ); + + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + + cmd.direction=1; // check for running rotor + cmd.deltaA=0; + cmd.steps=+3; + cmd.okcount=0; + + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 480) ); // 2 minutes running timeout + 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, +3 ) ); + 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_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); + frontend.setData(3, RotorCmd); + frontend.setData(4, sat.orbital_position); } } else - frontend.setData(0, band); // store band as csw .. needed for linked tuner handling + csw = band; + + frontend.setData(0, csw); + frontend.setData(1, ucsw); + frontend.setData(2, di_param.m_toneburst_param); if ( linked ) return 0; - 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, 10) ); - - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) ); + if (doSetVoltageToneFrontend) + { + 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, 10) ); + + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) ); + + sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); + } frontend.setSecSequence(sec_sequence); @@ -616,16 +736,13 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA } } - if (linked) - return 0; - - eDebug("found no satellite configuration for orbital position (%d)", sat.orbital_position ); + eDebug("found no useable satellite configuration for orbital position (%d)", sat.orbital_position ); return -1; } RESULT eDVBSatelliteEquipmentControl::clear() { - for (int i=0; i < m_lnbidx; ++i) + for (int i=0; i <= m_lnbidx; ++i) { m_lnbs[i].m_satellites.clear(); m_lnbs[i].tuner_mask = 0; @@ -639,10 +756,35 @@ RESULT eDVBSatelliteEquipmentControl::clear() return 0; } +// helper function for setTunerLinked and setTunerDepends +RESULT eDVBSatelliteEquipmentControl::setDependencyPointers( int tu1, int tu2, int dest_data_byte ) +{ + if (tu1 == tu2) + return -1; + + eDVBRegisteredFrontend *p1=NULL, *p2=NULL; + + int cnt=0; + for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt) + { + if (cnt == tu1) + p1 = *it; + else if (cnt == tu2) + p2 = *it; + } + if (p1 && p2) + { + p1->m_frontend->setData(dest_data_byte, (int)p2); // this is evil.. + p2->m_frontend->setData(dest_data_byte, (int)p1); + return 0; + } + return -1; +} + /* LNB Specific Parameters */ RESULT eDVBSatelliteEquipmentControl::addLNB() { - if ( m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters))) + if ( (m_lnbidx+1) < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters))) m_curSat=m_lnbs[++m_lnbidx].m_satellites.end(); else { @@ -891,26 +1033,12 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num) RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) { - if (tu1 == tu2) - return -1; - - eDVBRegisteredFrontend *p1=NULL, *p2=NULL; + return setDependencyPointers(tu1, tu2, 7); +} - int cnt=0; - for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt) - { - if (cnt == tu1) - p1 = *it; - else if (cnt == tu2) - p2 = *it; - } - if (p1 && p2) - { - p1->m_frontend->setData(7, (int)p2); // this is evil.. - p2->m_frontend->setData(7, (int)p1); - return 0; - } - return -1; +RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2) +{ + return setDependencyPointers(tu1, tu2, 8); } bool eDVBSatelliteEquipmentControl::isRotorMoving()