From: Andreas Monzner Date: Fri, 8 Jun 2007 12:01:25 +0000 (+0000) Subject: hopefully fix "secondary cable from motorized tuner" setting X-Git-Tag: 2.6.0~2187 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/49fbebfa0877a8c794163b5b0fcb89fd38141c1b hopefully fix "secondary cable from motorized tuner" setting some code cleanups now link tuners in all directions should be possible --- diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 9ebe08a1..0184347b 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -255,7 +255,7 @@ void eDVBResourceManager::setFrontendSlotInformations(ePyObject list) PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list"); return; } - if (PyList_Size(list) != m_frontend.size()) + if ((unsigned int)PyList_Size(list) != m_frontend.size()) { char blasel[256]; sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist", @@ -303,10 +303,46 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i) if (!i->m_inuse && i->m_frontend->getSlotID() == slot_index) { + // check if another slot linked to this is in use + eDVBRegisteredFrontend *satpos_depends_to_fe = + (eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR]; + if ( (int)satpos_depends_to_fe != -1 ) + { + if (satpos_depends_to_fe->m_inuse) + { + eDebug("another satpos depending frontend is in use.. so allocateFrontendByIndex not possible!"); + goto alloc_fe_by_id_not_possible; + } + } + else // check linked tuners + { + eDVBRegisteredFrontend *next = + (eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR]; + while ( (int)next != -1 ) + { + if (next->m_inuse) + { + eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!"); + goto alloc_fe_by_id_not_possible; + } + next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR]; + } + eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *) + i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR]; + while ( (int)prev != -1 ) + { + if (prev->m_inuse) + { + eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!"); + goto alloc_fe_by_id_not_possible; + } + prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR]; + } + } fe = new eDVBAllocatedFrontend(i); return 0; } - +alloc_fe_by_id_not_possible: fe = 0; return -1; } @@ -553,7 +589,6 @@ int eDVBResourceManager::canAllocateFrontend(ePtr &fepar if (c > bestval) bestval = c; } - return bestval; } diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index b6e5e8ab..4df362e4 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -383,8 +383,8 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const DEFINE_REF(eDVBFrontend); eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) - :m_type(-1), m_dvbid(fe), m_slotid(fe), m_need_rotor_workaround(false) - ,m_fd(-1), m_sn(0), m_timeout(0), m_tuneTimer(0) + :m_type(-1), m_dvbid(fe), m_slotid(fe) + ,m_fd(-1), m_need_rotor_workaround(false), m_sn(0), m_timeout(0), m_tuneTimer(0) #if HAVE_DVB_API_VERSION < 3 ,m_secfd(-1) #endif @@ -1164,6 +1164,35 @@ bool eDVBFrontend::setSecSequencePos(int steps) return true; } +void eDVBFrontend::setRotorData(int pos, int cmd) +{ + m_data[ROTOR_CMD] = cmd; + m_data[ROTOR_POS] = pos; + if ( m_data[SATPOS_DEPENDS_PTR] != -1 ) + { + eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) m_data[SATPOS_DEPENDS_PTR]; + satpos_depends_to_fe->m_frontend->m_data[ROTOR_CMD] = cmd; + satpos_depends_to_fe->m_frontend->m_data[ROTOR_POS] = pos; + } + else + { + eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR]; + while ( (int)next != -1 ) + { + next->m_frontend->m_data[ROTOR_CMD] = cmd; + next->m_frontend->m_data[ROTOR_POS] = pos; + next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[LINKED_NEXT_PTR]; + } + eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)m_data[LINKED_PREV_PTR]; + while ( (int)prev != -1 ) + { + prev->m_frontend->m_data[ROTOR_CMD] = cmd; + prev->m_frontend->m_data[ROTOR_POS] = pos; + prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[LINKED_PREV_PTR]; + } + } +} + void eDVBFrontend::tuneLoop() // called by m_tuneTimer { int delay=0; @@ -1359,14 +1388,13 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer ++m_sec_sequence.current(); break; case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS: - m_data[ROTOR_CMD] = m_data[ROTOR_POS] = -1; eDebug("[SEC] invalidate current rotorparams"); + setRotorData(-1,-1); ++m_sec_sequence.current(); break; case eSecCommand::UPDATE_CURRENT_ROTORPARAMS: - m_data[ROTOR_CMD] = m_data[NEW_ROTOR_CMD]; - m_data[ROTOR_POS] = m_data[NEW_ROTOR_POS]; - eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[5], m_data[6]); + setRotorData(m_data[NEW_ROTOR_POS], m_data[NEW_ROTOR_CMD]); + eDebug("[SEC] update current rotorparams %d %04x %d", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]); ++m_sec_sequence.current(); break; case eSecCommand::SET_ROTOR_DISEQC_RETRYS: diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h index c9474aef..0bef95d1 100644 --- a/lib/dvb/frontend.h +++ b/lib/dvb/frontend.h @@ -92,6 +92,7 @@ class eDVBFrontend: public iDVBFrontend, public Object void setFrontend(); int readInputpower(); bool setSecSequencePos(int steps); + void setRotorData(int pos, int cmd); public: eDVBFrontend(int adap, int fe, int &ok); virtual ~eDVBFrontend(); diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 76e9efb3..ec2de848 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -37,7 +37,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrListm_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos); if (linked_fe->m_inuse) { int ocsw = -1, @@ -130,23 +128,18 @@ static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eD #endif if ( (csw != ocsw) || ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) || - ( rotor && oRotorPos != sat.orbital_position ) ) + ( rotor && RotorPos != 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 :)"); - } - else if (rotor && oRotorPos != -1) - { - ret -= abs(oRotorPos-sat.orbital_position); -// eDebug("decrement rotor pos for linked tuner!!"); } linked_fe->m_frontend->getData(direction, linked_ptr); } -int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id ) +int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id ) { int ret=0, satcount=0; @@ -154,7 +147,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite { bool rotor=false; eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx]; - if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner? + if ( lnb_param.slot_mask & slot_id ) // lnb for correct tuner? { eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters; @@ -208,10 +201,10 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite } while (ret && linked_prev_ptr != -1) // check for linked tuners.. - checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor); + checkLinkedParams(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos); while (ret && linked_next_ptr != -1) // check for linked tuners.. - checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor); + checkLinkedParams(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr, ret, sat, csw, ucsw, toneburst, diseqc, rotor, curRotorPos); if (ret) if (satpos_depends_ptr != -1) @@ -219,9 +212,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr; if ( satpos_depends_to_fe->m_inuse ) { - int oRotorPos = -1; - satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, oRotorPos); - if (!rotor || oRotorPos != sat.orbital_position) + if (!rotor || curRotorPos != sat.orbital_position) { // eDebug("can not tune this transponder ... rotor on other tuner is positioned to %d", oRotorPos); ret=0; @@ -249,20 +240,19 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite } if (ret && satcount) ret -= (satcount-1); + if (ret && m_not_linked_slot_mask & slot_id) + ret += 5; // increase score for tuners with direct sat connection return ret; } #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) +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_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? + if (!(lnb_param.slot_mask & slot_id)) // lnb for correct tuner? continue; eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters; eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters; @@ -272,12 +262,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if ( sit != lnb_param.m_satellites.end()) { eDVBSatelliteSwitchParameters &sw_param = sit->second; - bool doSetVoltageToneFrontend = true; bool doSetFrontend = true; + bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id; + bool allowDiseqc1_2 = true; int band=0, - linked_prev_ptr=-1, // linked tuner - linked_next_ptr=-1, // linked tuner - satpos_depends_ptr=-1, voltage = iDVBFrontend::voltageOff, tone = iDVBFrontend::toneOff, csw = di_param.m_committed_cmd, @@ -287,52 +275,20 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA lastucsw = -1, lastToneburst = -1, lastRotorCmd = -1, - curRotorPos = -1; + curRotorPos = -1, + satposDependPtr = -1; frontend.getData(eDVBFrontend::CSW, lastcsw); frontend.getData(eDVBFrontend::UCSW, lastucsw); frontend.getData(eDVBFrontend::TONEBURST, lastToneburst); frontend.getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd); frontend.getData(eDVBFrontend::ROTOR_POS, curRotorPos); - frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr); - frontend.getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr); - frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr); - - while (linked_prev_ptr != -1) // check for linked tuners.. - { - eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr; - 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; - break; - } - linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr); - } - - if (!linked) - while (linked_next_ptr != -1) // check for linked tuners.. - { - eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr; - 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; - break; - } - linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr); - } + frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr); - if (satpos_depends_ptr != -1) + if (satposDependPtr != -1 && !doSetVoltageToneFrontend) { - eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr; - 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; - } + allowDiseqc1_2 = false; + doSetVoltageToneFrontend = true; } if ( sat.frequency > lnb_param.m_lof_threshold ) @@ -440,15 +396,13 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA eDebug(""); #endif - int RotorCmd=-1; - bool useGotoXX = false; - if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 - && !sat.no_rotor_command_on_tune ) + if (doSetVoltageToneFrontend) { - if (depend_satpos_mode || linked) - // in this both modes we dont really turn the rotor.... but in canTune we need the satpos - frontend.setData(eDVBFrontend::ROTOR_POS, sat.orbital_position); - else + int RotorCmd=-1; + bool useGotoXX = false; + if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 + && !sat.no_rotor_command_on_tune + && allowDiseqc1_2 ) { if (sw_param.m_rotorPosNum) // we have stored rotor pos? RotorCmd=sw_param.m_rotorPosNum; @@ -456,30 +410,30 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA { eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 ); useGotoXX = true; - + 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; - + 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 @@ -503,266 +457,267 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA eDebug("RotorCmd = %04x", RotorCmd); } } - } - - if ( send_mask ) - { - eSecCommand::pair compare; - compare.steps = +3; - compare.tone = iDVBFrontend::toneOff; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) ); - compare.voltage = iDVBFrontend::voltageOff; - compare.steps = +3; - // 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 ) + if ( send_mask ) { - if (rotor_param.m_inputpower_parameters.m_use) - compare.voltage = VOLTAGE(18); // in input power mode set 18V for measure input power - else - compare.voltage = VOLTAGE(13); // in normal mode start turning with 13V - } - else - compare.voltage = voltage; - - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) ); - - // voltage was disabled..so we wait a longer time .. for normal switches 250ms should be enough - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) ); + eSecCommand::pair compare; + compare.steps = +3; + compare.tone = iDVBFrontend::toneOff; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) ); + compare.voltage = iDVBFrontend::voltageOff; + compare.steps = +3; + // 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) ); - for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat) - { - if ( send_mask & 4 ) + 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, m_params[DELAY_AFTER_TONEBURST]) ); + if (rotor_param.m_inputpower_parameters.m_use) + compare.voltage = VOLTAGE(18); // in input power mode set 18V for measure input power + else + compare.voltage = VOLTAGE(13); // in normal mode start turning with 13V } + else + compare.voltage = voltage; - int loops=0; - - if ( send_mask & 1 ) - ++loops; - if ( send_mask & 2 ) - ++loops; + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) ); - loops <<= di_param.m_repeats; + // voltage was disabled..so we wait a longer time .. for normal switches 250ms should be enough + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) ); - for ( int i = 0; i < loops;) // fill commands... + for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat) { - eDVBDiseqcCommand diseqc; - diseqc.len = 4; - diseqc.data[0] = i ? 0xE1 : 0xE0; - diseqc.data[1] = 0x10; - if ( (send_mask & 2) && (di_param.m_command_order & 4) ) - { - diseqc.data[2] = 0x39; - diseqc.data[3] = ucsw; - } - else if ( send_mask & 1 ) + if ( send_mask & 4 ) { - diseqc.data[2] = 0x38; - diseqc.data[3] = csw; + sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) ); } - else // no committed command confed.. so send uncommitted.. - { - diseqc.data[2] = 0x39; - diseqc.data[3] = ucsw; - } - sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); - i++; - if ( i < loops ) + int loops=0; + + if ( send_mask & 1 ) + ++loops; + if ( send_mask & 2 ) + ++loops; + + loops <<= di_param.m_repeats; + + for ( int i = 0; i < loops;) // fill commands... { - int cmd=0; - if (diseqc.data[2] == 0x38 && (send_mask & 2)) - cmd=0x39; - else if (diseqc.data[2] == 0x39 && (send_mask & 1)) - cmd=0x38; - int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS]; - if (cmd) + eDVBDiseqcCommand diseqc; + diseqc.len = 4; + diseqc.data[0] = i ? 0xE1 : 0xE0; + diseqc.data[1] = 0x10; + if ( (send_mask & 2) && (di_param.m_command_order & 4) ) + { + diseqc.data[2] = 0x39; + diseqc.data[3] = ucsw; + } + else if ( send_mask & 1 ) + { + diseqc.data[2] = 0x38; + diseqc.data[3] = csw; + } + else // no committed command confed.. so send uncommitted.. + { + diseqc.data[2] = 0x39; + diseqc.data[3] = ucsw; + } + sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) ); + + i++; + if ( i < loops ) { - int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp; // 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, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) ); + int cmd=0; + if (diseqc.data[2] == 0x38 && (send_mask & 2)) + cmd=0x39; + else if (diseqc.data[2] == 0x39 && (send_mask & 1)) + cmd=0x38; + int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS]; + if (cmd) + { + int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp; // 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, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) ); + } + else // delay 120msek when no command is in repeat gap + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) ); } - else // delay 120msek when no command is in repeat gap - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, tmp) ); + else + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) ); } - else - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) ); - } - 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, m_params[DELAY_AFTER_TONEBURST]) ); + 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, m_params[DELAY_AFTER_TONEBURST]) ); + } } } - } - if ( RotorCmd != -1 && RotorCmd != lastRotorCmd ) - { - eSecCommand::pair compare; - if (!send_mask) + eDebug("RotorCmd %02x, lastRotorCmd %02x", RotorCmd, lastRotorCmd); + if ( RotorCmd != -1 && RotorCmd != lastRotorCmd ) { - compare.steps = +3; - compare.tone = iDVBFrontend::toneOff; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) ); - - 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) ); + eSecCommand::pair compare; + if (!send_mask) + { + compare.steps = +3; + compare.tone = iDVBFrontend::toneOff; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) ); + + 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(18)) ); // set 18V for measure input power + else + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V - if (rotor_param.m_inputpower_parameters.m_use) - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // set 18V for measure input power + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD]) ); // wait 750ms when voltage was disabled + sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +9) ); // no need to send stop rotor cmd and recheck voltage + } else - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed + + 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 150msec after send rotor stop cmd + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_MOTOR_STOP_CMD]) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD]) ); // wait 750ms when voltage was disabled - sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +9) ); // no need to send stop rotor cmd and recheck voltage - } - else - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed - - 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 150msec after send rotor stop cmd - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_MOTOR_STOP_CMD]) ); - - 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; - } + 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; - eSecCommand::pair compare; - compare.voltage = VOLTAGE(18); - compare.steps = +3; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) ); + 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 = +3; + 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::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) ); // wait 150msec after voltage change - sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) ); - compare.val = 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) ); // wait 150msec before measure - sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) ); - compare.val = 0; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) ); // wait 150msec after voltage change + sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) ); + compare.val = 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) ); // wait 150msec before measure + sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) ); + compare.val = 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::SET_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) ); // 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 + sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) ); // 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=+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, +10 ) ); // 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::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, +10 ) ); // 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_VOLTAGE, VOLTAGE(18)) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) ); // 2 minutes running timeout + sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) ); // 2 minutes running timeout // 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=+4; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); - sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +4 ) ); // 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=+4; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); + sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +4 ) ); // timeout ? this should never happen + sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // running loop start ///////////////////// - sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); - sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) ); - } - else - { // use normal turning mode - doSetVoltageToneFrontend=false; - doSetFrontend=false; - eSecCommand::rotor cmd; - eSecCommand::pair compare; - compare.voltage = VOLTAGE(13); - compare.steps = +3; - 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) ); // wait 150msec 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_POWER_LIMITING_MODE, eSecCommand::modeDynamic) ); + sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) ); + } + else + { // use normal turning mode + doSetVoltageToneFrontend=false; + doSetFrontend=false; + eSecCommand::rotor cmd; + eSecCommand::pair compare; + compare.voltage = VOLTAGE(13); + compare.steps = +3; + 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, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) ); // wait 150msec 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.tone = tone; - sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) ); - sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_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, m_params[MOTOR_RUNNING_TIMEOUT]*4) ); // 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) ); + 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) ); + + compare.tone = tone; + sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) ); + sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_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, m_params[MOTOR_RUNNING_TIMEOUT]*4) ); // 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(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd); + frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position); } - frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd); - frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position); } } else @@ -772,7 +727,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA frontend.setData(eDVBFrontend::UCSW, ucsw); frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param); - if (!linked && doSetVoltageToneFrontend) + if (doSetVoltageToneFrontend) { eSecCommand::pair compare; compare.voltage = voltage; @@ -806,16 +761,20 @@ RESULT eDVBSatelliteEquipmentControl::clear() for (int i=0; i <= m_lnbidx; ++i) { m_lnbs[i].m_satellites.clear(); - m_lnbs[i].tuner_mask = 0; + m_lnbs[i].slot_mask = 0; } m_lnbidx=-1; -// clear linked tuner configuration + m_not_linked_slot_mask=0; + + //reset some tuner configuration for (eSmartPtrList::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it) { it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1); it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1); it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1); + it->m_frontend->setData(eDVBFrontend::ROTOR_POS, -1); + it->m_frontend->setData(eDVBFrontend::ROTOR_CMD, -1); } return 0; @@ -834,10 +793,10 @@ RESULT eDVBSatelliteEquipmentControl::addLNB() return 0; } -RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask) +RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask) { if ( currentLNBValid() ) - m_lnbs[m_lnbidx].tuner_mask = tunermask; + m_lnbs[m_lnbidx].slot_mask = slotmask; else return -ENOENT; return 0; @@ -1163,9 +1122,9 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t for (std::map::iterator sit(lnb_param.m_satellites.begin()); sit != lnb_param.m_satellites.end(); ++sit) { - if ( lnb_param.tuner_mask & tu1_mask ) + if ( lnb_param.slot_mask & tu1_mask ) tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi)); - if ( lnb_param.tuner_mask & tu2_mask ) + if ( lnb_param.slot_mask & tu2_mask ) tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi)); } } @@ -1249,6 +1208,11 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2) return -1; } +void eDVBSatelliteEquipmentControl::setSlotNotLinked(int slot_no) +{ + m_not_linked_slot_mask |= (1 << slot_no); +} + bool eDVBSatelliteEquipmentControl::isRotorMoving() { return m_rotorMoving; diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index e5273f8e..e30e3b04 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -222,7 +222,7 @@ public: #ifndef SWIG t_12V_relais_state m_12V_relais_state; // 12V relais output on/off - __u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...) + __u8 slot_mask; // useable by slot ( 1 | 2 | 4...) unsigned int m_lof_hi, // for 2 band universal lnb 10600 Mhz (high band offset frequency) m_lof_lo, // for 2 band universal lnb 9750 Mhz (low band offset frequency) @@ -265,6 +265,7 @@ private: std::map::iterator m_curSat; eSmartPtrList &m_avail_frontends; bool m_rotorMoving; + int m_not_linked_slot_mask; #endif #ifdef SWIG eDVBSatelliteEquipmentControl(); @@ -284,7 +285,7 @@ public: RESULT clear(); /* LNB Specific Parameters */ RESULT addLNB(); - RESULT setLNBTunerMask(int tunermask); + RESULT setLNBSlotMask(int slotmask); RESULT setLNBLOFL(int lofl); RESULT setLNBLOFH(int lofh); RESULT setLNBThreshold(int threshold); @@ -313,6 +314,7 @@ public: /* Tuner Specific Parameters */ RESULT setTunerLinked(int from, int to); RESULT setTunerDepends(int from, int to); + void setSlotNotLinked(int tuner_no); PyObject *get_exclusive_satellites(int tu1, int tu2); void setRotorMoving(bool); // called from the frontend's diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index bcdd9440..d69f7b8f 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -79,7 +79,7 @@ class SecConfigure: sec.setRotorPosNum(0) # USALS self.satList.append(int(x[0])) - sec.setLNBTunerMask(tunermask) + sec.setLNBSlotMask(tunermask) def setSatposDepends(self, sec, nim1, nim2): print "tuner", nim1, "depends on satpos of", nim2 @@ -125,38 +125,42 @@ class SecConfigure: if slot.isCompatible("DVB-S"): print "slot: " + str(x) + " configmode: " + str(nim.configMode.value) print "diseqcmode: ", nim.configMode.value - if nim.configMode.value in [ "loopthrough", "satposdepends", "equal", "nothing" ]: + if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]: pass - elif nim.configMode.value == "simple": #simple config - if nim.diseqcMode.value == "single": #single - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO) - elif nim.diseqcMode.value == "toneburst_a_b": #Toneburst A/B - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) - elif nim.diseqcMode.value == "diseqc_a_b": #DiSEqC A/B - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) - elif nim.diseqcMode.value == "diseqc_a_b_c_d": #DiSEqC A/B/C/D - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB) - elif nim.diseqcMode.value == "positioner": #Positioner - if nim.latitudeOrientation.value == "north": - laValue = rotorParam.NORTH - else: - laValue = rotorParam.SOUTH - if nim.longitudeOrientation.value == "east": - loValue = rotorParam.EAST - else: - loValue = rotorParam.WEST - self.addLNBSimple(sec, slotid = x, diseqcmode = 3, - longitude = nim.longitude.float, - loDirection = loValue, - latitude = nim.latitude.float, - laDirection = laValue) - elif nim.configMode.value == "advanced": #advanced config - self.updateAdvanced(sec, x) + else: + sec.setSlotNotLinked(x) + if nim.configMode.value == "equal": + pass + elif nim.configMode.value == "simple": #simple config + if nim.diseqcMode.value == "single": #single + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO) + elif nim.diseqcMode.value == "toneburst_a_b": #Toneburst A/B + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) + elif nim.diseqcMode.value == "diseqc_a_b": #DiSEqC A/B + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) + elif nim.diseqcMode.value == "diseqc_a_b_c_d": #DiSEqC A/B/C/D + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB) + elif nim.diseqcMode.value == "positioner": #Positioner + if nim.latitudeOrientation.value == "north": + laValue = rotorParam.NORTH + else: + laValue = rotorParam.SOUTH + if nim.longitudeOrientation.value == "east": + loValue = rotorParam.EAST + else: + loValue = rotorParam.WEST + self.addLNBSimple(sec, slotid = x, diseqcmode = 3, + longitude = nim.longitude.float, + loDirection = loValue, + latitude = nim.latitude.float, + laDirection = laValue) + elif nim.configMode.value == "advanced": #advanced config + self.updateAdvanced(sec, x) print "sec config completed" def updateAdvanced(self, sec, slotid): @@ -285,7 +289,7 @@ class SecConfigure: else: sec.setUseInputpower(False) - sec.setLNBTunerMask(tunermask) + sec.setLNBSlotMask(tunermask) # finally add the orbital positions for y in lnbSat[x]: @@ -726,6 +730,12 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value)) config.sec.motor_command_retries = x +# TODO add support for satpos depending nims to advanced nim configuration +# so a second/third/fourth cable from a motorized lnb can used behind a +# diseqc 1.0 / diseqc 1.1 / toneburst switch +# the C(++) part should can handle this +# the configElement should be only visible when diseqc 1.2 is disabled + def InitNimManager(nimmgr): InitSecParams() diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index 627895c2..b97c469c 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -452,7 +452,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const eServiceReference ref = *m_cursor; bool isPlayable = !(ref.flags & eServiceReference::isDirectory || ref.flags & eServiceReference::isMarker); - if (isPlayable && m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + if (isPlayable && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) painter.setForegroundColor(gRGB(0xbbbbbb)); int xoffset=0; // used as offset when painting the folder/marker symbol