Add DiSEqC reset after voltage enable and tune failed... hopefully this fixes problem...
[enigma2.git] / lib / dvb / sec.cpp
index 1e75d113419a2347a777fd221adfc55db2e6a0b2..35a8d04a37a8ab5309338a02dd8bd06af441d059 100644 (file)
@@ -36,8 +36,8 @@ void eDVBSatelliteEquipmentControl::setParam(int param, int value)
                m_params[param]=value;
 }
 
-eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends)
-       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false)
+eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends, eSmartPtrList<eDVBRegisteredFrontend> &avail_simulate_frontends)
+       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_avail_simulate_frontends(avail_simulate_frontends), m_rotorMoving(false)
 {
        if (!instance)
                instance = this;
@@ -114,43 +114,27 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setRotorPosNum(1); // stored pos 1
 }
 
-static void checkLinkedParams(int direction, long &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
+#define eSecDebugNoSimulate(x...) \
+       do { \
+               if (!simulate) \
+                       eSecDebug(x); \
+       } while(0)
+//             else \
+//             { \
+//                     eDebugNoNewLine("SIMULATE:"); \
+//                     eDebug(x); \
+//             } \
+
+int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id, int *highest_score_lnb)
 {
-       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
-       if (linked_fe->m_inuse)
-       {
-               long ocsw = -1,
-                       oucsw = -1,
-                       oToneburst = -1;
-               linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
-               linked_fe->m_frontend->getData(eDVBFrontend::UCSW, oucsw);
-               linked_fe->m_frontend->getData(eDVBFrontend::TONEBURST, oToneburst);
-#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 && 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 :)");
-       }
-       linked_fe->m_frontend->getData(direction, (long&)linked_ptr);
-}
+       bool simulate = ((eDVBFrontend*)fe)->is_simulate();
+       bool direct_connected = m_not_linked_slot_mask & slot_id;
+       int score=0, satcount=0;
 
-int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
-{
-       int ret=0, satcount=0;
+       if (highest_score_lnb)
+               *highest_score_lnb = -1;
+
+       eSecDebugNoSimulate("canTune %d", slot_id);
 
        for (int idx=0; idx <= m_lnbidx; ++idx )
        {
@@ -158,14 +142,18 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
                if ( lnb_param.slot_mask & slot_id ) // lnb for correct tuner?
                {
+                       int ret = 0;
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 
+                       eSecDebugNoSimulate("lnb %d found", idx);
+
                        satcount += lnb_param.m_satellites.size();
 
                        std::map<int, eDVBSatelliteSwitchParameters>::iterator sit =
                                lnb_param.m_satellites.find(sat.orbital_position);
                        if ( sit != lnb_param.m_satellites.end())
                        {
+                               bool diseqc=false;
                                long band=0,
                                        linked_prev_ptr=-1,
                                        linked_next_ptr=-1,
@@ -175,9 +163,8 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        toneburst = di_param.m_toneburst_param,
                                        curRotorPos;
 
-                               fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+                               eSecDebugNoSimulate("sat %d found", sat.orbital_position);
                                fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
-                               fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
                                fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);
 
                                if ( sat.frequency > lnb_param.m_lof_threshold )
@@ -185,8 +172,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
                                        band |= 2;
 
-                               bool diseqc=false;
-
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                                {
                                        diseqc=true;
@@ -200,8 +185,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                rotor = true;
 
                                        ret=10000;
-                                       if (rotor && curRotorPos != -1)
-                                               ret -= abs(curRotorPos-sat.orbital_position);
                                }
                                else
                                {
@@ -209,49 +192,128 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        ret = 15000;
                                }
 
-                               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, curRotorPos);
+                               eSecDebugNoSimulate("ret1 %d", ret);
 
-                               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, curRotorPos);
+                               if (direct_connected)  // frontend with direct connection?
+                               {
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       eSecDebugNoSimulate("direct");
+                                       fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+                                       fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+                                       fe->getData(eDVBFrontend::CSW, ocsw);
+                                       fe->getData(eDVBFrontend::UCSW, oucsw);
+                                       fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+                                       while (ret && linked_prev_ptr != -1)  // check for linked tuners..
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               if (linked_fe->m_inuse)
+                                               {
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
+                                               }
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                       }
+                                       eSecDebugNoSimulate("ret2 %d", ret);
+                                       while (ret && linked_next_ptr != -1)  // check for linked tuners..
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
+                                               if (linked_fe->m_inuse)
+                                               {
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
+                                               }
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr);
+                                       }
+                                       eSecDebugNoSimulate("ret3 %d", ret);
+                               }
+                               else // linked frontend..
+                               {
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       while (linked_prev_ptr != -1)
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                               if (linked_prev_ptr == -1)
+                                               {
+                                                       iDVBFrontend *sec_fe = linked_fe->m_frontend;
+                                                       sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+                                                       if (linked_fe->m_inuse)
+                                                       {
+                                                               sec_fe->getData(eDVBFrontend::CSW, ocsw);
+                                                               sec_fe->getData(eDVBFrontend::UCSW, oucsw);
+                                                               sec_fe->getData(eDVBFrontend::TONEBURST, oToneburst);
+                                                               eSecDebug("(%ld != %ld) || \n(%d && (%ld != %ld || %ld != %ld) ) ||\n( %d && %ld != %d ) )",
+                                                                       csw, ocsw, diseqc, ucsw, oucsw, toneburst, oToneburst, rotor, curRotorPos, sat.orbital_position);
+                                                               if ( (csw != ocsw) ||
+                                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                                       ( rotor && curRotorPos != sat.orbital_position ) )
+                                                               {
+                                                                       ret=0;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                                       eSecDebugNoSimulate("ret4 %d", ret);
+                               }
 
                                if (ret)
                                        if (satpos_depends_ptr != -1)
                                        {
+                                               eSecDebugNoSimulate("satpos depends");
                                                eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
                                                if ( satpos_depends_to_fe->m_inuse )
                                                {
+                                                       if (!direct_connected)
+                                                               satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
                                                        if (!rotor || curRotorPos != 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 :)");
+                                               eSecDebugNoSimulate("ret5 %d", ret);
                                        }
 
+                               if (ret && rotor && curRotorPos != -1 && (direct_connected || satpos_depends_ptr == -1) )  // direct conntected or loopthrough!
+                                       ret -= abs(curRotorPos-sat.orbital_position);
+
+                               eSecDebugNoSimulate("ret6 %d", ret);
+
                                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);
-                                       }
                                }
+
+                               eSecDebugNoSimulate("ret %d, score old %d", ret, score);
+                               if (ret > score)
+                               {
+                                       score = ret;
+                                       if (highest_score_lnb)
+                                               *highest_score_lnb = idx;
+                               }
+                               eSecDebugNoSimulate("score new %d", score);
                        }
                }
        }
-       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;
+       if (score && satcount)
+               score -= (satcount-1);
+       if (score && direct_connected)
+               score += 5; // increase score for tuners with direct sat connection
+       eSecDebugNoSimulate("final score %d", score);
+       return score;
 }
 
 bool need_turn_fast(int turn_speed)
@@ -262,7 +324,7 @@ bool need_turn_fast(int turn_speed)
        {
                int begin = turn_speed >> 16; // high word is start time
                int end = turn_speed&0xFFFF; // low word is end time
-               time_t now_time = eDVBLocalTimeHandler::getInstance()->nowTime();
+               time_t now_time = ::time(0);
                tm nowTime;
                localtime_r(&now_time, &nowTime);
                int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1;
@@ -280,13 +342,24 @@ bool need_turn_fast(int turn_speed)
 
 #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 slot_id)
+#define eDebugNoSimulate(x...) \
+       do { \
+               if (!simulate) \
+                       eDebug(x); \
+       } while(0)
+//             else \
+//             { \
+//                     eDebugNoNewLine("SIMULATE:"); \
+//                     eDebug(x); \
+//             } \
+
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
 {
-       for (int idx=0; idx <= m_lnbidx; ++idx )
+       bool simulate = ((eDVBFrontend*)&frontend)->is_simulate();
+       int lnb_idx = -1;
+       if (canTune(sat, &frontend, slot_id, &lnb_idx))
        {
-               eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
-               if (!(lnb_param.slot_mask & slot_id)) // lnb for correct tuner?
-                       continue;
+               eDVBSatelliteLNBParameters &lnb_param = m_lnbs[lnb_idx];
                eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
                eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
 
@@ -296,8 +369,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
                        bool doSetFrontend = true;
-                       bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
-                       bool allowDiseqc1_2 = true;
+                       bool doSetVoltageToneFrontend = true;
+                       bool sendDiSEqC = false;
+                       bool forceChanged = false;
+                       bool needDiSEqCReset = false;
                        long band=0,
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
@@ -310,20 +385,43 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                lastRotorCmd = -1,
                                curRotorPos = -1,
                                satposDependPtr = -1;
+                       iDVBFrontend *sec_fe=&frontend;
+                       eDVBRegisteredFrontend *linked_fe = 0;
+                       eDVBSatelliteDiseqcParameters::t_diseqc_mode diseqc_mode = di_param.m_diseqc_mode;
 
-                       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::SATPOS_DEPENDS_PTR, satposDependPtr);
 
-                       if (satposDependPtr != -1 && !doSetVoltageToneFrontend)
+                       if (!(m_not_linked_slot_mask & slot_id))  // frontend with direct connection?
                        {
-                               allowDiseqc1_2 = false;
-                               doSetVoltageToneFrontend = true;
+                               long linked_prev_ptr;
+                               frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+                               while (linked_prev_ptr != -1)
+                               {
+                                       linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                       sec_fe = linked_fe->m_frontend;
+                                       sec_fe->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                               }
+                               if (satposDependPtr != -1)  // we dont need uncommitted switch and rotor cmds on second output of a rotor lnb
+                                       diseqc_mode = eDVBSatelliteDiseqcParameters::V1_0;
+                               else {
+                                       // in eDVBFrontend::tuneLoop we call closeFrontend and ->inc_use() in this this condition (to put the kernel frontend thread into idle state)
+                                       // so we must resend all diseqc stuff (voltage is disabled when the frontend is closed)
+                                       int state;
+                                       sec_fe->getState(state);
+                                       if (!linked_fe->m_inuse && state != eDVBFrontend::stateIdle)
+                                               forceChanged = true;
+                               }
                        }
 
+                       sec_fe->getData(eDVBFrontend::CSW, lastcsw);
+                       sec_fe->getData(eDVBFrontend::UCSW, lastucsw);
+                       sec_fe->getData(eDVBFrontend::TONEBURST, lastToneburst);
+                       sec_fe->getData(eDVBFrontend::ROTOR_CMD, lastRotorCmd);
+                       sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
+
+                       if (lastcsw == lastucsw && lastToneburst == lastucsw && lastucsw == -1)
+                               needDiSEqCReset = true;
+
                        if ( sat.frequency > lnb_param.m_lof_threshold )
                                band |= 1;
 
@@ -356,7 +454,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                        eSecCommandList sec_sequence;
 
-                       if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
+                       if (diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {
                                if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
                                        csw = 0xF0 | (csw << 2);
@@ -366,15 +464,15 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                                bool send_csw =
                                        (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);
-                               bool changed_csw = send_csw && csw != lastcsw;
+                               bool changed_csw = send_csw && (forceChanged || csw != lastcsw);
 
                                bool send_ucsw =
-                                       (di_param.m_uncommitted_cmd && di_param.m_diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0);
-                               bool changed_ucsw = send_ucsw && ucsw != lastucsw;
+                                       (di_param.m_uncommitted_cmd && diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0);
+                               bool changed_ucsw = send_ucsw && (forceChanged || ucsw != lastucsw);
 
                                bool send_burst =
                                        (di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
-                               bool changed_burst = send_burst && toneburst != lastToneburst;
+                               bool changed_burst = send_burst && (forceChanged || toneburst != lastToneburst);
 
                                int send_mask = 0; /*
                                        1 must send csw
@@ -408,7 +506,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                && di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO
                                                && (lastcsw & 0xF0)
                                                && ((csw / 4) == (lastcsw / 4)) )
-                                               eDebug("dont send committed cmd (fast diseqc)");
+                                               eDebugNoSimulate("dont send committed cmd (fast diseqc)");
                                        else
                                        {
                                                send_mask |= 1;
@@ -428,20 +526,18 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eDebugNoNewLine("0");
                                eDebug("");
 #endif
-
                                if (doSetVoltageToneFrontend)
                                {
                                        int RotorCmd=-1;
                                        bool useGotoXX = false;
-                                       if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
-                                               && !sat.no_rotor_command_on_tune
-                                               && allowDiseqc1_2 )
+                                       if ( diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+                                               && !sat.no_rotor_command_on_tune )
                                        {
                                                if (sw_param.m_rotorPosNum) // we have stored rotor pos?
                                                        RotorCmd=sw_param.m_rotorPosNum;
                                                else  // we must calc gotoxx cmd
                                                {
-                                                       eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
+                                                       eDebugNoSimulate("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,
@@ -454,10 +550,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
                                                                SiteLon = 360 - SiteLon;
        
-                                                       eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
+                                                       eDebugNoSimulate("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
                                                        double satHourAngle =
                                                                calcSatHourangle( SatLon, SiteLat, SiteLon );
-                                                       eDebug("PolarmountHourAngle=%lf", satHourAngle );
+                                                       eDebugNoSimulate("PolarmountHourAngle=%lf", satHourAngle );
        
                                                        static int gotoXTable[10] =
                                                                { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
@@ -487,7 +583,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                        RotorCmd |= 0xE000;
                                                                }
                                                        }
-                                                       eDebug("RotorCmd = %04x", RotorCmd);
+                                                       eDebugNoSimulate("RotorCmd = %04x", RotorCmd);
                                                }
                                        }
 
@@ -530,6 +626,24 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS]) );
 
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
+                                               if (needDiSEqCReset)
+                                               {
+                                                       eDVBDiseqcCommand diseqc;
+                                                       memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                                                       diseqc.len = 3;
+                                                       diseqc.data[0] = 0xE0;
+                                                       diseqc.data[1] = 0;
+                                                       diseqc.data[2] = 0;
+                                                       // diseqc reset
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                                       diseqc.data[2] = 3;
+                                                       // diseqc peripherial powersupply on
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 150) );
+                                               }
+
                                                for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
                                                {
                                                        if ( send_mask & 4 )
@@ -605,10 +719,14 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                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 (di_param.m_seq_repeat && seq_repeat == 0)
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
                                                }
+                                               sendDiSEqC = true;
                                        }
 
-                                       eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
+                                       eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
                                        if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                        {
                                                eSecCommand::pair compare;
@@ -669,6 +787,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                                                if ( rotor_param.m_inputpower_parameters.m_use )
                                                { // use measure rotor input power to detect rotor state
+                                                       bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
                                                        eSecCommand::rotor cmd;
                                                        eSecCommand::pair compare;
                                                        compare.voltage = VOLTAGE(18);
@@ -687,7 +806,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        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) );
@@ -702,23 +820,24 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        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::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, turn_fast ? 10 : 9 ) );  // timeout .. we assume now the rotor is already at the correct position 
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) );  // goto loop start
 ////////////////////
-                                                       if (need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed))
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+                                                       if (turn_fast)
                                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
                                                        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;
+                                                       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::IF_TIMEOUT_GOTO, +2 ) );  // 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) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
                                                }
                                                else
                                                {  // use normal turning mode
@@ -732,8 +851,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        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::SET_ROTOR_MOVING) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
                                                        compare.voltage = voltage;
@@ -758,19 +877,29 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        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) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );
                                                }
-                                               frontend.setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
-                                               frontend.setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+                                               sendDiSEqC = true;
                                        }
                                }
                        }
                        else
+                       {
+                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
                                csw = band;
+                       }
 
-                       frontend.setData(eDVBFrontend::CSW, csw);
-                       frontend.setData(eDVBFrontend::UCSW, ucsw);
-                       frontend.setData(eDVBFrontend::TONEBURST, di_param.m_toneburst_param);
+                       if (sendDiSEqC)
+                               sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+
+                       sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
+                       sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
+                       sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 
                        if (doSetVoltageToneFrontend)
                        {
@@ -786,18 +915,32 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE]) );
                        }
 
+                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
+
                        if (doSetFrontend)
                        {
-                               sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
                        }
+
+                       if (sendDiSEqC)
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+
                        frontend.setSecSequence(sec_sequence);
 
                        return 0;
                }
        }
-
-       eDebug("found no useable satellite configuration for orbital position (%d)", sat.orbital_position );
+       eDebugNoSimulate("found no useable satellite configuration for %s freq %d%s %s on orbital position (%d)",
+               sat.system ? "DVB-S2" : "DVB-S",
+               sat.frequency,
+               sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal ? "H" :
+                       eDVBFrontendParametersSatellite::Polarisation::Vertical ? "V" :
+                       eDVBFrontendParametersSatellite::Polarisation::CircularLeft ? "CL" : "CR",
+               sat.modulation == eDVBFrontendParametersSatellite::Modulation::Auto ? "AUTO" :
+                       eDVBFrontendParametersSatellite::Modulation::QPSK ? "QPSK" :
+                       eDVBFrontendParametersSatellite::Modulation::M8PSK ? "8PSK" : "QAM16",
+               sat.orbital_position );
        return -1;
 }
 
@@ -835,6 +978,15 @@ RESULT eDVBSatelliteEquipmentControl::clear()
                it->m_frontend->setData(eDVBFrontend::ROTOR_CMD, -1);
        }
 
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_simulate_frontends.begin()); it != m_avail_simulate_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;
 }
 
@@ -848,7 +1000,7 @@ RESULT eDVBSatelliteEquipmentControl::addLNB()
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }
-       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx-1);
+       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
        return 0;
 }
 
@@ -1147,111 +1299,6 @@ struct sat_compare
        }
 };
 
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
-{
-       ePyObject ret;
-
-       if (tu1 != tu2)
-       {
-               eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-               int cnt=0;
-               for (eSmartPtrList<eDVBRegisteredFrontend>::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)
-               {
-                       // check for linked tuners
-
-                       do 
-                       {
-                               long tmp;
-                               p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p1 = (eDVBRegisteredFrontend*)tmp;
-                               else
-                                       break;
-                       }
-                       while (true);
-
-                       do 
-                       {
-                               long tmp;
-                               p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
-                               if (tmp != -1)
-                                       p2 = (eDVBRegisteredFrontend*)tmp;
-                               else
-                                       break;
-                       }
-                       while (true);
-
-                       if (p1 != p2)
-                       {
-                               long tmp1=-1;
-                               long tmp2=-1;
-                               // check for rotor dependency
-                               p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
-                               if (tmp1 != -1)
-                                       p1 = (eDVBRegisteredFrontend*)tmp1;
-                               p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
-                               if (tmp2 != -1)
-                                       p2 = (eDVBRegisteredFrontend*)tmp2;
-                               if (p1 != p2)
-                               {
-                                       int tu1_mask = 1 << p1->m_frontend->getSlotID(),
-                                               tu2_mask = 1 << p2->m_frontend->getSlotID();
-                                       std::set<sat_compare> tu1sats, tu2sats;
-                                       std::list<sat_compare> tu1difference, tu2difference;
-                                       std::insert_iterator<std::list<sat_compare> > insert1(tu1difference, tu1difference.begin()),
-                                               insert2(tu2difference, tu2difference.begin());
-                                       for (int idx=0; idx <= m_lnbidx; ++idx )
-                                       {
-                                               eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
-                                               for (std::map<int, eDVBSatelliteSwitchParameters>::iterator sit(lnb_param.m_satellites.begin());
-                                                       sit != lnb_param.m_satellites.end(); ++sit)
-                                               {
-                                                       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.slot_mask & tu2_mask )
-                                                               tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
-                                               }
-                                       }
-                                       std::set_difference(tu1sats.begin(), tu1sats.end(),
-                                               tu2sats.begin(), tu2sats.end(),
-                                               insert1);
-                                       std::set_difference(tu2sats.begin(), tu2sats.end(),
-                                               tu1sats.begin(), tu1sats.end(),
-                                               insert2);
-                                       if (!tu1sats.empty() || !tu2sats.empty())
-                                       {
-                                               int idx=0;
-                                               ret = PyList_New(2+tu1difference.size()+tu2difference.size());
-
-                                               PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu1difference.size()));
-                                               for(std::list<sat_compare>::iterator it(tu1difference.begin()); it != tu1difference.end(); ++it)
-                                                       PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
-
-                                               PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu2difference.size()));
-                                               for(std::list<sat_compare>::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it)
-                                                       PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
-                                       }
-                               }
-                       }
-               }
-       }
-       if (!ret)
-       {
-               ret = PyList_New(2);
-               PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
-               PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
-       }
-       return ret;
-}
-
 RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
        eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
@@ -1259,12 +1306,11 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
 
-               int cnt=0;
-               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
                {
-                       if (cnt == tu1)
+                       if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;
-                       else if (cnt == tu2)
+                       else if (it->m_frontend->getSlotID() == tu2)
                                p2 = *it;
                }
                if (p1 && p2)
@@ -1282,6 +1328,20 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
                                        fclose(f);
                                }
                        }
+               }
+
+               p1=p2=NULL;
+               for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_simulate_frontends.begin()); it != m_avail_simulate_frontends.end(); ++it)
+               {
+                       if (it->m_frontend->getSlotID() == tu1)
+                               p1 = *it;
+                       else if (it->m_frontend->getSlotID() == tu2)
+                               p2 = *it;
+               }
+               if (p1 && p2)
+               {
+                       p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
+                       p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
                        return 0;
                }
        }
@@ -1296,12 +1356,25 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 
        eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
 
-       int cnt=0;
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
-               if (cnt == tu1)
+               if (it->m_frontend->getSlotID() == tu1)
                        p1 = *it;
-               else if (cnt == tu2)
+               else if (it->m_frontend->getSlotID() == tu2)
+                       p2 = *it;
+       }
+       if (p1 && p2)
+       {
+               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
+       }
+
+       p1=p2=NULL;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_simulate_frontends.begin()); it != m_avail_simulate_frontends.end(); ++it)
+       {
+               if (it->m_frontend->getSlotID() == tu1)
+                       p1 = *it;
+               else if (it->m_frontend->getSlotID() == tu2)
                        p2 = *it;
        }
        if (p1 && p2)
@@ -1310,6 +1383,7 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
                p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
                return 0;
        }
+
        return -1;
 }