improove motor turning without power measure
[vuplus_dvbapp] / lib / dvb / frontend.cpp
index 0229724..2d38dc2 100644 (file)
@@ -559,7 +559,6 @@ int eDVBFrontend::closeFrontend(bool force)
                        m_fd=-1;
                else
                        eWarning("couldnt close frontend %d", m_dvbid);
-               m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1;
        }
 #if HAVE_DVB_API_VERSION < 3
        if (m_secfd >= 0)
@@ -587,6 +586,14 @@ eDVBFrontend::~eDVBFrontend()
 
 void eDVBFrontend::feEvent(int w)
 {
+       eDVBFrontend *sec_fe = this;
+       long tmp = m_data[LINKED_PREV_PTR];
+       while (tmp != -1)
+       {
+               eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+               sec_fe = linked_fe->m_frontend;
+               sec_fe->getData(LINKED_NEXT_PTR, tmp);
+       }
        while (1)
        {
 #if HAVE_DVB_API_VERSION < 3
@@ -624,22 +631,12 @@ void eDVBFrontend::feEvent(int w)
                                state = stateTuning;
                        else
                        {
-                               eDVBFrontend *sec_fe = this;
-                               long tmp = m_data[LINKED_PREV_PTR];
-
                                eDebug("stateLostLock");
                                state = stateLostLock;
-
-                               while (tmp != -1)
-                               {
-                                       eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
-                                       sec_fe = linked_fe->m_frontend;
-                                       sec_fe->getData(LINKED_NEXT_PTR, tmp);
-                               }
                                sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
                        }
                }
-               if (m_state != state)
+               if (m_state != state && ((m_idleInputpower[0] && m_idleInputpower[1]) || (sec_fe->m_data[ROTOR_POS] == sec_fe->m_data[NEW_ROTOR_POS])))
                {
                        m_state = state;
                        m_stateChanged(this);
@@ -657,6 +654,8 @@ void eDVBFrontend::timeout()
        }
 }
 
+#define INRANGE(X,Y,Z) (((X<=Y) && (Y<=Z))||((Z<=Y) && (Y<=X)) ? 1 : 0)
+
 int eDVBFrontend::readFrontendData(int type)
 {
        switch(type)
@@ -713,6 +712,49 @@ int eDVBFrontend::readFrontendData(int type)
                        
                                return (int)(snr_in_db * 100.0);
                        }
+                       else if (strstr(m_description, "Alps BSBE1 C01A") ||
+                               !strcmp(m_description, "Alps -S(STV0288)"))
+                       {
+                               if (snr == 0)
+                                       return 0;
+                               else if (snr == 0xFFFF) // i think this should not happen
+                                       return 100*100;
+                               else
+                               {
+                                       enum { REALVAL, REGVAL };
+                                       const long CN_lookup[31][2] = {
+                                               {20,8900}, {25,8680}, {30,8420}, {35,8217}, {40,7897},
+                                               {50,7333}, {60,6747}, {70,6162}, {80,5580}, {90,5029},
+                                               {100,4529}, {110,4080}, {120,3685}, {130,3316}, {140,2982},
+                                               {150,2688}, {160,2418}, {170,2188}, {180,1982}, {190,1802},
+                                               {200,1663}, {210,1520}, {220,1400}, {230,1295}, {240,1201},
+                                               {250,1123}, {260,1058}, {270,1004}, {280,957}, {290,920},
+                                               {300,890}
+                                       };
+                                       long regval = 0xFFFF - ((snr / 3) + 0xA100), // revert some dvb api calulations to get the real register value
+                                               Imin=0,
+                                               Imax=30,
+                                               i;
+                                       if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[Imax][REGVAL]))
+                                       {
+                                               long val;
+                                               while((Imax-Imin)>1)
+                                               {
+                                                       i=(Imax+Imin)/2;
+                                                       if(INRANGE(CN_lookup[Imin][REGVAL],regval,CN_lookup[i][REGVAL]))
+                                                               Imax = i;
+                                                       else
+                                                               Imin = i;
+                                               }
+                                               return (((regval - CN_lookup[Imin][REGVAL])
+                                                               * (CN_lookup[Imax][REALVAL] - CN_lookup[Imin][REALVAL])
+                                                               / (CN_lookup[Imax][REGVAL] - CN_lookup[Imin][REGVAL]))
+                                                               + CN_lookup[Imin][REALVAL]) * 10;
+                                       }
+                                       return 100;
+                               }
+                               return 0;
+                       }
                        else if (!strcmp(m_description, "Alps BSBE1 702A") ||  // some frontends with STV0299
                                !strcmp(m_description, "Alps -S") ||
                                !strcmp(m_description, "Philips -S") ||
@@ -1413,7 +1455,6 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                if (!m_timeoutCount)
                                {
                                        eDebug("[SEC] rotor timout");
-                                       m_sec->setRotorMoving(false);
                                        setSecSequencePos(m_sec_sequence.current()->steps);
                                }
                                else
@@ -1451,25 +1492,40 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                        }
                        case eSecCommand::IF_TUNER_LOCKED_GOTO:
                        {
+                               int signal = 0;
+                               int isLocked = readFrontendData(locked);
+                               m_idleInputpower[0] = m_idleInputpower[1] = 0;
                                eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
-                               if (readFrontendData(locked))
+                               if (isLocked && ((abs((signal = readFrontendData(signalQualitydB)) - cmd.lastSignal) < 50) || !cmd.lastSignal))
                                {
-                                       eDebug("[SEC] locked step %d ok", cmd.okcount);
+                                       if (cmd.lastSignal)
+                                               eDebug("[SEC] locked step %d ok (%d %d)", cmd.okcount, signal, cmd.lastSignal);
+                                       else
+                                       {
+                                               eDebug("[SEC] locked step %d ok", cmd.okcount);
+                                               cmd.lastSignal = signal;
+                                       }
                                        ++cmd.okcount;
-                                       if (cmd.okcount > 12)
+                                       if (cmd.okcount > 4)
                                        {
-                                               eDebug("ok > 12 .. goto %d\n",m_sec_sequence.current()->steps);
+                                               eDebug("ok > 4 .. goto %d\n",cmd.steps);
                                                setSecSequencePos(cmd.steps);
+                                               m_state = stateLock;
+                                               m_stateChanged(this);
                                                break;
                                        }
                                }
                                else
                                {
-                                       eDebug("[SEC] rotor locked step %d failed", cmd.okcount);
+                                       if (isLocked)
+                                               eDebug("[SEC] rotor locked step %d failed (oldSignal %d, curSignal %d)", cmd.okcount, signal, cmd.lastSignal);
+                                       else
+                                               eDebug("[SEC] rotor locked step %d failed (not locked)", cmd.okcount);
                                        --m_timeoutCount;
                                        if (!m_timeoutCount && m_retryCount > 0)
                                                --m_retryCount;
                                        cmd.okcount=0;
+                                       cmd.lastSignal=0;
                                }
                                ++m_sec_sequence.current();
                                break;
@@ -1479,6 +1535,14 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                eDebug("[SEC] runningInputpower is %d", m_runningInputpower);
                                ++m_sec_sequence.current();
                                break;
+                       case eSecCommand::SET_ROTOR_MOVING:
+                               m_sec->setRotorMoving(true);
+                               ++m_sec_sequence.current();
+                               break;
+                       case eSecCommand::SET_ROTOR_STOPPED:
+                               m_sec->setRotorMoving(false);
+                               ++m_sec_sequence.current();
+                               break;
                        case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
                        {
                                int idleInputpower = m_idleInputpower[ (sec_fe_data[CUR_VOLTAGE]&1) ? 0 : 1];
@@ -1496,7 +1560,6 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                        eDebug("[SEC] rotor %s step %d ok", txt, cmd.okcount);
                                        if ( cmd.okcount > 6 )
                                        {
-                                               m_sec->setRotorMoving(cmd.direction);
                                                eDebug("[SEC] rotor is %s", txt);
                                                if (setSecSequencePos(cmd.steps))
                                                        break;
@@ -1519,6 +1582,20 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
                                else
                                        ++m_sec_sequence.current();
                                break;
+                       case eSecCommand::INVALIDATE_CURRENT_SWITCHPARMS:
+                               eDebug("[SEC] invalidate current switch params");
+                               sec_fe_data[CSW] = -1;
+                               sec_fe_data[UCSW] = -1;
+                               sec_fe_data[TONEBURST] = -1;
+                               ++m_sec_sequence.current();
+                               break;
+                       case eSecCommand::UPDATE_CURRENT_SWITCHPARMS:
+                               sec_fe_data[CSW] = sec_fe_data[NEW_CSW];
+                               sec_fe_data[UCSW] = sec_fe_data[NEW_UCSW];
+                               sec_fe_data[TONEBURST] = sec_fe_data[NEW_TONEBURST];
+                               eDebug("[SEC] update current switch params");
+                               ++m_sec_sequence.current();
+                               break;
                        case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS:
                                eDebug("[SEC] invalidate current rotorparams");
                                sec_fe_data[ROTOR_CMD] = -1;