Changeset 40798

Timestamp:

08/23/17 21:12:43 (6 years ago)

Author:

gost

Message:

[titan] add new dvb-t2 test

Location:

titan/titan

Files:

• frontenddev.h (modified) (5 diffs)
• scan.h (modified) (6 diffs)

titan/titan/frontenddev.h

@@ -488 +488 @@
         //struct dvb_frontend_event ev;
         fe_status_t status;
+        fe_status_t status_m = 0;
 
         int count = 0;
@@ -505 +506 @@
 #ifdef MIPSEL
         timer = 2000;
-#endif
-#ifdef DREAMBOX
-        timer = 4000;
 #endif
 
@@ -521 +519 @@
                 ioctl(node->fd, FE_READ_STATUS, &status);
                 if(status != 0)
-                        debug(200, "status=%d, fe_lock=%d", status, FE_HAS_LOCK);
+                {
+                        if(status_m != status)
+                        {
+                                debug(200, "status=%d, fe_lock=%d", status, FE_HAS_LOCK);
+                                status_m = status;
+                        }
+                }
 
                 if(errno == ERANGE)
@@ -1700 +1704 @@
         
         int hierarchy = tpnode->system; //system = hierarchy on DVBT
+        
+        if(tpnode->system == 1) //system = DVB-T2 then hierarchy = HIERARCHY_AUTO
+                hierarchy = 4;
+        
         //switch(guardinterval)
         switch(hierarchy)
@@ -1984 +1992 @@
                         //to do set voltage --> wenn der Tuner es kann
                         //fesetvoltage(tuner, SEC_VOLTAGE_13, 10);
-                        p[1].u.data = SYS_DVBT2;
+                        if(realname != NULL && ostrstr(realname, "DVB-T2") != NULL)
+                                p[1].u.data = SYS_DVBT2;
+                        else
+                                p[1].u.data = SYS_DVBT;
                         break;
                 }

titan/titan/scan.h

@@ -327 +327 @@
         struct transponder *tpnode = NULL;
         int addtrans = 0;
+        int system = 0;
         
         if(buf == NULL) return -1;
@@ -376 +377 @@
         hierarchy = HIERARCHY_AUTO;
         modulation = QAM_AUTO;
-        //inversion = INVERSION_UNKNOWN;
-        inversion = INVERSION_AUTO;
-        //system = SYSTEM_DVB_T2;
+        inversion = 2; //INVERSION_UNKNOWN
+        //inversion = INVERSION_AUTO;
+        system = 1; //DVB-T2
         
         unsigned char* loop1 = buf + 8;     //call_id
@@ -407 +408 @@
                         frequency = cfre * 10;
                         debug(500, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
-                        tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, hierarchy);
+                        tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
                         if(tpnode != NULL)
                                 addtrans++;
@@ -431 +432 @@
                                 frequency = cfre * 10;
                                 debug(500, "nitscan DVB-T2 - Flag=%d -> id=%llu freq=%d bandwidth=%d hp=%d lp=%d modulation=%d guard=%d trans=%d hierarchy=%d tpnode=%p", flag, id, frequency, bandwidth, hp, lp, modulation, guardinterval, transmission, hierarchy, tpnode);
-                                tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, hierarchy);
+                                tpnode = createtransponder(id, FE_OFDM, orbitalpos, frequency, inversion, bandwidth, lp, hp, modulation, guardinterval, transmission, system);
                                 if(tpnode != NULL)
                                         addtrans++;
@@ -1245 +1246 @@
         struct sat* satnode = sat;
         int nitscan = 1;
+        int tout = 0;
 
         if(scaninfo.fenode == NULL || scaninfo.tpnode == NULL || timernode == NULL)
@@ -1334 +1336 @@
                         else if(fenode->feinfo->type == FE_OFDM)
                         {
+                                tout = 0;
                                 if(fetunedvbt(fenode, tpnode) != 0)
                                 {
+                                        tout = 1;
+                                        debug(500, "scan done system:%d", tpnode->system);
+                                        if(tpnode->system == 0 || tpnode->system == 3 )
+                                        {
+                                                tpnode->system = 1;
+                                                debug(500, "tune DVB-T2 after DVB-T id=%llu freq=%d orbitalpos=%d tpnode=%p", tpnode->id, tpnode->frequency, tpnode->orbitalpos, tpnode);
+                                                if(fetunedvbt(fenode, tpnode) == 0)
+                                                        tout = 0;
+                                        }
+                                }
+                                if(tout == 1)                   
+                                {       
                                         scaninfo.tpcount++;
                                         if(scaninfo.cleartransponder == 1)