X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e768f7667ec5da0e331725de8a582365358cf7e3..3df16a12b479b1d4cfddf75f9129ce652855f1b7:/lib/dvb/sec.cpp diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index aaf459fb..5d74753a 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -1,4 +1,5 @@ #include +#include #include #include @@ -19,8 +20,8 @@ DEFINE_REF(eDVBSatelliteEquipmentControl); eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance; -eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl() - :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()) +eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList &avail_frontends) + :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false) { if (!instance) instance = this; @@ -29,37 +30,72 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl() // ASTRA addLNB(); - setLNBTunerMask(1); + setLNBTunerMask(3); setLNBLOFL(9750000); setLNBThreshold(11750000); - setLNBLOFH(10600000); + setLNBLOFH(10607000); setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0); setToneburst(eDVBSatelliteDiseqcParameters::NO); setRepeats(0); - setCommittedCommand(eDVBSatelliteDiseqcParameters::AA); + setCommittedCommand(eDVBSatelliteDiseqcParameters::BB); setCommandOrder(0); // committed, toneburst - setFastDiSEqC(false); + setFastDiSEqC(true); setSeqRepeat(false); addSatellite(192); setVoltageMode(eDVBSatelliteSwitchParameters::HV); setToneMode(eDVBSatelliteSwitchParameters::HILO); -// HOTBIRD +// Hotbird addLNB(); - setLNBTunerMask(1); + setLNBTunerMask(3); setLNBLOFL(9750000); - setLNBLOFH(10600000); setLNBThreshold(11750000); + setLNBLOFH(10600000); setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0); setToneburst(eDVBSatelliteDiseqcParameters::NO); setRepeats(0); setCommittedCommand(eDVBSatelliteDiseqcParameters::AB); setCommandOrder(0); // committed, toneburst - setFastDiSEqC(false); + setFastDiSEqC(true); setSeqRepeat(false); addSatellite(130); setVoltageMode(eDVBSatelliteSwitchParameters::HV); setToneMode(eDVBSatelliteSwitchParameters::HILO); + +// Rotor + addLNB(); + setLNBTunerMask(3); + setLNBLOFL(9750000); + setLNBThreshold(11750000); + setLNBLOFH(10600000); + setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2); + setToneburst(eDVBSatelliteDiseqcParameters::NO); + setRepeats(0); + setCommittedCommand(eDVBSatelliteDiseqcParameters::AA); + setCommandOrder(0); // committed, toneburst + setFastDiSEqC(true); + setSeqRepeat(false); + setLaDirection(eDVBSatelliteRotorParameters::NORTH); + setLoDirection(eDVBSatelliteRotorParameters::EAST); + setLatitude(51.017); + setLongitude(8.683); + setUseInputpower(true); + setInputpowerDelta(50); + + addSatellite(235); + setVoltageMode(eDVBSatelliteSwitchParameters::HV); + setToneMode(eDVBSatelliteSwitchParameters::HILO); + setRotorPosNum(0); + + addSatellite(284); + setVoltageMode(eDVBSatelliteSwitchParameters::HV); + setToneMode(eDVBSatelliteSwitchParameters::HILO); + setRotorPosNum(0); + + addSatellite(420); + setVoltageMode(eDVBSatelliteSwitchParameters::HV); + setToneMode(eDVBSatelliteSwitchParameters::HILO); + setRotorPosNum(1); // stored pos 1 } int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id ) @@ -72,35 +108,123 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner? { eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters; - eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters; std::map::iterator sit = lnb_param.m_satellites.find(sat.orbital_position); if ( sit != lnb_param.m_satellites.end()) { - int curRotorPos = -1; + int band=0, + linked_to=-1, // linked tuner + satpos_depends_to=-1, + csw = di_param.m_committed_cmd, + ucsw = di_param.m_uncommitted_cmd, + toneburst = di_param.m_toneburst_param, + curRotorPos; + fe->getData(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) + band |= 2; + + bool rotor=false; + bool diseqc=false; - if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 ) // ROTOR + if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0) { - if ( curRotorPos == sat.orbital_position ) - ret=20; - else - ret=10; + diseqc=true; + if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO ) + csw = 0xF0 | (csw << 2); + + csw |= band; + + if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 ) // ROTOR + { + rotor=true; + if ( curRotorPos == sat.orbital_position ) + ret=20; + else + ret=10; + } } - else if (!ret) + else + csw = band; + + if (!ret) ret=40; + + if (linked_to != -1) // check for linked tuners.. + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to; + if (linked_fe->m_inuse) + { + int ocsw = -1, + oucsw = -1, + oToneburst = -1, + oRotorPos = -1; + linked_fe->m_frontend->getData(0, ocsw); + linked_fe->m_frontend->getData(1, oucsw); + linked_fe->m_frontend->getData(2, oToneburst); + linked_fe->m_frontend->getData(6, oRotorPos); +#if 0 + eDebug("compare csw %02x == lcsw %02x", + csw, ocsw); + if ( diseqc ) + eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x", + ucsw, oucsw, toneburst, oToneburst); + if ( rotor ) + eDebug("compare pos %d == current pos %d", + sat.orbital_position, oRotorPos); +#endif + if ( (csw != ocsw) || + ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || + ( rotor && oRotorPos != sat.orbital_position ) ) + { +// eDebug("can not tune this transponder with linked tuner in use!!"); + ret=0; + } +// else +// 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 :)"); + } } } } return ret; } -RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat) +#define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x) + +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id) { + bool linked=false; + bool depend_satpos_mode=false; + for (int idx=0; idx <= m_lnbidx; ++idx ) { eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx]; + if (!(lnb_param.tuner_mask & frontend_id)) // lnb for correct tuner? + continue; eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters; eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters; @@ -110,7 +234,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA { eDVBSatelliteSwitchParameters &sw_param = sit->second; - int hi=0, + int band=0, + linked_to=-1, // linked tuner + satpos_depends_to=-1, voltage = iDVBFrontend::voltageOff, tone = iDVBFrontend::toneOff, csw = di_param.m_committed_cmd, @@ -127,16 +253,55 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA frontend.getData(2, lastToneburst); frontend.getData(5, lastRotorCmd); frontend.getData(6, curRotorPos); + frontend.getData(7, linked_to); + frontend.getData(8, satpos_depends_to); + + if (linked_to != -1) + { + eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to; + if (linked_fe->m_inuse) + { + eDebug("[SEC] frontend is linked with another and the other one is in use.. so we dont do SEC!!"); + linked=true; + } + } + + 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 ) - hi = 1; + band |= 1; - if (hi) + if (band&1) parm.FREQUENCY = sat.frequency - lnb_param.m_lof_hi; else parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo; - parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF; + if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal) + band |= 2; + + switch (sat.inversion) + { + case eDVBFrontendParametersCable::Inversion::On: + parm.INVERSION = INVERSION_ON; + break; + case eDVBFrontendParametersCable::Inversion::Off: + parm.INVERSION = INVERSION_OFF; + break; + default: + case eDVBFrontendParametersCable::Inversion::Unknown: + parm.INVERSION = INVERSION_AUTO; + break; + } switch (sat.fec) { @@ -168,17 +333,16 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V || ( 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 && 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 && hi ) ) + || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) ) tone = iDVBFrontend::toneOn; else if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::OFF) - || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !hi ) ) + || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !(band&1) ) ) tone = iDVBFrontend::toneOff; eSecCommandList sec_sequence; @@ -186,13 +350,9 @@ 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 (hi) - csw |= 1; - if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal) - csw |= 2; - } + + csw |= band; bool send_csw = (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO); @@ -206,17 +366,57 @@ 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 + { + if (di_param.m_command_order&1) + { + send_mask |= 4; + if ( send_csw ) + send_mask |= 1; + if ( send_ucsw ) + send_mask |= 2; + } + else + send_mask |= 8; + } + if (changed_ucsw) { - send_diseqc = changed_csw; - if ( send_diseqc && di_param.m_use_fast && (csw & 0xF0) && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) ) - send_diseqc = false; + 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 && (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 ( send_diseqc || changed_burst ) +#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 ]; + static int gotoXTable[10] = + { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E }; - if (satHourAngle < 180) // the east - RotorCmd |= 0xE000; - else // west - RotorCmd |= 0xD000; - } - else // Southern Hemisphere - { - if (satHourAngle < 180) // the east + if (SiteLat >= 0) // Northern Hemisphere { - int tmp=(int)round( fabs( satHourAngle ) * 10.0 ); + int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 ); RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ]; - RotorCmd |= 0xD000; + + if (satHourAngle < 180) // the east + RotorCmd |= 0xE000; + else // west + RotorCmd |= 0xD000; } - else // west - { - int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 ); - RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ]; - RotorCmd |= 0xE000; + 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); } - eDebug("RotorCmd = %04x", RotorCmd); - } - if ( RotorCmd != lastRotorCmd ) - { - 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 + if ( RotorCmd != lastRotorCmd ) { - 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 - } + if ( send_mask ) + { + // override first voltage change + *(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)); + // 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, VOLTAGE(13)) ); + 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; - } + 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.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; // 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::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, VOLTAGE(18)) ); + 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, VOLTAGE(13)) ); // back to lower voltage + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec //////////////////////////// - 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::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 // 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=+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, +9 ) ); // 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::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) ); - frontend.setData(3, RotorCmd); - frontend.setData(4, sat.orbital_position); + 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 + eFatal("rotor turning without inputpowermeasure not implemented yet"); } - else - eFatal("rotor turning without inputpowermeasure not implemented yet"); } } } + else + 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; @@ -477,8 +680,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA } } - 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; } @@ -490,9 +692,39 @@ RESULT eDVBSatelliteEquipmentControl::clear() m_lnbs[i].tuner_mask = 0; } m_lnbidx=-1; + +// clear linked tuner configuration + for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it) + it->m_frontend->setData(7, -1); + 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() { @@ -742,3 +974,23 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num) return -ENOENT; return 0; } + +RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) +{ + return setDependencyPointers(tu1, tu2, 7); +} + +RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2) +{ + return setDependencyPointers(tu1, tu2, 8); +} + +bool eDVBSatelliteEquipmentControl::isRotorMoving() +{ + return m_rotorMoving; +} + +void eDVBSatelliteEquipmentControl::setRotorMoving(bool b) +{ + m_rotorMoving=b; +}