Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git] / lib / dvb / sec.cpp
index f24783c89fb7e62f0834f75461a893d740797be8..39124b34b8a1cb7ec357d8dca3656528d31270b7 100644 (file)
@@ -1,6 +1,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
+#include <lib/dvb/dvbtime.h>
 
 #include <set>
 
 #endif
 #include <lib/base/eerror.h>
 
+//#define SEC_DEBUG
+
+#ifdef SEC_DEBUG
+#define eSecDebug(arg...) eDebug(arg)
+#else
+#define eSecDebug(arg...)
+#endif
+
 DEFINE_REF(eDVBSatelliteEquipmentControl);
 
 eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
 
-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)
+int eDVBSatelliteEquipmentControl::m_params[MAX_PARAMS];
+/*
+   defaults are set in python lib/python/Components/NimManager.py
+   in InitSecParams function via setParam call
+*/
+
+void eDVBSatelliteEquipmentControl::setParam(int param, int value)
+{
+       if (param >= 0 && param < MAX_PARAMS)
+               m_params[param]=value;
+}
+
+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;
@@ -25,9 +46,9 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // ASTRA
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10607000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -42,9 +63,9 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // Hotbird
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -59,9 +80,9 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // Rotor
        addLNB();
-       setLNBTunerMask(3);
+       setLNBSlotMask(3);
        setLNBLOFL(9750000);
-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
@@ -93,43 +114,64 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setRotorPosNum(1); // stored pos 1
 }
 
-int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
+#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)
 {
-       int ret=0, satcount=0;
+       bool simulate = ((eDVBFrontend*)fe)->is_simulate();
+       bool direct_connected = m_not_linked_slot_mask & slot_id;
+       int score=0, satcount=0;
+
+       if (highest_score_lnb)
+               *highest_score_lnb = -1;
+
+       eSecDebugNoSimulate("canTune %d", slot_id);
 
        for (int idx=0; idx <= m_lnbidx; ++idx )
        {
+               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?
                {
+                       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())
                        {
-                               int band=0,
-                                       linked_to=-1, // linked tuner
-                                       satpos_depends_to=-1,
+                               bool diseqc=false;
+                               long band=0,
+                                       linked_prev_ptr=-1,
+                                       linked_next_ptr=-1,
+                                       satpos_depends_ptr=-1,
                                        csw = di_param.m_committed_cmd,
                                        ucsw = di_param.m_uncommitted_cmd,
                                        toneburst = di_param.m_toneburst_param,
                                        curRotorPos;
 
-                               fe->getData(6, curRotorPos);
-                               fe->getData(7, linked_to);
-                               fe->getData(8, satpos_depends_to);
+                               eSecDebugNoSimulate("sat %d found", sat.orbital_position);
+                               fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+                               fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);
 
                                if ( sat.frequency > lnb_param.m_lof_threshold )
                                        band |= 1;
                                if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
                                        band |= 2;
 
-                               bool rotor=false;
-                               bool diseqc=false;
-
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                                {
                                        diseqc=true;
@@ -142,98 +184,182 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
                                                rotor = true;
 
-                                       ret = 1000;
+                                       ret=10000;
                                }
                                else
                                {
                                        csw = band;
-                                       ret = 2000;
+                                       ret = 15000;
                                }
 
-                               if (linked_to != -1)  // check for linked tuners..
+                               eSecDebugNoSimulate("ret1 %d", ret);
+
+                               if (direct_connected)  // frontend with direct connection?
                                {
-                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
-                                       if (linked_fe->m_inuse)
+                                       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..
                                        {
-                                               int ocsw = -1,
-                                                       oucsw = -1,
-                                                       oToneburst = -1,
-                                                       oRotorPos = -1;
-                                               linked_fe->m_frontend->getData(0, ocsw);
-                                               linked_fe->m_frontend->getData(1, oucsw);
-                                               linked_fe->m_frontend->getData(2, oToneburst);
-                                               linked_fe->m_frontend->getData(6, oRotorPos);
-#if 0
-                                               eDebug("compare csw %02x == lcsw %02x",
-                                                       csw, ocsw);
-                                               if ( diseqc )
-                                                       eDebug("compare ucsw %02x == lucsw %02x\ncompare toneburst %02x == oToneburst %02x",
-                                                               ucsw, oucsw, toneburst, oToneburst);
-                                               if ( rotor )
-                                                       eDebug("compare pos %d == current pos %d",
-                                                               sat.orbital_position, oRotorPos);
-#endif
-                                               if ( (csw != ocsw) ||
-                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-                                                       ( rotor && oRotorPos != sat.orbital_position ) )
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               if (linked_fe->m_inuse)
                                                {
-//                                                     eDebug("can not tune this transponder with linked tuner in use!!");
-                                                       ret=0;
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
                                                }
-//                                             else
-//                                                     eDebug("OK .. can tune this transponder with linked tuner in use :)");
+                                               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);
                                }
-
-                               if (satpos_depends_to != -1)  // check for linked tuners..
+                               else // linked frontend..
                                {
-                                       eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_to;
-                                       if ( satpos_depends_to_fe->m_inuse )
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       while (linked_prev_ptr != -1)
                                        {
-                                               int oRotorPos = -1;
-                                               satpos_depends_to_fe->m_frontend->getData(6, oRotorPos);
-                                               if (!rotor || oRotorPos != sat.orbital_position)
+                                               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)
                                                {
-//                                                     eDebug("can not tune this transponder ... rotor on other tuner is positioned to %d", oRotorPos);
-                                                       ret=0;
+                                                       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;
+                                                               }
+                                                       }
                                                }
                                        }
-//                                     else
-//                                             eDebug("OK .. can tune this transponder satpos is correct :)");
+                                       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)
+                                                               ret=0;
+                                               }
+                                               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);
-       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)
+{
+       if (turn_speed == eDVBSatelliteRotorParameters::FAST)
+               return true;
+       else if (turn_speed != eDVBSatelliteRotorParameters::SLOW)
+       {
+               int begin = turn_speed >> 16; // high word is start time
+               int end = turn_speed&0xFFFF; // low word is end time
+               time_t now_time = ::time(0);
+               tm nowTime;
+               localtime_r(&now_time, &nowTime);
+               int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1;
+               bool neg = end <= begin;
+               if (neg) {
+                       int tmp = begin;
+                       begin = end;
+                       end = tmp;
+               }
+               if ((now >= begin && now < end) ^ neg)
+                       return true;
+       }
+       return false;
 }
 
 #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)
+#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)
 {
-       bool linked=false;
-       bool depend_satpos_mode=false;
-
-       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.tuner_mask & frontend_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;
 
@@ -242,11 +368,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                if ( sit != lnb_param.m_satellites.end())
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
-                       bool doSetVoltageToneFrontend = true;
                        bool doSetFrontend = true;
-                       int band=0,
-                               linked_to=-1, // linked tuner
-                               satpos_depends_to=-1,
+                       bool doSetVoltageToneFrontend = true;
+                       bool sendDiSEqC = false;
+                       bool forceChanged = false;
+                       bool needDiSEqCReset = false;
+                       long band=0,
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,
@@ -256,38 +383,50 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                lastucsw = -1,
                                lastToneburst = -1,
                                lastRotorCmd = -1,
-                               curRotorPos = -1;
+                               curRotorPos = -1,
+                               satposDependPtr = -1;
+                       iDVBFrontend *sec_fe=&frontend;
+                       eDVBRegisteredFrontend *linked_fe = 0;
+                       eDVBSatelliteDiseqcParameters::t_diseqc_mode diseqc_mode = di_param.m_diseqc_mode;
+                       eDVBSatelliteSwitchParameters::t_voltage_mode voltage_mode = sw_param.m_voltage_mode;
+                       bool diseqc13V = voltage_mode == eDVBSatelliteSwitchParameters::HV_13;
 
-                       frontend.getData(0, lastcsw);
-                       frontend.getData(1, lastucsw);
-                       frontend.getData(2, lastToneburst);
-                       frontend.getData(5, lastRotorCmd);
-                       frontend.getData(6, curRotorPos);
-                       frontend.getData(7, linked_to);
-                       frontend.getData(8, satpos_depends_to);
+                       if (diseqc13V)
+                               voltage_mode = eDVBSatelliteSwitchParameters::HV;
 
-                       if (linked_to != -1)
-                       {
-                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_to;
-                               if (linked_fe->m_inuse)
-                               {
-                                       eDebug("[SEC] frontend is linked with another and the other one is in use.. so we dont do SEC!!");
-                                       linked=true;
-                               }
-                       }
+                       frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);
 
-                       if (satpos_depends_to != -1)
+                       if (!(m_not_linked_slot_mask & slot_id))  // frontend with direct connection?
                        {
-                               eDVBRegisteredFrontend *satpos_fe = (eDVBRegisteredFrontend*) satpos_depends_to;
-                               if (satpos_fe->m_inuse)
+                               long linked_prev_ptr;
+                               frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+                               while (linked_prev_ptr != -1)
                                {
-                                       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;
+                                       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;
 
@@ -298,18 +437,18 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                        parm.FREQUENCY = abs(parm.FREQUENCY);
 
-                       frontend.setData(9, sat.frequency - parm.FREQUENCY);
+                       frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
 
                        if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
                                band |= 2;
 
-                       if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V
+                       if ( voltage_mode == eDVBSatelliteSwitchParameters::_14V
                                || ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical
-                                       && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
+                                       && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
                                voltage = VOLTAGE(13);
-                       else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V
+                       else if ( voltage_mode == eDVBSatelliteSwitchParameters::_18V
                                || ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)
-                                       && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
+                                       && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
                                voltage = VOLTAGE(18);
                        if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
                                || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
@@ -320,7 +459,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);
@@ -330,15 +469,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
@@ -372,7 +511,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;
@@ -392,47 +531,43 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                eDebugNoNewLine("0");
                                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(6, sat.orbital_position);
-                                       else
+                                       int RotorCmd=-1;
+                                       bool useGotoXX = false;
+                                       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,
                                                                        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 );
+       
+                                                       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 };
-
+       
                                                        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
@@ -446,341 +581,421 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                                        RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
                                                                        RotorCmd |= 0xD000;
                                                                }
-                                                               else                                    // west
+                                                               else // west
                                                                {
                                                                        int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
                                                                        RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
                                                                        RotorCmd |= 0xE000;
                                                                }
                                                        }
-                                                       eDebug("RotorCmd = %04x", RotorCmd);
+                                                       eDebugNoSimulate("RotorCmd = %04x", RotorCmd);
                                                }
                                        }
-                               }
-
-                               if ( send_mask )
-                               {
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
-                                       eSecCommand::pair compare;
-                                       compare.voltage = iDVBFrontend::voltageOff;
-                                       compare.steps = +4;
-                                       // the next is a check if voltage is switched off.. then we first set a voltage :)
-                                       // else we set voltage after all diseqc stuff..
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
 
-                                       if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+                                       if ( send_mask )
                                        {
-                                               if (rotor_param.m_inputpower_parameters.m_use)
-                                                       compare.voltage = VOLTAGE(18);  // in input power mode turn rotor always with 18V (fast)
-                                               else
-                                                       compare.voltage = VOLTAGE(13);  // in normal mode start turning with 13V
-                                       }
-                                       else
-                                               compare.voltage = voltage;
-
-                                       // voltage already correct ?
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
-                                       compare.steps = +3;
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-                                       // voltage was disabled..so we wait a longer time .. for normal switches 200ms should be enough
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );
-
-                                       for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
-                                       {
-                                               if ( send_mask & 4 )
+                                               int vlt = iDVBFrontend::voltageOff;
+                                               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]) );
+
+                                               if (diseqc13V)
+                                                       vlt = iDVBFrontend::voltage13;
+                                               else if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                                {
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                                       if (rotor_param.m_inputpower_parameters.m_use)
+                                                               vlt = VOLTAGE(18);  // in input power mode set 18V for measure input power
+                                                       else
+                                                               vlt = VOLTAGE(13);  // in normal mode start turning with 13V
                                                }
+                                               else
+                                                       vlt = voltage;
 
-                                               int loops=0;
+                                               // check if voltage is already correct..
+                                               compare.voltage = vlt;
+                                               compare.steps = +7;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
+
+                                               // check if voltage is disabled
+                                               compare.voltage = iDVBFrontend::voltageOff;
+                                               compare.steps = +4;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 
-                                               if ( send_mask & 1 )
-                                                       ++loops;
-                                               if ( send_mask & 2 )
-                                                       ++loops;
+                                               // voltage is changed... use DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, vlt) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +3) );
 
-                                               for ( int i=0; i < di_param.m_repeats; ++i )
-                                                       loops *= 2;
+                                               // voltage was disabled.. use DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS
+                                               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]) );
 
-                                               for ( int i = 0; i < loops;)  // fill commands...
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
+                                               if (needDiSEqCReset)
                                                {
                                                        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..
+                                                       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, m_params[DELAY_AFTER_DISEQC_RESET_CMD]) );
+                                                       diseqc.data[2] = 3;
+                                                       // diseqc peripherial powersupply on
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD]) );
+                                               }
+
+                                               for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+                                               {
+                                                       if ( send_mask & 4 )
                                                        {
-                                                               diseqc.data[2] = 0x39;
-                                                               diseqc.data[3] = ucsw;
+                                                               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]) );
                                                        }
-                                                       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;
-                                                               if (cmd)
+                                                               eDVBDiseqcCommand diseqc;
+                                                               memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                                                               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 )
                                                                {
-                                                                       static int delay = (120 - 54) / 2;  // standard says 100msek between two repeated commands
-                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) );
-                                                                       diseqc.data[2]=cmd;
-                                                                       diseqc.data[3]=(cmd==0x38) ? csw : ucsw;
-                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                                                       ++i;
-                                                                       if ( i < loops )
-                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay ) );
-                                                                       else
-                                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                                                       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, 120) );
+                                                               else
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
                                                        }
-                                                       else
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-                                               }
 
-                                               if ( send_mask & 8 )  // toneburst at end of sequence
-                                               {
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                                       if ( 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 (di_param.m_seq_repeat && seq_repeat == 0)
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
                                                }
+                                               sendDiSEqC = true;
                                        }
-                               }
 
-                               if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
-                               {
-                                       eSecCommand::pair compare;
-                                       compare.voltage = iDVBFrontend::voltageOff;
-                                       compare.steps = +4;
-                                       // the next is a check if voltage is switched off.. then we first set a voltage :)
-                                       // else we set voltage after all diseqc stuff..
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
-
-                                       if (rotor_param.m_inputpower_parameters.m_use)
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) ); // in normal mode start turning with 13V
-                                       else
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) ); // turn always with 18V
+                                       eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
+                                       if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+                                       {
+                                               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
 
-                                       // voltage was disabled..so we wait a longer time ..
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 500) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +7) );  // no need to send stop rotor cmd
+                                                       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;
+                                               memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                                               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]) );
 
-                                       if (send_mask)
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 750) ); // wait 750ms after send switch cmd
-                                       else
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, +1) );
-
-                                       eDVBDiseqcCommand diseqc;
-                                       diseqc.len = 3;
-                                       diseqc.data[0] = 0xE0;
-                                       diseqc.data[1] = 0x31;  // positioner
-                                       diseqc.data[2] = 0x60;  // stop
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_ROTORPOS_VALID_GOTO, +5) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                       // wait 300msec after send rotor stop cmd
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 300) );
-
-                                       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 = +2;
-                                               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
+                                                       bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
+                                                       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, 200) );  // wait 200msec after voltage change
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-                                               compare.voltage = 1;
-                                               compare.steps = -2;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(13)) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec before measure
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-                                               compare.voltage = 0;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::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, 2) );  // 2 retries
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
+                                                       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, +9 ) );  // timeout .. we assume now the rotor is already at the correct position
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) );  // goto loop start
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::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, 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
 ////////////////////
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 2400) );  // 2 minutes running timeout
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
+                                                       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=+3;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) );  // timeout ? this should never happen
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
+                                                       cmd.direction=0;  // check for stopped rotor
+                                                       cmd.steps=+3;
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) );  // timeout ? this should never happen
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
-                                       }
-                                       else
-                                       {  // use normal turning mode
-                                               doSetVoltageToneFrontend=false;
-                                               doSetFrontend=false;
-                                               eSecCommand::rotor cmd;
-                                               eSecCommand::pair compare;
-                                               compare.voltage = VOLTAGE(13);
-                                               compare.steps = +2;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 200) );  // wait 200msec after voltage change
-
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+                                               }
+                                               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::INVALIDATE_CURRENT_ROTORPARMS) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
 
-                                               compare.voltage = voltage;
-                                               compare.steps = +3;
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
-
-                                               cmd.direction=1;  // check for running rotor
-                                               cmd.deltaA=0;
-                                               cmd.steps=+3;
-                                               cmd.okcount=0;
-
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 480) );  // 2 minutes running timeout
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );  // 250msec delay
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TUNER_LOCKED_GOTO, cmd ) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); 
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -3) );  // goto loop start
+                                                       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_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) );
+                                               }
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
+                                               sendDiSEqC = true;
                                        }
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
-                                       frontend.setData(3, RotorCmd);
-                                       frontend.setData(4, sat.orbital_position);
                                }
                        }
                        else
+                       {
+                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
                                csw = band;
+                       }
+
+//                     if (sendDiSEqC)
+                       sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
 
-                       frontend.setData(0, csw);
-                       frontend.setData(1, ucsw);
-                       frontend.setData(2, di_param.m_toneburst_param);
+                       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 (!linked && doSetVoltageToneFrontend)
+                       if (doSetVoltageToneFrontend)
                        {
                                eSecCommand::pair compare;
                                compare.voltage = voltage;
                                compare.steps = +3;
                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 10) );
-
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_FINAL_VOLTAGE_CHANGE]) );
+                               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, 15) );
+                               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::SLEEP, 50) );
+                       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;
 }
 
 RESULT eDVBSatelliteEquipmentControl::clear()
 {
+       eSecDebug("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
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
-               it->m_frontend->setData(7, -1);
-
-       return 0;
-}
+       m_not_linked_slot_mask=0;
 
-// helper function for setTunerLinked and setTunerDepends
-RESULT eDVBSatelliteEquipmentControl::setDependencyPointers( int tu1, int tu2, int dest_data_byte )
-{
-       if (tu1 == tu2)
-               return -1;
-
-       eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-
-       int cnt=0;
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+       //reset some tuner configuration
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
-               if (cnt == tu1)
-                       p1 = *it;
-               else if (cnt == tu2)
-                       p2 = *it;
+               long tmp;
+               if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
+               {
+                       FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+                       if (!f || fwrite("B", 1, 1, f) != 1)
+                               eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)");
+                       else
+                       {
+                               eDebug("set /proc/stb/tsmux/lnb_b_input to B OK");
+                               fclose(f);
+                       }
+               }
+               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);
        }
-       if (p1 && p2)
+
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_simulate_frontends.begin()); it != m_avail_simulate_frontends.end(); ++it)
        {
-               p1->m_frontend->setData(dest_data_byte, (int)p2);  // this is evil..
-               p2->m_frontend->setData(dest_data_byte, (int)p1);
-               return 0;
+               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 -1;
+
+       return 0;
 }
 
 /* LNB Specific Parameters */
@@ -793,13 +1008,15 @@ RESULT eDVBSatelliteEquipmentControl::addLNB()
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }
+       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
        return 0;
 }
 
-RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
+RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask);
        if ( currentLNBValid() )
-               m_lnbs[m_lnbidx].tuner_mask = tunermask;
+               m_lnbs[m_lnbidx].slot_mask = slotmask;
        else
                return -ENOENT;
        return 0;
@@ -807,6 +1024,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFL(%d)", lofl);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_lo = lofl;
        else
@@ -816,6 +1034,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFH(%d)", lofh);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_hi = lofh;
        else
@@ -825,6 +1044,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBThreshold(%d)", threshold);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_threshold = threshold;
        else
@@ -834,6 +1054,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_increased_voltage = onoff;
        else
@@ -844,6 +1065,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 /* DiSEqC Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setDiSEqcMode(%d)", diseqcmode);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_diseqc_mode = (eDVBSatelliteDiseqcParameters::t_diseqc_mode)diseqcmode;
        else
@@ -853,6 +1075,7 @@ RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setToneburst(%d)", toneburst);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_toneburst_param = (eDVBSatelliteDiseqcParameters::t_toneburst_param)toneburst;
        else
@@ -862,6 +1085,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 
 RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setRepeats(%d)", repeats);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats;
        else
@@ -871,6 +1095,7 @@ RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 
 RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setCommittedCommand(%d)", command);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command;
        else
@@ -880,6 +1105,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setUncommittedCommand(%d)", command);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_uncommitted_cmd = command;
        else
@@ -889,6 +1115,7 @@ RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setCommandOrder(%d)", order);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order;
        else
@@ -898,6 +1125,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 
 RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setFastDiSEqc(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff;
        else
@@ -907,6 +1135,7 @@ RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setSeqRepeat(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_seq_repeat = onoff;
        else
@@ -917,6 +1146,7 @@ RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
 /* Rotor Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLongitude(%f)", longitude);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_longitude=longitude;
        else
@@ -926,6 +1156,7 @@ RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLatitude(%f)", latitude);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_latitude=latitude;
        else
@@ -935,6 +1166,7 @@ RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLoDirection(%d)", direction);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_lo_direction=direction;
        else
@@ -944,6 +1176,7 @@ RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setLaDirection(%d)", direction);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_la_direction=direction;
        else
@@ -953,6 +1186,7 @@ RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setUseInputpower(%d)", onoff);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_use=onoff;
        else
@@ -962,6 +1196,7 @@ RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setInputpowerDelta(%d)", delta);
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_delta=delta;
        else
@@ -972,6 +1207,7 @@ RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::addSatellite(%d)", orbital_position);
        if ( currentLNBValid() )
        {
                std::map<int, eDVBSatelliteSwitchParameters>::iterator it =
@@ -997,6 +1233,7 @@ RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 
 RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setVoltageMode(%d)", mode);
        if ( currentLNBValid() && m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
                m_curSat->second.m_voltage_mode = (eDVBSatelliteSwitchParameters::t_voltage_mode)mode;
        else
@@ -1007,6 +1244,7 @@ RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setToneMode(%d)", mode);
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
@@ -1021,6 +1259,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
 {
+       eSecDebug("eDVBSatelliteEquipmentControl::setRotorPosNum(%d)", rotor_pos_num);
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
@@ -1033,6 +1272,16 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
        return 0;
 }
 
+RESULT eDVBSatelliteEquipmentControl::setRotorTurningSpeed(int speed)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setRotorTurningSpeed(%d)", speed);
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_turning_speed = speed;
+       else
+               return -ENOENT;
+       return 0;
+}
+
 struct sat_compare
 {
        int orb_pos, lofl, lofh;
@@ -1058,93 +1307,98 @@ struct sat_compare
        }
 };
 
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
+RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
-       PyObject *ret=0;
-
-       int tu1_mask = 1 << tu1,
-               tu2_mask = 1 << tu2;
-
+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
        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)
+
+               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)
                {
-                       // check for linked tuners
-                       int tmp1, tmp2;
-                       p1->m_frontend->getData(7, tmp1);
-                       p2->m_frontend->getData(7, tmp2);
-                       if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+                       p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
+                       p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
+                       if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)"))
                        {
-                               // check for rotor dependency
-                               p1->m_frontend->getData(8, tmp1);
-                               p2->m_frontend->getData(8, tmp2);
-                               if ((void*)tmp1 != p2 && (void*)tmp2 != p1)
+                               FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+                               if (!f || fwrite("A", 1, 1, f) != 1)
+                                       eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)");
+                               else
                                {
-                                       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.tuner_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 )
-                                                               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));
-                                       }
+                                       eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
+                                       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;
+               }
        }
-       if (!ret)
-       {
-               ret = PyList_New(2);
-               PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
-               PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
-       }
-       return ret;
+       return -1;
 }
 
-RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
+RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 {
-       return setDependencyPointers(tu1, tu2, 7);
+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerDepends(%d, %d)", tu1, tu2);
+       if (tu1 == tu2)
+               return -1;
+
+       eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
+
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_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::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)
+       {
+               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
+               return 0;
+       }
+
+       return -1;
 }
 
-RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
+void eDVBSatelliteEquipmentControl::setSlotNotLinked(int slot_no)
 {
-       return setDependencyPointers(tu1, tu2, 8);
+       eSecDebug("eDVBSatelliteEquipmentControl::setSlotNotLinked(%d)", slot_no);
+       m_not_linked_slot_mask |= (1 << slot_no);
 }
 
 bool eDVBSatelliteEquipmentControl::isRotorMoving()