lib/base/console.cpp: fix eConsoleAppContainer write (when called with one string...

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

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index a56dbf0486ff1c2198e60d83af93c3eb1ab57532..0e3e7e0ab1bf03bef65115c75d44f8d275f831da 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -37,81 +37,11 @@ void eDVBSatelliteEquipmentControl::setParam(int param, int value)
 }
 
 eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends, eSmartPtrList<eDVBRegisteredFrontend> &avail_simulate_frontends)
 }
 
 eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends, eSmartPtrList<eDVBRegisteredFrontend> &avail_simulate_frontends)

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

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

-

        clear();
        clear();

-
-// ASTRA
-       addLNB();
-       setLNBSlotMask(3);
-       setLNBLOFL(9750000);
-       setLNBThreshold(11700000);
-       setLNBLOFH(10607000);
-       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
-       setToneburst(eDVBSatelliteDiseqcParameters::NO);
-       setRepeats(0);
-       setCommittedCommand(eDVBSatelliteDiseqcParameters::BB);
-       setCommandOrder(0); // committed, toneburst
-       setFastDiSEqC(true);
-       setSeqRepeat(false);
-       addSatellite(192);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-
-// Hotbird
-       addLNB();
-       setLNBSlotMask(3);
-       setLNBLOFL(9750000);
-       setLNBThreshold(11700000);
-       setLNBLOFH(10600000);
-       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
-       setToneburst(eDVBSatelliteDiseqcParameters::NO);
-       setRepeats(0);
-       setCommittedCommand(eDVBSatelliteDiseqcParameters::AB);
-       setCommandOrder(0); // committed, toneburst
-       setFastDiSEqC(true);
-       setSeqRepeat(false);
-       addSatellite(130);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-
-// Rotor
-       addLNB();
-       setLNBSlotMask(3);
-       setLNBLOFL(9750000);
-       setLNBThreshold(11700000);
-       setLNBLOFH(10600000);
-       setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
-       setToneburst(eDVBSatelliteDiseqcParameters::NO);
-       setRepeats(0);
-       setCommittedCommand(eDVBSatelliteDiseqcParameters::AA);
-       setCommandOrder(0); // committed, toneburst
-       setFastDiSEqC(true);
-       setSeqRepeat(false);
-       setLaDirection(eDVBSatelliteRotorParameters::NORTH);
-       setLoDirection(eDVBSatelliteRotorParameters::EAST);
-       setLatitude(51.017);
-       setLongitude(8.683);
-       setUseInputpower(true);
-       setInputpowerDelta(50);
-
-       addSatellite(235);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-       setRotorPosNum(0);
-
-       addSatellite(284);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-       setRotorPosNum(0);
-
-       addSatellite(420);
-       setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-       setToneMode(eDVBSatelliteSwitchParameters::HILO);
-       setRotorPosNum(1); // stored pos 1

 }
 
 #define eSecDebugNoSimulate(x...) \
 }
 
 #define eSecDebugNoSimulate(x...) \


@@ -130,6 +60,44 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
        bool simulate = ((eDVBFrontend*)fe)->is_simulate();
        bool direct_connected = m_not_linked_slot_mask & slot_id;
        int score=0, satcount=0;
        bool simulate = ((eDVBFrontend*)fe)->is_simulate();
        bool direct_connected = m_not_linked_slot_mask & slot_id;
        int score=0, satcount=0;

+       long linked_prev_ptr=-1, linked_next_ptr=-1, linked_csw=-1, linked_ucsw=-1, linked_toneburst=-1,
+               fe_satpos_depends_ptr=-1, fe_rotor_pos=-1;
+       bool linked_in_use = false;
+
+       eSecDebugNoSimulate("direct_connected %d", !!direct_connected);
+
+       fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
+       fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
+       fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, fe_satpos_depends_ptr);
+
+       // first we search the linkage base frontend and check if any tuner in prev direction is used
+       while (linked_prev_ptr != -1)
+       {
+               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_prev_ptr;
+               if (linked_fe->m_inuse)
+                       linked_in_use = true;
+               fe = linked_fe->m_frontend;
+               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, (long&)linked_prev_ptr);
+       }
+
+       fe->getData(eDVBFrontend::ROTOR_POS, fe_rotor_pos);
+
+       // now check also the linked tuners  is in use
+       while (!linked_in_use && linked_next_ptr != -1)
+       {
+               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
+               if (linked_fe->m_inuse)
+                       linked_in_use = true;
+               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr);
+       }
+
+       // when a linked in use tuner is found we get the tuner data...
+       if (linked_in_use)
+       {
+               fe->getData(eDVBFrontend::CSW, linked_csw);
+               fe->getData(eDVBFrontend::UCSW, linked_ucsw);
+               fe->getData(eDVBFrontend::TONEBURST, linked_toneburst);
+       }

 
        if (highest_score_lnb)
                *highest_score_lnb = -1;
 
        if (highest_score_lnb)
                *highest_score_lnb = -1;


@@ -140,7 +108,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
        {
                bool rotor=false;
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
        {
                bool rotor=false;
                eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];

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

                {
                        int ret = 0;
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
                {
                        int ret = 0;
                        eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;


@@ -155,21 +123,17 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                        {
                                bool diseqc=false;
                                long band=0,
                        {
                                bool diseqc=false;
                                long band=0,

-                                       linked_prev_ptr=-1,
-                                       linked_next_ptr=-1,
-                                       satpos_depends_ptr=-1,
+                                       satpos_depends_ptr=fe_satpos_depends_ptr,

                                        csw = di_param.m_committed_cmd,
                                        ucsw = di_param.m_uncommitted_cmd,
                                        toneburst = di_param.m_toneburst_param,
                                        csw = di_param.m_committed_cmd,
                                        ucsw = di_param.m_uncommitted_cmd,
                                        toneburst = di_param.m_toneburst_param,

-                                       curRotorPos;
+                                       rotor_pos = fe_rotor_pos;

 
                                eSecDebugNoSimulate("sat %d found", sat.orbital_position);
 
                                eSecDebugNoSimulate("sat %d found", sat.orbital_position);

-                               fe->getData(eDVBFrontend::LINKED_PREV_PTR, linked_prev_ptr);
-                               fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr);

 
                                if ( sat.frequency > lnb_param.m_lof_threshold )
                                        band |= 1;
 
                                if ( sat.frequency > lnb_param.m_lof_threshold )
                                        band |= 1;

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

                                        band |= 2;
 
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                                        band |= 2;
 
                                if (di_param.m_diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)


@@ -184,7 +148,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
                                                rotor = true;
 
                                        if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )  // ROTOR
                                                rotor = true;
 

-                                       ret=10000;
+                                       ret = 10000;

                                }
                                else
                                {
                                }
                                else
                                {


@@ -192,101 +156,58 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                        ret = 15000;
                                }
 
                                        ret = 15000;
                                }
 

+                               if (sat.no_rotor_command_on_tune && !rotor) {
+                                       eSecDebugNoSimulate("no rotor but no_rotor_command_on_tune is set.. ignore lnb %d", idx);
+                                       continue;
+                               }
+

                                eSecDebugNoSimulate("ret1 %d", ret);
 
                                eSecDebugNoSimulate("ret1 %d", ret);
 

-                               if (direct_connected)  // frontend with direct connection?
+                               if (linked_in_use)

                                {
                                {

-                                       long ocsw = -1,
-                                               oucsw = -1,
-                                               oToneburst = -1;
-                                       eSecDebugNoSimulate("direct");
-                                       fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
-                                       fe->getData(eDVBFrontend::LINKED_NEXT_PTR, linked_next_ptr);
-                                       fe->getData(eDVBFrontend::CSW, ocsw);
-                                       fe->getData(eDVBFrontend::UCSW, oucsw);
-                                       fe->getData(eDVBFrontend::TONEBURST, oToneburst);
-                                       while (ret && linked_prev_ptr != -1)  // check for linked tuners..
+                                       // compare tuner data
+                                       if ( (csw != linked_csw) ||
+                                               ( diseqc && (ucsw != linked_ucsw || toneburst != linked_toneburst) ) ||
+                                               ( rotor && rotor_pos != sat.orbital_position ) )

                                        {
                                        {

-                                               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);
+                                               ret = 0;

                                        }
                                        }

+                                       else
+                                               ret += 15;

                                        eSecDebugNoSimulate("ret2 %d", ret);
                                        eSecDebugNoSimulate("ret2 %d", ret);

-                                       while (ret && linked_next_ptr != -1)  // check for linked tuners..
-                                       {
-                                               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_next_ptr;
-                                               if (linked_fe->m_inuse)
-                                               {
-                                                       if ( (csw != ocsw) ||
-                                                               ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-                                                               ( rotor && curRotorPos != sat.orbital_position ) )
-                                                       {
-                                                               ret=0;
-                                                       }
-                                               }
-                                               linked_fe->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, (long&)linked_next_ptr);
-                                       }
-                                       eSecDebugNoSimulate("ret3 %d", ret);

                                }
                                }

-                               else // linked frontend..
+                               else if (satpos_depends_ptr != -1)

                                {
                                {

-                                       long ocsw = -1,
-                                               oucsw = -1,
-                                               oToneburst = -1;
-                                       while (linked_prev_ptr != -1)
+                                       eSecDebugNoSimulate("satpos depends");
+                                       eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
+                                       if (direct_connected) // current fe is direct connected.. (can turn the rotor)

                                        {
                                        {

-                                               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)
+                                               if (satpos_depends_to_fe->m_inuse) // if the dependent frontend is in use?

                                                {
                                                {

-                                                       iDVBFrontend *sec_fe = linked_fe->m_frontend;
-                                                       sec_fe->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
-                                                       if (linked_fe->m_inuse)
-                                                       {
-                                                               sec_fe->getData(eDVBFrontend::CSW, ocsw);
-                                                               sec_fe->getData(eDVBFrontend::UCSW, oucsw);
-                                                               sec_fe->getData(eDVBFrontend::TONEBURST, oToneburst);
-                                                               eSecDebug("(%ld != %ld) || \n(%d && (%ld != %ld || %ld != %ld) ) ||\n( %d && %ld != %d ) )",
-                                                                       csw, ocsw, diseqc, ucsw, oucsw, toneburst, oToneburst, rotor, curRotorPos, sat.orbital_position);
-                                                               if ( (csw != ocsw) ||
-                                                                       ( diseqc && (ucsw != oucsw || toneburst != oToneburst) ) ||
-                                                                       ( rotor && curRotorPos != sat.orbital_position ) )
-                                                               {
-                                                                       ret=0;
-                                                               }
-                                                       }
+                                                       if (!rotor || rotor_pos != sat.orbital_position) // new orbital position not equal to current orbital pos?
+                                                               ret = 0;
+                                                       else
+                                                               ret += 10;

                                                }
                                                }

+                                               eSecDebugNoSimulate("ret3 %d", ret);

                                        }
                                        }

-                                       eSecDebugNoSimulate("ret4 %d", ret);
-                               }
-
-                               if (ret)
-                                       if (satpos_depends_ptr != -1)
+                                       else // current fe is dependent of another tuner ... (so this fe can't turn the rotor!)

                                        {
                                        {

-                                               eSecDebugNoSimulate("satpos depends");
-                                               eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr;
-                                               if ( satpos_depends_to_fe->m_inuse )
+                                               // get current orb pos of the tuner with rotor connection
+                                               satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, rotor_pos);
+                                               if (!rotor || rotor_pos == -1 /* we dont know the rotor position yet */
+                                                       || rotor_pos != sat.orbital_position ) // not the same orbital position?

                                                {
                                                {

-                                                       if (!direct_connected)
-                                                               satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, curRotorPos);
-                                                       if (!rotor || curRotorPos != sat.orbital_position)
-                                                               ret=0;
+                                                       ret = 0;

                                                }
                                                }

-                                               eSecDebugNoSimulate("ret5 %d", ret);

                                        }
                                        }

+                                       eSecDebugNoSimulate("ret4 %d", ret);
+                               }

 
 

-                               if (ret && rotor && curRotorPos != -1 && (direct_connected || satpos_depends_ptr == -1) )  // direct conntected or loopthrough!
-                                       ret -= abs(curRotorPos-sat.orbital_position);
+                               if (ret && rotor && rotor_pos != -1)
+                                       ret -= abs(rotor_pos-sat.orbital_position);

 
 

-                               eSecDebugNoSimulate("ret6 %d", ret);
+                               eSecDebugNoSimulate("ret5 %d", ret);

 
                                if (ret)
                                {
 
                                if (ret)
                                {


@@ -294,9 +215,12 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                                                lnb_param.m_lof_hi : lnb_param.m_lof_lo;
                                        int tuner_freq = abs(sat.frequency - lof);
                                        if (tuner_freq < 900000 || tuner_freq > 2200000)
                                                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;
+                                               ret = 0;

                                }
 
                                }
 

+                               if (ret && lnb_param.m_prio != -1)
+                                       ret = lnb_param.m_prio;
+

                                eSecDebugNoSimulate("ret %d, score old %d", ret, score);
                                if (ret > score)
                                {
                                eSecDebugNoSimulate("ret %d, score old %d", ret, score);
                                if (ret > score)
                                {


@@ -309,7 +233,12 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
                }
        }
        if (score && satcount)
                }
        }
        if (score && satcount)

-               score -= (satcount-1);
+       {
+               if (score > (satcount-1))
+                       score -= (satcount-1);
+               else
+                       score = 1; // min score
+       }

        if (score && direct_connected)
                score += 5; // increase score for tuners with direct sat connection
        eSecDebugNoSimulate("final score %d", score);
        if (score && direct_connected)
                score += 5; // increase score for tuners with direct sat connection
        eSecDebugNoSimulate("final score %d", score);


@@ -367,10 +296,15 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                        lnb_param.m_satellites.find(sat.orbital_position);
                if ( sit != lnb_param.m_satellites.end())
                {
                        lnb_param.m_satellites.find(sat.orbital_position);
                if ( sit != lnb_param.m_satellites.end())
                {

+                       eSecCommandList sec_sequence;
+
+                       lnb_param.guard_offset = 0; //HACK
+
+                       frontend.setData(eDVBFrontend::SATCR, lnb_param.SatCR_idx);
+                       

                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
                        bool doSetFrontend = true;
                        bool doSetVoltageToneFrontend = true;
                        eDVBSatelliteSwitchParameters &sw_param = sit->second;
                        bool doSetFrontend = true;
                        bool doSetVoltageToneFrontend = true;

-                       bool sendDiSEqC = false;

                        bool forceChanged = false;
                        bool needDiSEqCReset = false;
                        long band=0,
                        bool forceChanged = false;
                        bool needDiSEqCReset = false;
                        long band=0,


@@ -429,35 +363,54 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                        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_Vertical))
+                               band |= 2;

 
 

-                       if (band&1)
-                               parm.FREQUENCY = sat.frequency - lnb_param.m_lof_hi;
-                       else
-                               parm.FREQUENCY = sat.frequency - lnb_param.m_lof_lo;
-
-                       parm.FREQUENCY = abs(parm.FREQUENCY);
-
-                       frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
+                       int lof = (band&1)?lnb_param.m_lof_hi:lnb_param.m_lof_lo;

 
 

-                       if (!(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical))
-                               band |= 2;
+                       int local=0;

 
 

-                       if ( voltage_mode == eDVBSatelliteSwitchParameters::_14V
-                               || ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical
-                                       && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
-                               voltage = VOLTAGE(13);
-                       else if ( voltage_mode == eDVBSatelliteSwitchParameters::_18V
-                               || ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation::Vertical)
-                                       && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
-                               voltage = VOLTAGE(18);
-                       if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
-                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
-                               tone = iDVBFrontend::toneOn;
-                       else if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::OFF)
-                               || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !(band&1) ) )
-                               tone = iDVBFrontend::toneOff;

 
 

-                       eSecCommandList sec_sequence;
+                       if(lnb_param.SatCR_idx == -1)
+                       {
+                       // calc Frequency
+                               local = abs(sat.frequency 
+                                       - ((lof - (lof % 1000)) + ((lof % 1000)>500 ? 1000 : 0)) ); //TODO für den Mist mal ein Macro schreiben
+                               parm.FREQUENCY = (local - (local % 125)) + ((local % 125)>62 ? 125 : 0);
+                               frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
+
+                               if ( voltage_mode == eDVBSatelliteSwitchParameters::_14V
+                                       || ( sat.polarisation & eDVBFrontendParametersSatellite::Polarisation_Vertical
+                                               && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
+                                       voltage = VOLTAGE(13);
+                               else if ( voltage_mode == eDVBSatelliteSwitchParameters::_18V
+                                       || ( !(sat.polarisation & eDVBFrontendParametersSatellite::Polarisation_Vertical)
+                                               && voltage_mode == eDVBSatelliteSwitchParameters::HV )  )
+                                       voltage = VOLTAGE(18);
+                               if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::ON)
+                                       || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && (band&1) ) )
+                                       tone = iDVBFrontend::toneOn;
+                               else if ( (sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::OFF)
+                                       || ( sw_param.m_22khz_signal == eDVBSatelliteSwitchParameters::HILO && !(band&1) ) )
+                                       tone = iDVBFrontend::toneOff;
+                       }
+                       else
+                       {
+                               unsigned int tmp = abs(sat.frequency 
+                                               - ((lof - (lof % 1000)) + ((lof % 1000)>500 ? 1000 : 0)) )
+                                               + lnb_param.SatCRvco
+                                               - 1400000
+                                               + lnb_param.guard_offset;
+                               parm.FREQUENCY = (lnb_param.SatCRvco - (tmp % 4000))+((tmp%4000)>2000?4000:0)+lnb_param.guard_offset;
+                               lnb_param.UnicableTuningWord = (((tmp / 4000)+((tmp%4000)>2000?1:0)) 
+                                               | ((band & 1) ? 0x400 : 0)                      //HighLow
+                                               | ((band & 2) ? 0x800 : 0)                      //VertHor
+                                               | ((lnb_param.LNBNum & 1) ? 0 : 0x1000)                 //Umschaltung LNB1 LNB2
+                                               | (lnb_param.SatCR_idx << 13));         //Adresse des SatCR
+                                               eDebug("[prepare] UnicableTuningWord %#04x",lnb_param.UnicableTuningWord);
+                                               eDebug("[prepare] guard_offset %d",lnb_param.guard_offset);
+                               frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - ((lnb_param.UnicableTuningWord & 0x3FF) *4000 + 1400000 - lnb_param.SatCRvco + lof));
+                       }

 
                        if (diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {
 
                        if (diseqc_mode >= eDVBSatelliteDiseqcParameters::V1_0)
                        {


@@ -600,7 +553,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                compare.tone = iDVBFrontend::toneOff;
                                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
                                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
                                                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]) );
+                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE_DISABLE_BEFORE_DISEQC]) );

 
                                                if (diseqc13V)
                                                        vlt = iDVBFrontend::voltage13;
 
                                                if (diseqc13V)
                                                        vlt = iDVBFrontend::voltage13;


@@ -730,20 +683,19 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        if (di_param.m_seq_repeat && seq_repeat == 0)
                                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
                                                }
                                                        if (di_param.m_seq_repeat && seq_repeat == 0)
                                                                sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BEFORE_SEQUENCE_REPEAT]) );
                                                }

-                                               sendDiSEqC = true;

                                        }
 
                                        eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
                                        if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                        {
                                                eSecCommand::pair compare;
                                        }
 
                                        eDebugNoSimulate("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
                                        if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
                                        {
                                                eSecCommand::pair compare;

-                                               if (!send_mask)
+                                               if (!send_mask && lnb_param.SatCR_idx == -1)

                                                {
                                                        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) );
                                                {
                                                        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]) );
+                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_CONT_TONE_DISABLE_BEFORE_DISEQC]) );

 
                                                        compare.voltage = iDVBFrontend::voltageOff;
                                                        compare.steps = +4;
 
                                                        compare.voltage = iDVBFrontend::voltageOff;
                                                        compare.steps = +4;


@@ -791,112 +743,128 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                                        diseqc.data[3] = RotorCmd;
                                                        diseqc.data[4] = 0x00;
                                                }
                                                        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
-                                                       bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
-                                                       eSecCommand::rotor cmd;
-                                                       eSecCommand::pair compare;
-                                                       if (turn_fast)
-                                                               compare.voltage = VOLTAGE(18);
+                                               if(lnb_param.SatCR_idx == -1)
+                                               {
+                                                       int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
+                                                       if ( rotor_param.m_inputpower_parameters.m_use )
+                                                       { // use measure rotor input power to detect rotor state
+                                                               bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
+                                                               eSecCommand::rotor cmd;
+                                                               eSecCommand::pair compare;
+                                                               if (turn_fast)
+                                                                       compare.voltage = VOLTAGE(18);
+                                                               else
+                                                                       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) );
+       // measure idle power values
+                                                               compare.steps = -2;
+                                                               if (turn_fast) {
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec after voltage change
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
+                                                                       compare.val = 1;
+                                                                       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_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) );  // 2 retries
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
+       // rotor start loop
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // 50msec delay
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
+                                                               cmd.direction=1;  // check for running rotor
+                                                               cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;
+                                                               cmd.steps=+5;
+                                                               cmd.okcount=0;
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );  // check if rotor has started
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) );  // timeout .. we assume now the rotor is already at the correct position
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // goto loop start
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, 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_ROTOR_MOVING) );
+                                                               if (turn_fast)
+                                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*20) );  // mrt is in seconds... our SLEEP time is 50ms.. so * 20
+       // 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, +2 ) );  // timeout ? this should never happen
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
+       /////////////////////
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
+                                                       }

                                                        else
                                                        else

+                                                       {  // use normal turning mode
+                                                               if (curRotorPos != -1)
+                                                               {               
+                                                                       mrt = abs(curRotorPos - sat.orbital_position);
+                                                                       if (mrt > 1800)
+                                                                               mrt = 3600 - mrt;
+                                                                       if (mrt % 10)
+                                                                               mrt += 10; // round a little bit
+                                                                       mrt *= 2000;  // (we assume a very slow rotor with just 0.5 degree per second here)
+                                                                       mrt /= 10000;
+                                                                       mrt += 3; // a little bit overhead
+                                                               }
+                                                               doSetVoltageToneFrontend=false;
+                                                               doSetFrontend=false;
+                                                               eSecCommand::rotor cmd;
+                                                               eSecCommand::pair compare;

                                                                compare.voltage = VOLTAGE(13);
                                                                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) );
-// measure idle power values
-                                                       compare.steps = -2;
-                                                       if (turn_fast) {
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER]) );  // wait 150msec after voltage change
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_IDLE_INPUTPOWER, 1) );
-                                                               compare.val = 1;
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, compare) );
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_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) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 1000) ); // sleep one second before change voltage or tone
+
+                                                               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_FINAL_CONT_TONE_CHANGE]) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 0) );
+       
+                                                               cmd.direction=1;  // check for running rotor
+                                                               cmd.deltaA=0;
+                                                               cmd.steps = +3;
+                                                               cmd.okcount=0;
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, mrt*4) );  // mrt is in seconds... our SLEEP time is 250ms.. so * 4
+                                                               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, +5 ) );
+                                                               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, +4) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );
+                                                               sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -5) );

                                                        }
                                                        }

-                                                       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_ROTOR_DISEQC_RETRYS, m_params[MOTOR_COMMAND_RETRIES]) );  // 2 retries
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, 40) );  // 2 seconds rotor start timout
-// rotor start loop
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // 50msec delay
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
-                                                       cmd.direction=1;  // check for running rotor
-                                                       cmd.deltaA=rotor_param.m_inputpower_parameters.m_delta;
-                                                       cmd.steps=+5;
-                                                       cmd.okcount=0;
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );  // check if rotor has started
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) );  // timeout .. we assume now the rotor is already at the correct position
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // goto loop start
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, 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_ROTOR_MOVING) );
-                                                       if (turn_fast)
-                                                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) );  // 2 minutes running timeout
-// rotor running loop
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );  // wait 50msec
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
-                                                       cmd.direction=0;  // check for stopped rotor
-                                                       cmd.steps=+3;
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) );  // timeout ? this should never happen
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) );  // running loop start
-/////////////////////
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_STOPPED) );
-                                               }
-                                               else
-                                               {  // use normal turning mode
-                                                       doSetVoltageToneFrontend=false;
-                                                       doSetFrontend=false;
-                                                       eSecCommand::rotor cmd;
-                                                       eSecCommand::pair compare;
-                                                       compare.voltage = VOLTAGE(13);
-                                                       compare.steps = +3;
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, compare.voltage) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD]) );  // wait 150msec after voltage change
-
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::INVALIDATE_CURRENT_ROTORPARMS) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_ROTOR_MOVING) );
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-
-                                                       compare.voltage = voltage;
-                                                       compare.steps = +3;
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) ); // correct final voltage?
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 2000) );  // wait 2 second before set high voltage
-                                                       sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, voltage) );
-
-                                                       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) );
+                                                       eDebug("set rotor timeout to %d seconds", mrt);
+                                                       sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
+                                                       sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);

                                                }
                                                }

-                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_CMD, RotorCmd);
-                                               sec_fe->setData(eDVBFrontend::NEW_ROTOR_POS, sat.orbital_position);
-                                               sendDiSEqC = true;

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -906,14 +874,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                csw = band;
                        }
 
                                csw = band;
                        }
 

-//                     if (sendDiSEqC)
-                       sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
-

                        sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
                        sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
                        sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 
                        sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
                        sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
                        sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 

-                       if (doSetVoltageToneFrontend)
+                       if ((doSetVoltageToneFrontend) && (lnb_param.SatCR_idx == -1))

                        {
                                eSecCommand::pair compare;
                                compare.voltage = voltage;
                        {
                                eSecCommand::pair compare;
                                compare.voltage = voltage;


@@ -924,19 +889,47 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
                                compare.tone = tone;
                                sec_sequence.push_back( eSecCommand(eSecCommand::IF_TONE_GOTO, compare) );
                                sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, tone) );
                                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::SLEEP, m_params[DELAY_AFTER_FINAL_CONT_TONE_CHANGE]) );

                        }
 
                        sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
 
                        }
 
                        sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
 

+                       if(lnb_param.SatCR_idx != -1)
+                       {
+                               // check if voltage is disabled
+                               eSecCommand::pair compare;
+                               compare.steps = +3;
+                               compare.voltage = iDVBFrontend::voltageOff;
+                               sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS] ) );
+
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18_5) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS]) );  // wait 20 ms after voltage change
+       
+                               eDVBDiseqcCommand diseqc;
+                               memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
+                               diseqc.len = 5;
+                               diseqc.data[0] = 0xE0;
+                               diseqc.data[1] = 0x10;
+                               diseqc.data[2] = 0x5A;
+                               diseqc.data[3] = lnb_param.UnicableTuningWord >> 8;
+                               diseqc.data[4] = lnb_param.UnicableTuningWord;
+
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_AFTER_LAST_DISEQC_CMD]) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
+                       }
+

                        if (doSetFrontend)
                        {
                                sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
                        if (doSetFrontend)
                        {
                                sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );

-                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+                               sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND, 1) );

                        }
 
                        }
 

-//                     if (sendDiSEqC)
-                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+                       sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+                       sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 500) );

                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
 
                        frontend.setSecSequence(sec_sequence);
                        sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
 
                        frontend.setSecSequence(sec_sequence);


@@ -947,12 +940,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
        eDebugNoSimulate("found no useable satellite configuration for %s freq %d%s %s on orbital position (%d)",
                sat.system ? "DVB-S2" : "DVB-S",
                sat.frequency,
        eDebugNoSimulate("found no useable satellite configuration for %s freq %d%s %s on orbital position (%d)",
                sat.system ? "DVB-S2" : "DVB-S",
                sat.frequency,

-               sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal ? "H" :
-                       eDVBFrontendParametersSatellite::Polarisation::Vertical ? "V" :
-                       eDVBFrontendParametersSatellite::Polarisation::CircularLeft ? "CL" : "CR",
-               sat.modulation == eDVBFrontendParametersSatellite::Modulation::Auto ? "AUTO" :
-                       eDVBFrontendParametersSatellite::Modulation::QPSK ? "QPSK" :
-                       eDVBFrontendParametersSatellite::Modulation::M8PSK ? "8PSK" : "QAM16",
+               sat.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_8PSK ? "8PSK" : "QAM16",

                sat.orbital_position );
        return -1;
 }
                sat.orbital_position );
        return -1;
 }


@@ -963,7 +956,8 @@ RESULT eDVBSatelliteEquipmentControl::clear()
        for (int i=0; i <= m_lnbidx; ++i)
        {
                m_lnbs[i].m_satellites.clear();
        for (int i=0; i <= m_lnbidx; ++i)
        {
                m_lnbs[i].m_satellites.clear();

-               m_lnbs[i].slot_mask = 0;
+               m_lnbs[i].m_slot_mask = 0;
+               m_lnbs[i].m_prio = -1; // auto

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


@@ -973,7 +967,8 @@ RESULT eDVBSatelliteEquipmentControl::clear()
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
                long tmp;
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
        {
                long tmp;

-               if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
+               char c;
+               if (sscanf(it->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1 && !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)
                {
                        FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
                        if (!f || fwrite("B", 1, 1, f) != 1)


@@ -989,6 +984,7 @@ RESULT eDVBSatelliteEquipmentControl::clear()
                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);
                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);

+               it->m_frontend->setData(eDVBFrontend::SATCR, -1);

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


@@ -998,6 +994,7 @@ RESULT eDVBSatelliteEquipmentControl::clear()
                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);
                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);

+               it->m_frontend->setData(eDVBFrontend::SATCR, -1);

        }
 
        return 0;
        }
 
        return 0;


@@ -1021,7 +1018,7 @@ RESULT eDVBSatelliteEquipmentControl::setLNBSlotMask(int slotmask)
 {
        eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask);
        if ( currentLNBValid() )
 {
        eSecDebug("eDVBSatelliteEquipmentControl::setLNBSlotMask(%d)", slotmask);
        if ( currentLNBValid() )

-               m_lnbs[m_lnbidx].slot_mask = slotmask;
+               m_lnbs[m_lnbidx].m_slot_mask = slotmask;

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


@@ -1067,6 +1064,28 @@ RESULT eDVBSatelliteEquipmentControl::setLNBIncreasedVoltage(bool onoff)
        return 0;
 }
 
        return 0;
 }
 

+RESULT eDVBSatelliteEquipmentControl::setLNBPrio(int prio)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBPrio(%d)", prio);
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].m_prio = prio;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBNum(int LNBNum)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBNum(%d)", LNBNum);
+       if(!((LNBNum >= 1) && (LNBNum <= MAX_LNBNUM)))
+               return -EPERM;
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].LNBNum = LNBNum;
+       else
+               return -ENOENT;
+       return 0;
+}
+

 /* DiSEqC Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 {
 /* DiSEqC Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::setDiSEqCMode(int diseqcmode)
 {


@@ -1209,6 +1228,46 @@ RESULT eDVBSatelliteEquipmentControl::setInputpowerDelta(int delta)
        return 0;
 }
 
        return 0;
 }
 

+/* Unicable Specific Parameters */
+RESULT eDVBSatelliteEquipmentControl::setLNBSatCR(int SatCR_idx)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBSatCR(%d)", SatCR_idx);
+       if(!((SatCR_idx >=-1) && (SatCR_idx < MAX_SATCR)))
+               return -EPERM;
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].SatCR_idx = SatCR_idx;
+       else
+               return -ENOENT;
+       return 0;
+}
+
+RESULT eDVBSatelliteEquipmentControl::setLNBSatCRvco(int SatCRvco)
+{
+       eSecDebug("eDVBSatelliteEquipmentControl::setLNBSatCRvco(%d)", SatCRvco);
+       if(!((SatCRvco >= 950*1000) && (SatCRvco <= 2150*1000)))
+               return -EPERM;
+       if(!((m_lnbs[m_lnbidx].SatCR_idx >= 0) && (m_lnbs[m_lnbidx].SatCR_idx < MAX_SATCR)))
+               return -ENOENT;
+       if ( currentLNBValid() )
+               m_lnbs[m_lnbidx].SatCRvco = SatCRvco;
+       else
+               return -ENOENT;
+       return 0;
+}
+RESULT eDVBSatelliteEquipmentControl::getLNBSatCR()
+{
+       if ( currentLNBValid() )
+               return m_lnbs[m_lnbidx].SatCR_idx;
+       return -ENOENT;
+}
+
+RESULT eDVBSatelliteEquipmentControl::getLNBSatCRvco()
+{
+       if ( currentLNBValid() )
+               return m_lnbs[m_lnbidx].SatCRvco;
+       return -ENOENT;
+}
+

 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {
 /* Satellite Specific Parameters */
 RESULT eDVBSatelliteEquipmentControl::addSatellite(int orbital_position)
 {


@@ -1318,8 +1377,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
        if (tu1 != tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
        if (tu1 != tu2)
        {
                eDVBRegisteredFrontend *p1=NULL, *p2=NULL;

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

                {
                        if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;
                {
                        if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;


@@ -1328,9 +1387,10 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
                }
                if (p1 && p2)
                {
                }
                if (p1 && p2)
                {

+                       char c;

                        p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
                        p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
                        p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
                        p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);

-                       if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)"))
+                       if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && sscanf(p1->m_frontend->getDescription(), "BCM450%c (internal)", &c) == 1)

                        {
                                FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
                                if (!f || fwrite("A", 1, 1, f) != 1)
                        {
                                FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
                                if (!f || fwrite("A", 1, 1, f) != 1)


@@ -1344,7 +1404,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
                }
 
                p1=p2=NULL;
                }
 
                p1=p2=NULL;

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

                {
                        if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;
                {
                        if (it->m_frontend->getSlotID() == tu1)
                                p1 = *it;


@@ -1411,7 +1472,10 @@ bool eDVBSatelliteEquipmentControl::isRotorMoving()
        return m_rotorMoving;
 }
 
        return m_rotorMoving;
 }
 

-void eDVBSatelliteEquipmentControl::setRotorMoving(bool b)
+void eDVBSatelliteEquipmentControl::setRotorMoving(int slot_no, bool b)

 {
 {

-       m_rotorMoving=b;
+       if (b)
+               m_rotorMoving |= (1 << slot_no);
+       else
+               m_rotorMoving &= ~(1 << slot_no);

 }
 }