replace eFatal (which can occour during servicescan at some conditions) with

[enigma2.git] / lib / dvb / sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 48ab922affa5781c1493eb232886ee4b19ceee26..d56024e142e90bb94680697e65594360c3544455 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -1,39 +1,54 @@
-#include <config.h>

 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>

+#include <lib/dvb/dvbtime.h>
+
+#include <set>

 
 #if HAVE_DVB_API_VERSION < 3
 
 #if HAVE_DVB_API_VERSION < 3

-#define INVERSION Inversion

 #define FREQUENCY Frequency
 #define FREQUENCY Frequency

-#define FEC_INNER FEC_inner
-#define SYMBOLRATE SymbolRate

 #else
 #else

-#define INVERSION inversion

 #define FREQUENCY frequency
 #define FREQUENCY frequency

-#define FEC_INNER fec_inner
-#define SYMBOLRATE symbol_rate

 #endif
 #include <lib/base/eerror.h>
 
 #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;
 
 DEFINE_REF(eDVBSatelliteEquipmentControl);
 
 eDVBSatelliteEquipmentControl *eDVBSatelliteEquipmentControl::instance;
 

+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)
 eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends)

-       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends)
+       :m_lnbidx(-1), m_curSat(m_lnbs[0].m_satellites.end()), m_avail_frontends(avail_frontends), m_rotorMoving(false)

 {
        if (!instance)
                instance = this;
 
        clear();
 
 {
        if (!instance)
                instance = this;
 
        clear();
 

-#if 0

 // ASTRA
        addLNB();
 // ASTRA
        addLNB();

-       setLNBTunerMask(3);
+       setLNBSlotMask(3);

        setLNBLOFL(9750000);
        setLNBLOFL(9750000);

-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);

        setLNBLOFH(10607000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
        setLNBLOFH(10607000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);


@@ -48,9 +63,9 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 // Hotbird
        addLNB();
 
 // Hotbird
        addLNB();

-       setLNBTunerMask(3);
+       setLNBSlotMask(3);

        setLNBLOFL(9750000);
        setLNBLOFL(9750000);

-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);

        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);


@@ -62,13 +77,12 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        addSatellite(130);
        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);
        addSatellite(130);
        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);

-#endif

 
 // Rotor
        addLNB();
 
 // Rotor
        addLNB();

-       setLNBTunerMask(3);
+       setLNBSlotMask(3);

        setLNBLOFL(9750000);
        setLNBLOFL(9750000);

-       setLNBThreshold(11750000);
+       setLNBThreshold(11700000);

        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);
        setLNBLOFH(10600000);
        setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
        setToneburst(eDVBSatelliteDiseqcParameters::NO);


@@ -84,12 +98,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setUseInputpower(true);
        setInputpowerDelta(50);
 
        setUseInputpower(true);
        setInputpowerDelta(50);
 

-       addSatellite(130);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-       setRotorPosNum(0);
-
-       addSatellite(192);
+       addSatellite(235);

        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);
        setRotorPosNum(0);
        setVoltageMode(eDVBSatelliteSwitchParameters::HV);
        setToneMode(eDVBSatelliteSwitchParameters::HILO);
        setRotorPosNum(0);


@@ -105,120 +114,205 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
        setRotorPosNum(1); // stored pos 1
 }
 
        setRotorPosNum(1); // stored pos 1
 }
 

-int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
+int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id, int *highest_score_lnb)

 {
 {

-       int ret=0;
+       int score=0, satcount=0;
+
+       if (highest_score_lnb)
+               *highest_score_lnb = -1;

 
        for (int idx=0; idx <= m_lnbidx; ++idx )
        {
 
        for (int idx=0; idx <= m_lnbidx; ++idx )
        {

+               bool rotor=false;

                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];

-               if ( lnb_param.tuner_mask & frontend_id ) // lnb for correct tuner?
+               if ( lnb_param.slot_mask & slot_id ) // lnb for correct tuner?

                {
                {

+                       int ret = 0;

                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 

+                       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())
                        {
                        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=0, // linked tuner
+                               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;
 
                                        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(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.frequency > lnb_param.m_lof_threshold )
                                        band |= 1;

-                               if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
+                               if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))

                                        band |= 2;
 
                                        band |= 2;
 

-                               bool rotor=false;

                                bool diseqc=false;
 
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                                {
                                        diseqc=true;
                                        if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
                                bool diseqc=false;
 
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                                {
                                        diseqc=true;
                                        if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )

-                                       {

                                                csw = 0xF0 | (csw << 2);
                                                csw = 0xF0 | (csw << 2);

+
+                                       if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO)

                                                csw |= band;
                                                csw |= band;

-                                       }

 
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
 
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR

+                                               rotor = true;
+
+                                       ret=10000;
+                               }
+                               else
+                               {
+                                       csw = band;
+                                       ret = 15000;
+                               }
+
+                               if (m_not_linked_slot_mask & slot_id)  // frontend with direct connection?
+                               {
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       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..

                                        {
                                        {

-                                               rotor=true;
-                                               if ( curRotorPos == sat.orbital_position )
-                                                       ret=20;
-                                               else
-                                                       ret=10;
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               if (linked_fe->m_inuse)
+                                               {
+                                                       if ( (csw != ocsw) ||
+                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                               ( rotor && curRotorPos != sat.orbital_position ) )
+                                                       {
+                                                               ret=0;
+                                                       }
+                                               }
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                       }
+                                       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);

                                        }
                                }
                                        }
                                }

-                               
-                               if (!ret)
-                                       ret=40;
-
-                               if (linked_to != -1)  // check for linked tuners..
+                               else // linked frontend..

                                {
                                {

-                                       bool found=false;
-                                       eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin());
-                                       for (; it != m_avail_frontends.end(); ++it)
-                                               if ( !linked_to )
+                                       long ocsw = -1,
+                                               oucsw = -1,
+                                               oToneburst = -1;
+                                       while (linked_prev_ptr != -1)
+                                       {
+                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+                                               if (linked_prev_ptr == -1)

                                                {
                                                {

-                                                       found=true;
-                                                       break;
+                                                       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);
+                                                               if ( (csw != ocsw) ||
+                                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
+                                                                       ( rotor && curRotorPos != sat.orbital_position ) )
+                                                               {
+                                                                       ret=0;
+                                                               }
+                                                       }

                                                }
                                                }

-                                               else
-                                                       --linked_to;
+                                       }
+                               }
+
+                               if (ret && rotor && curRotorPos != -1)
+                                       ret -= abs(curRotorPos-sat.orbital_position);

 
 

-                                       if (found && it->m_inuse)
+                               if (ret)
+                                       if (satpos_depends_ptr != -1)

                                        {
                                        {

-                                               int ocsw = -1,
-                                                       oucsw = -1,
-                                                       oToneburst = -1,
-                                                       oRotorPos = -1;
-                                               it->m_frontend->getData(0, ocsw);
-                                               it->m_frontend->getData(1, oucsw);
-                                               it->m_frontend->getData(2, oToneburst);
-                                               it->m_frontend->getData(6, oRotorPos);
-
-                                               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);
-
-                                               if ( (csw != ocsw) ||
-                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-                                                       ( rotor && oRotorPos != sat.orbital_position ) )
+                                               eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
+                                               if ( satpos_depends_to_fe->m_inuse )

                                                {
                                                {

-                                                       eDebug("can not tune this transponder with linked tuner in use!!");
-                                                       ret=0;
+                                                       if (!rotor || curRotorPos != sat.orbital_position)
+                                                               ret=0;

                                                }
                                                }

-                                               else
-                                                       eDebug("OK .. can tune this transponder with linked tuner in use :)");

                                        }
                                        }

+
+                               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);
+                                       if (tuner_freq < 900000 || tuner_freq > 2200000)
+                                               ret=0;
+                               }
+                               if (ret > score)
+                               {
+                                       score = ret;
+                                       if (highest_score_lnb)
+                                               *highest_score_lnb = idx;

                                }
                        }
                }
        }
                                }
                        }
                }
        }

-       return ret;
+       if (score && satcount)
+               score -= (satcount-1);
+       if (score && m_not_linked_slot_mask & slot_id)
+               score += 5; // increase score for tuners with direct sat connection
+       return score;

 }
 
 }
 

-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)
+bool need_turn_fast(int turn_speed)

 {
 {

-       bool linked=false;
+       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;
+}

 
 

-       for (int idx=0; idx <= m_lnbidx; ++idx )
+#define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x)
+
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
+{
+       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;
 
                eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
                eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
 


@@ -227,9 +321,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                if ( sit != lnb_param.m_satellites.end())
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
                if ( sit != lnb_param.m_satellites.end())
                {
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;

-
-                       int band=0,
-                               linked_to=-1, // linked tuner
+                       bool doSetFrontend = true;
+                       bool doSetVoltageToneFrontend = true;
+                       bool allowDiseqc1_2 = true;
+                       bool sendDiSEqC = false;
+                       long band=0,

                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,
                                voltage = iDVBFrontend::voltageOff,
                                tone = iDVBFrontend::toneOff,
                                csw = di_param.m_committed_cmd,


@@ -239,34 +335,32 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                lastucsw = -1,
                                lastToneburst = -1,
                                lastRotorCmd = -1,
                                lastucsw = -1,
                                lastToneburst = -1,
                                lastRotorCmd = -1,

-                               curRotorPos = -1;
+                               curRotorPos = -1,
+                               satposDependPtr = -1;
+                       iDVBFrontend *sec_fe=&frontend;

 
 

-                       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(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);

 
 

-                       if (linked_to != -1)
+                       if (!(m_not_linked_slot_mask & slot_id))  // frontend with direct connection?

                        {
                        {

-                               bool found=false;
-                               eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin());
-                               for (; it != m_avail_frontends.end(); ++it)
-                                       if ( !linked_to )
-                                       {
-                                               found=true;
-                                               break;
-                                       }
-                                       else
-                                               --linked_to;
-                               if (found && it->m_inuse)
+                               long linked_prev_ptr;
+                               frontend.getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+                               while (linked_prev_ptr != -1)

                                {
                                {

-                                       eDebug("[SEC] frontend is linked with another one and the other is in use.. so we dont do SEC!!");
-                                       linked=true;
+                                       eDVBRegisteredFrontend *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)
+                                       allowDiseqc1_2 = false;

                        }
 
                        }
 

+                       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 ( sat.frequency > lnb_param.m_lof_threshold )
                                band |= 1;
 
                        if ( sat.frequency > lnb_param.m_lof_threshold )
                                band |= 1;
 


@@ -275,47 +369,21 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        else
                                parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo;
 
                        else
                                parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo;
 

-                       if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
-                               band |= 2;
-
-                       parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
+                       parm.FREQUENCY = abs(parm.FREQUENCY);

 
 

-                       switch (sat.fec)
-                       {
-                               default:
-                               case eDVBFrontendParametersSatellite::FEC::fNone:
-                                       eDebug("no fec set.. assume auto");
-                               case eDVBFrontendParametersSatellite::FEC::fAuto:
-                                       parm.u.qpsk.FEC_INNER = FEC_AUTO;
-                                       break;
-                               case eDVBFrontendParametersSatellite::FEC::f1_2:
-                                       parm.u.qpsk.FEC_INNER = FEC_1_2;
-                                       break;
-                               case eDVBFrontendParametersSatellite::FEC::f2_3:
-                                       parm.u.qpsk.FEC_INNER = FEC_2_3;
-                                       break;
-                               case eDVBFrontendParametersSatellite::FEC::f3_4:
-                                       parm.u.qpsk.FEC_INNER = FEC_3_4;
-                                       break;
-                               case eDVBFrontendParametersSatellite::FEC::f5_6:
-                                       parm.u.qpsk.FEC_INNER = FEC_5_6;
-                                       break;
-                               case eDVBFrontendParametersSatellite::FEC::f7_8: 
-                                       parm.u.qpsk.FEC_INNER = FEC_7_8;
-                                       break;
-                       }
+                       frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);

 
 

-                       parm.u.qpsk.SYMBOLRATE = sat.symbol_rate;
+                       if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
+                               band |= 2;

 
                        if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V
 
                        if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_14V

-                               || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical
+                               || ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical

                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )

-                               voltage = iDVBFrontend::voltage13;
+                               voltage = VOLTAGE(13);

                        else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V
                        else if ( sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::_18V

-                               || ( sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal
+                               || ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)

                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
                                        && sw_param.m_voltage_mode == eDVBSatelliteSwitchParameters::HV )  )

-                               voltage = iDVBFrontend::voltage18;
-
+                               voltage = VOLTAGE(18);

                        if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
                                || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
                                tone = iDVBFrontend::toneOn;
                        if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
                                || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
                                tone = iDVBFrontend::toneOn;


@@ -328,10 +396,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {
                                if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )
                        if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {
                                if ( di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO )

-                               {

                                        csw = 0xF0 | (csw << 2);
                                        csw = 0xF0 | (csw << 2);

+
+                               if (di_param.m_committed_cmd <= eDVBSatelliteDiseqcParameters::SENDNO)

                                        csw |= band;
                                        csw |= band;

-                               }

 
                                bool send_csw =
                                        (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);
 
                                bool send_csw =
                                        (di_param.m_committed_cmd != eDVBSatelliteDiseqcParameters::SENDNO);


@@ -345,198 +413,281 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                        (di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
                                bool changed_burst = send_burst && toneburst != lastToneburst;
 
                                        (di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO);
                                bool changed_burst = send_burst && toneburst != lastToneburst;
 

-                               bool send_diseqc = changed_ucsw;
-                               if (!send_diseqc)
-                                       send_diseqc = changed_burst && (send_ucsw || send_csw);
-                               if (!send_diseqc)
+                               int send_mask = 0; /*
+                                       1 must send csw
+                                       2 must send ucsw
+                                       4 send toneburst first
+                                       8 send toneburst at end */
+                               if (changed_burst) // toneburst first and toneburst changed

                                {
                                {

-                                       send_diseqc = changed_csw;
-                                       if ( send_diseqc && di_param.m_use_fast && (csw & 0xF0) && (lastcsw & 0xF0) && ((csw / 4) == (lastcsw / 4)) )
+                                       if (di_param.m_command_order&1)

                                        {
                                        {

-                                               frontend.setData(0, csw);  // needed for linked tuner handling
-                                               send_diseqc = false;
+                                               send_mask |= 4;
+                                               if ( send_csw )
+                                                       send_mask |= 1;
+                                               if ( send_ucsw )
+                                                       send_mask |= 2;

                                        }
                                        }

+                                       else
+                                               send_mask |= 8;

                                }
                                }

-
-                               if ( send_diseqc || changed_burst )
+                               if (changed_ucsw)

                                {
                                {

-                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-                                       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, 50) );
+                                       send_mask |= 2;
+                                       if ((di_param.m_command_order&4) && send_csw)
+                                               send_mask |= 1;
+                                       if (di_param.m_command_order==4 && send_burst)
+                                               send_mask |= 8;

                                }
                                }

-
-                               for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+                               if (changed_csw) 

                                {
                                {

-                                       if ( di_param.m_command_order & 1 && // toneburst at begin of sequence
-                                               changed_burst && di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
+                                       if ( di_param.m_use_fast
+                                               && di_param.m_committed_cmd < eDVBSatelliteDiseqcParameters::SENDNO
+                                               && (lastcsw & 0xF0)
+                                               && ((csw / 4) == (lastcsw / 4)) )
+                                               eDebug("dont send committed cmd (fast diseqc)");
+                                       else

                                        {
                                        {

-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                                               send_mask |= 1;
+                                               if (!(di_param.m_command_order&4) && send_ucsw)
+                                                       send_mask |= 2;
+                                               if (!(di_param.m_command_order&1) && send_burst)
+                                                       send_mask |= 8;

                                        }
                                        }

+                               }

 
 

-                                       if ( send_diseqc )
+#if 0
+                               eDebugNoNewLine("sendmask: ");
+                               for (int i=3; i >= 0; --i)
+                                       if ( send_mask & (1<<i) )
+                                               eDebugNoNewLine("1");
+                                       else
+                                               eDebugNoNewLine("0");
+                               eDebug("");
+#endif
+                               if (doSetVoltageToneFrontend)
+                               {
+                                       int RotorCmd=-1;
+                                       bool useGotoXX = false;
+                                       if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+                                               && !sat.no_rotor_command_on_tune
+                                               && allowDiseqc1_2 )

                                        {
                                        {

-                                               int loops=0;
-
-                                               if ( send_csw )
-                                                       ++loops;
-                                               if ( send_ucsw )
-                                                       ++loops;
-
-                                               for ( int i=0; i < di_param.m_repeats; ++i )
-                                                       loops *= 2;
-
-                                               for ( int i = 0; i < loops;)  // fill commands...
+                                               if (sw_param.m_rotorPosNum) // we have stored rotor pos?
+                                                       RotorCmd=sw_param.m_rotorPosNum;
+                                               else  // we must calc gotoxx cmd

                                                {
                                                {

-                                                       eDVBDiseqcCommand diseqc;
-                                                       diseqc.len = 4;
-                                                       diseqc.data[0] = i ? 0xE1 : 0xE0;
-                                                       diseqc.data[1] = 0x10;
-
-                                                       if ( !send_csw || (send_ucsw && (di_param.m_command_order & 4) ) )
+                                                       eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 );
+                                                       useGotoXX = true;
+       
+                                                       double  SatLon = abs(sat.orbital_position)/10.00,
+                                                                       SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
+                                                                       SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
+       
+                                                       if ( rotor_param.m_gotoxx_parameters.m_la_direction == eDVBSatelliteRotorParameters::SOUTH )
+                                                               SiteLat = -SiteLat;
+       
+                                                       if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
+                                                               SiteLon = 360 - SiteLon;
+       
+                                                       eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
+                                                       double satHourAngle =
+                                                               calcSatHourangle( SatLon, SiteLat, SiteLon );
+                                                       eDebug("PolarmountHourAngle=%lf", satHourAngle );
+       
+                                                       static int gotoXTable[10] =
+                                                               { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
+       
+                                                       if (SiteLat >= 0) // Northern Hemisphere

                                                        {
                                                        {

-                                                               diseqc.data[2] = 0x39;
-                                                               diseqc.data[3] = ucsw;
-                                                       }
-                                                       else
-                                                       {
-                                                               diseqc.data[2] = 0x38;
-                                                               diseqc.data[3] = csw;
+                                                               int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 );
+                                                               RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+       
+                                                               if (satHourAngle < 180) // the east
+                                                                       RotorCmd |= 0xE000;
+                                                               else                                    // west
+                                                                       RotorCmd |= 0xD000;

                                                        }
                                                        }

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-
-                                                       i++;
-                                                       if ( i < loops )
+                                                       else // Southern Hemisphere

                                                        {
                                                        {

-                                                               int cmd=0;
-                                                               if (diseqc.data[2] == 0x38 && send_ucsw)
-                                                                       cmd=0x39;
-                                                               else if (diseqc.data[2] == 0x39 && send_csw)
-                                                                       cmd=0x38;
-                                                               if (cmd)
+                                                               if (satHourAngle < 180) // the east
+                                                               {
+                                                                       int tmp=(int)round( fabs( satHourAngle ) * 10.0 );
+                                                                       RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+                                                                       RotorCmd |= 0xD000;
+                                                               }
+                                                               else // west

                                                                {
                                                                {

-                                                                       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 tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
+                                                                       RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+                                                                       RotorCmd |= 0xE000;

                                                                }
                                                                }

-                                                               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, 50) );
-
-                                                       frontend.setData(0, csw);
-                                                       frontend.setData(1, ucsw);
-                                                       frontend.setData(2, di_param.m_toneburst_param);
+                                                       eDebug("RotorCmd = %04x", RotorCmd);

                                                }
                                        }
 
                                                }
                                        }
 

-                                       if ( !(di_param.m_command_order & 1) && // toneburst at end of sequence
-                                               (changed_burst || send_diseqc) && di_param.m_toneburst_param != eDVBSatelliteDiseqcParameters::NO )
+                                       if ( send_mask )

                                        {
                                        {

-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
-                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
-                                               frontend.setData(2, di_param.m_toneburst_param);
-                                       }
-                               }
+                                               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 ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
+                                               {
+                                                       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;

 
 

-                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
-                               {
-                                       int RotorCmd=0;
-                                       bool useGotoXX = false;
+                                               // check if voltage is already correct..
+                                               compare.voltage = vlt;
+                                               compare.steps = +7;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );

 
 

-                                       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 );
-                                               useGotoXX = true;
+                                               // check if voltage is disabled
+                                               compare.voltage = iDVBFrontend::voltageOff;
+                                               compare.steps = +4;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );

 
 

-                                               int satDir = sat.orbital_position < 0 ?
-                                                       eDVBSatelliteRotorParameters::WEST :
-                                                       eDVBSatelliteRotorParameters::EAST;
+                                               // 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) );

 
 

-                                               double  SatLon = abs(sat.orbital_position)/10.00,
-                                                               SiteLat = rotor_param.m_gotoxx_parameters.m_latitude,
-                                                               SiteLon = rotor_param.m_gotoxx_parameters.m_longitude;
+                                               // 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]) );

 
 

-                                               if ( rotor_param.m_gotoxx_parameters.m_la_direction == eDVBSatelliteRotorParameters::SOUTH )
-                                                       SiteLat = -SiteLat;
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
+                                               for (int seq_repeat = 0; seq_repeat < (di_param.m_seq_repeat?2:1); ++seq_repeat)
+                                               {
+                                                       if ( send_mask & 4 )
+                                                       {
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_TONEBURST, di_param.m_toneburst_param) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_TONEBURST]) );
+                                                       }

 
 

-                                               if ( rotor_param.m_gotoxx_parameters.m_lo_direction == eDVBSatelliteRotorParameters::WEST )
-                                                       SiteLon = 360 - SiteLon;
+                                                       int loops=0;

 
 

-                                               if (satDir == eDVBSatelliteRotorParameters::WEST )
-                                                       SatLon = 360 - SatLon;
+                                                       if ( send_mask & 1 )
+                                                               ++loops;
+                                                       if ( send_mask & 2 )
+                                                               ++loops;

 
 

-                                               eDebug("siteLatitude = %lf, siteLongitude = %lf, %lf degrees", SiteLat, SiteLon, SatLon );
-                                               double satHourAngle =
-                                                       calcSatHourangle( SatLon, SiteLat, SiteLon );
-                                               eDebug("PolarmountHourAngle=%lf", satHourAngle );
+                                                       loops <<= di_param.m_repeats;

 
 

-                                               static int gotoXTable[10] =
-                                                       { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
+                                                       for ( int i = 0; i < loops;)  // fill commands...
+                                                       {
+                                                               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) );

 
 

-                                               if (SiteLat >= 0) // Northern Hemisphere
-                                               {
-                                                       int tmp=(int)round( fabs( 180 - satHourAngle ) * 10.0 );
-                                                       RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
+                                                               i++;
+                                                               if ( i < loops )
+                                                               {
+                                                                       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
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+                                                       }

 
 

-                                                       if (satHourAngle < 180) // the east
-                                                               RotorCmd |= 0xE000;
-                                                       else                                    // west
-                                                               RotorCmd |= 0xD000;
-                                               }
-                                               else // Southern Hemisphere
-                                               {
-                                                       if (satHourAngle < 180) // the east
+                                                       if ( send_mask & 8 )  // toneburst at end of sequence

                                                        {
                                                        {

-                                                               int tmp=(int)round( fabs( satHourAngle ) * 10.0 );
-                                                               RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-                                                               RotorCmd |= 0xD000;
-                                                       }
-                                                       else                                    // west
-                                                       {          
-                                                               int tmp=(int)round( fabs( 360 - satHourAngle ) * 10.0 );
-                                                               RotorCmd = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
-                                                               RotorCmd |= 0xE000;
+                                                               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]) );

                                                        }
                                                }
                                                        }
                                                }

-                                               eDebug("RotorCmd = %04x", RotorCmd);
+                                               sendDiSEqC = true;

                                        }
                                        }

-                                       if ( RotorCmd != lastRotorCmd )
+
+                                       eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
+                                       if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )

                                        {
                                        {

-                                               if ( changed_burst || send_diseqc )
-                                               {
-                                                       // override first voltage change
-                                                       *(++(++sec_sequence.begin()))=eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13);
-                                                       // wait 1 second after first switch diseqc command
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) );
-                                               }
-                                               else  // no other diseqc commands before
+                                               eSecCommand::pair compare;
+                                               if (!send_mask)

                                                {
                                                {

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );  // wait 15msec after tone change
-                                                       eSecCommand::pair compare;
-                                                       compare.voltage = voltage;

                                                        compare.steps = +3;
                                                        compare.steps = +3;

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
+                                                       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
+
+                                                       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;
 
                                                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]) );
+

                                                diseqc.data[0] = 0xE0;
                                                diseqc.data[1] = 0x31;          // positioner
                                                if ( useGotoXX )
                                                diseqc.data[0] = 0xE0;
                                                diseqc.data[1] = 0x31;          // positioner
                                                if ( useGotoXX )


@@ -551,23 +702,32 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        diseqc.len = 4;
                                                        diseqc.data[2] = 0x6B;  // goto stored sat position
                                                        diseqc.data[3] = RotorCmd;
                                                        diseqc.len = 4;
                                                        diseqc.data[2] = 0x6B;  // goto stored sat position
                                                        diseqc.data[3] = RotorCmd;

+                                                       diseqc.data[4] = 0x00;

                                                }
 
                                                if ( rotor_param.m_inputpower_parameters.m_use )
                                                { // use measure rotor input power to detect rotor state
                                                }
 
                                                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::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
 // measure idle power values

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_IDLE_INPUTPOWER_AVAIL_GOTO, +8) ); // already measured?
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec after voltage change
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 0) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 100) );  // wait 100msec before measure
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::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) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) ); // back to lower voltage
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
+                                                       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::SLEEP, 50) );  // wait 50msec after voltage change
+                                                       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::SEND_DISEQC, diseqc) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
 // rotor start loop


@@ -575,82 +735,168 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        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;
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
                                                        cmd.direction=1;  // check for running rotor
                                                        cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;

-                                                       cmd.steps=+3;
+                                                       cmd.steps=+5;

                                                        cmd.okcount=0;
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );  // check if rotor has started
                                                        cmd.okcount=0;
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );  // check if rotor has started

-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +10 ) );  // timeout .. we assume now the rotor is already at the correct position
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::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::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, iDVBFrontend::voltage18) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+                                                       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 ) );
 // 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::IF_TIMEOUT_GOTO, +2 ) );  // timeout ? this should never happen

                                                        sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
 /////////////////////
                                                        sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );

-                                                       if ( linked )
-                                                       {
-                                                               frontend.setData(5, RotorCmd);
-                                                               frontend.setData(6, sat.orbital_position);
-                                                       }
-                                                       else
-                                                       {
-                                                               frontend.setData(3, RotorCmd);
-                                                               frontend.setData(4, sat.orbital_position);
-                                                       }
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );

                                                }
                                                else
                                                }
                                                else

-                                                       eFatal("rotor turning without inputpowermeasure not implemented yet");
+                                               {  // 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) );
+
+                                                       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;

                                        }
                                }
                        }
                        else
                                        }
                                }
                        }
                        else

-                               frontend.setData(0, band); // store band as csw .. needed for linked tuner handling
+                       {
+                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS) );
+                               csw = band;
+                       }

 
 

-                       if ( linked )
-                               return 0;
+                       if (sendDiSEqC)
+                               sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );

 
 

-                       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_fe->setData(eDVBFrontend::NEW_CSW, csw);
+                       sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
+                       sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);

 
 

-                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
-                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 15) );
+                       if (doSetVoltageToneFrontend)
+                       {
+                               eSecCommand::pair compare;
+                               compare.voltage = voltage;
+                               compare.steps = +3;
+                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // voltage already correct ?
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 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, 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, tunetimeout) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+                       }
+
+                       if (sendDiSEqC)
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );

 
                        frontend.setSecSequence(sec_sequence);
 
                        return 0;
                }
        }
 
                        frontend.setSecSequence(sec_sequence);
 
                        return 0;
                }
        }

-
-       if (linked)
-               return 0;
-
-       eDebug("found no satellite configuration for orbital position (%d)", sat.orbital_position );
+       eDebug("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()
 {
        return -1;
 }
 
 RESULT eDVBSatelliteEquipmentControl::clear()
 {

-       for (int i=0; i < m_lnbidx; ++i)
+       eSecDebug("eDVBSatelliteEquipmentControl::clear()");
+       for (int i=0; i <= m_lnbidx; ++i)

        {
                m_lnbs[i].m_satellites.clear();
        {
                m_lnbs[i].m_satellites.clear();

-               m_lnbs[i].tuner_mask = 0;
+               m_lnbs[i].slot_mask = 0;

        }
        m_lnbidx=-1;
 
        }
        m_lnbidx=-1;
 

-// clear linked tuner configuration
+       m_not_linked_slot_mask=0;
+
+       //reset some tuner configuration

        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)

-               it->m_frontend->setData(7, -1);
+       {
+               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);
+       }

 
        return 0;
 }
 
        return 0;
 }


@@ -658,20 +904,22 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 /* LNB Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addLNB()
 {
 /* LNB Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addLNB()
 {

-       if ( m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)))
+       if ( (m_lnbidx+1) < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)))

                m_curSat=m_lnbs[++m_lnbidx].m_satellites.end();
        else
        {
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }
                m_curSat=m_lnbs[++m_lnbidx].m_satellites.end();
        else
        {
                eDebug("no more LNB free... cnt is %d", m_lnbidx);
                return -ENOSPC;
        }

+       eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);

        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
+RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask)

 {
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask);

        if ( currentLNBValid() )
        if ( currentLNBValid() )

-               m_lnbs[m_lnbidx].tuner_mask = tunermask;
+               m_lnbs[m_lnbidx].slot_mask = slotmask;

        else
                return -ENOENT;
        return 0;
        else
                return -ENOENT;
        return 0;


@@ -679,6 +927,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBTunerMask(int tunermask)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFL(%d)", lofl);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_lo = lofl;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_lo = lofl;
        else


@@ -688,6 +937,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFL(int lofl)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBLOFH(%d)", lofh);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_hi = lofh;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_hi = lofh;
        else


@@ -697,6 +947,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBLOFH(int lofh)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBThreshold(%d)", threshold);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_threshold = threshold;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_lof_threshold = threshold;
        else


@@ -706,6 +957,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBThreshold(int threshold)
 
 RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(%d)", onoff);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_increased_voltage = onoff;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_increased_voltage = onoff;
        else


@@ -716,6 +968,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
 /* DiSEqC Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 {
 /* 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_diseqc_mode = (eDVBSatelliteDiseqcParameters::t_diseqc_mode)diseqcmode;
        else


@@ -725,6 +978,7 @@ RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 {
 
 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_toneburst_param = (eDVBSatelliteDiseqcParameters::t_toneburst_param)toneburst;
        else


@@ -734,6 +988,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneburst(int toneburst)
 
 RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setRepeats(%d)", repeats);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_repeats=repeats;
        else


@@ -743,6 +998,7 @@ RESULT eDVBSatelliteEquipmentControl::setRepeats(int repeats)
 
 RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setCommittedCommand(%d)", command);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_committed_cmd=command;
        else


@@ -752,6 +1008,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_uncommitted_cmd = command;
        else


@@ -761,6 +1018,7 @@ RESULT eDVBSatelliteEquipmentControl::setUncommittedCommand(int command)
 
 RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setCommandOrder(%d)", order);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_command_order=order;
        else


@@ -770,6 +1028,7 @@ RESULT eDVBSatelliteEquipmentControl::setCommandOrder(int order)
 
 RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setFastDiSEqc(%d)", onoff);

        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff;
        else
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_use_fast=onoff;
        else


@@ -779,6 +1038,7 @@ RESULT eDVBSatelliteEquipmentControl::setFastDiSEqC(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_diseqc_parameters.m_seq_repeat = onoff;
        else


@@ -789,6 +1049,7 @@ RESULT eDVBSatelliteEquipmentControl::setSeqRepeat(bool onoff)
 /* Rotor Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 {
 /* 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_longitude=longitude;
        else


@@ -798,6 +1059,7 @@ RESULT eDVBSatelliteEquipmentControl::setLongitude(float longitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 {
 
 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_latitude=latitude;
        else


@@ -807,6 +1069,7 @@ RESULT eDVBSatelliteEquipmentControl::setLatitude(float latitude)
 
 RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 {
 
 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_lo_direction=direction;
        else


@@ -816,6 +1079,7 @@ RESULT eDVBSatelliteEquipmentControl::setLoDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setLaDirection(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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_gotoxx_parameters.m_la_direction=direction;
        else


@@ -825,6 +1089,7 @@ RESULT eDVBSatelliteEquipmentControl::setLaDirection(int direction)
 
 RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 {
 
 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_use=onoff;
        else


@@ -834,6 +1099,7 @@ RESULT eDVBSatelliteEquipmentControl::setUseInputpower(bool onoff)
 
 RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 {
 
 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
        if ( currentLNBValid() )
                m_lnbs[m_lnbidx].m_rotor_parameters.m_inputpower_parameters.m_delta=delta;
        else


@@ -844,6 +1110,7 @@ RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {
 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::addSatellite(%d)", orbital_position);

        if ( currentLNBValid() )
        {
                std::map<int, eDVBSatelliteSwitchParameters>::iterator it =
        if ( currentLNBValid() )
        {
                std::map<int, eDVBSatelliteSwitchParameters>::iterator it =


@@ -869,6 +1136,7 @@ RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 
 RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 {
 
 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
        if ( currentLNBValid() && m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
                m_curSat->second.m_voltage_mode = (eDVBSatelliteSwitchParameters::t_voltage_mode)mode;
        else


@@ -879,6 +1147,7 @@ RESULT eDVBSatelliteEquipmentControl::setVoltageMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 {
 
 RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setToneMode(%d)", mode);

        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )


@@ -893,6 +1162,7 @@ RESULT eDVBSatelliteEquipmentControl::setToneMode(int mode)
 
 RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
 {
 
 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() )
        if ( currentLNBValid() )
        {
                if ( m_curSat != m_lnbs[m_lnbidx].m_satellites.end() )


@@ -905,39 +1175,112 @@ RESULT eDVBSatelliteEquipmentControl::setRotorPosNum(int rotor_pos_num)
        return 0;
 }
 
        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;
+       sat_compare(int o, int lofl, int lofh)
+               :orb_pos(o), lofl(lofl), lofh(lofh)
+       {}
+       sat_compare(const sat_compare &x)
+               :orb_pos(x.orb_pos), lofl(x.lofl), lofh(x.lofh)
+       {}
+       bool operator < (const sat_compare & cmp) const
+       {
+               if (orb_pos == cmp.orb_pos)
+               {
+                       if ( abs(lofl-cmp.lofl) < 200000 )
+                       {
+                               if (abs(lofh-cmp.lofh) < 200000)
+                                       return false;
+                               return lofh<cmp.lofh;
+                       }
+                       return lofl<cmp.lofl;
+               }
+               return orb_pos < cmp.orb_pos;
+       }
+};
+

 RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {
 RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 {

+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
+       if (tu1 != tu2)
+       {
+               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::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)"))
+                       {
+                               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
+                               {
+                                       eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
+                                       fclose(f);
+                               }
+                       }
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setTunerDepends(%d, %d)", tu1, tu2);

        if (tu1 == tu2)
                return -1;
 
        if (tu1 == tu2)
                return -1;
 

-       eDVBFrontend *p1=NULL, *p2=NULL;
-       int tmp1=tu1, tmp2=tu2;
+       eDVBRegisteredFrontend *p1=NULL, *p2=NULL;

 
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
 
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {

-               if ( !tmp1 )
-                       p1 = it->m_frontend;
-               else
-                       --tmp1;
-               if (!tmp2)
-                       p2 = it->m_frontend;
-               else
-                       --tmp2;
+               if (it->m_frontend->getSlotID() == tu1)
+                       p1 = *it;
+               else if (it->m_frontend->getSlotID() == tu2)
+                       p2 = *it;

        }
        if (p1 && p2)
        {
        }
        if (p1 && p2)
        {

-               p1->setData(7, tu2);
-               p1->setTone(iDVBFrontend::toneOff);
-               p1->setVoltage(iDVBFrontend::voltageOff);
-
-               p2->setData(7, tu1);
+               p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+               p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);

                return 0;
        }
        return -1;
 }
 
                return 0;
        }
        return -1;
 }
 

+void eDVBSatelliteEquipmentControl::setSlotNotLinked(int slot_no)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setSlotNotLinked(%d)", slot_no);
+       m_not_linked_slot_mask |= (1 << slot_no);
+}
+

 bool eDVBSatelliteEquipmentControl::isRotorMoving()
 {
 bool eDVBSatelliteEquipmentControl::isRotorMoving()
 {

-       // TODO please fill with life
-       return false;
+       return m_rotorMoving;
+}
+
+void eDVBSatelliteEquipmentControl::setRotorMoving(bool b)
+{
+       m_rotorMoving=b;

 }
 }