Support DVB-S2X.

[vuplus_dvbapp] / lib / python / Components / TuneTest.py

diff --git a/lib/python/Components/TuneTest.py b/lib/python/Components/TuneTest.py
index 44b1909..9fb5143 100644 (file)
--- a/lib/python/Components/TuneTest.py
+++ b/lib/python/Components/TuneTest.py
@@ -5,8 +5,7 @@ class Tuner:
                self.frontend = frontend
                self.ignore_rotor = ignore_rotor
 
-       # transponder = (frequency, symbolrate, polarisation, fec, inversion, orbpos, system, modulation, rolloff, pilot, tsid, onid)
-       #                    0         1             2         3       4         5       6        7          8       9      10    11
+       # transponder = (0:frequency 1:symbolrate 2:polarisation 3:fec 4:inversion 5:orbpos 6:system 7:modulation 8:rolloff 9:pilot 10:is_id 11:pls_mode 12:pls_code 13:tsid 14:onid)
        def tune(self, transponder):
                if self.frontend:
                        print "tuning to transponder with data", transponder
@@ -21,6 +20,14 @@ class Tuner:
                        parm.modulation = transponder[7]
                        parm.rolloff = transponder[8]
                        parm.pilot = transponder[9]
+                       if len(transponder) > 12:
+                               parm.is_id = transponder[10]
+                               parm.pls_mode = transponder[11]
+                               parm.pls_code = transponder[12]
+                       else:
+                               parm.is_id = -1
+                               parm.pls_mode = eDVBFrontendParametersSatellite.PLS_Unknown
+                               parm.pls_code = 0
                        feparm = eDVBFrontendParameters()
                        feparm.setDVBS(parm, self.ignore_rotor)
                        self.lastparm = feparm
@@ -103,8 +110,8 @@ class TuneTest:
                                pidsFailed = False
                                if self.checkPIDs:
                                        if self.currTuned is not None:
-                                               if self.tsid != self.currTuned[10] or self.onid != self.currTuned[11]:
-                                                       self.failedTune.append([self.currTuned, self.oldTuned, "pids_failed", {"real": (self.tsid, self.onid), "expected": (self.currTuned[10], self.currTuned[11])}, dict])  # last parameter is the frontend status
+                                               if self.tsid != self.currTuned[13] or self.onid != self.currTuned[14]:
+                                                       self.failedTune.append([self.currTuned, self.oldTuned, "pids_failed", {"real": (self.tsid, self.onid), "expected": (self.currTuned[13], self.currTuned[14])}, dict])  # last parameter is the frontend status
                                                        pidsFailed = True
                                                else:
                                                        self.successfullyTune.append([self.currTuned, self.oldTuned, dict])  # 3rd parameter is the frontend status
@@ -141,7 +148,7 @@ class TuneTest:
                        # check for tsid != -1 and onid != -1 
                        print "index:", index
                        print "len(self.transponderlist):", len(self.transponderlist)
-                       while (index < len(self.transponderlist) and (self.transponderlist[index][10] == -1 or self.transponderlist[index][11] == -1)):
+                       while (index < len(self.transponderlist) and (self.transponderlist[index][13] == -1 or self.transponderlist[index][14] == -1)):
                                index += 1
                print "FirstTransponder final index:", index
                return index
@@ -154,7 +161,7 @@ class TuneTest:
                        # check for tsid != -1 and onid != -1 
                        print "index:", index
                        print "len(self.transponderlist):", len(self.transponderlist)
-                       while (index < len(self.transponderlist) and (self.transponderlist[index][10] == -1 or self.transponderlist[index][11] == -1)):
+                       while (index < len(self.transponderlist) and (self.transponderlist[index][13] == -1 or self.transponderlist[index][14] == -1)):
                                index += 1
 
                print "next transponder index:", index
@@ -204,8 +211,7 @@ class TuneTest:
                self.progressCallback((self.getProgressLength(), self.tuningtransponder, self.STATUS_START, self.currTuned))
                self.timer.start(100, True)
        
-       # transponder = (frequency, symbolrate, polarisation, fec, inversion, orbpos, <system>, <modulation>, <rolloff>, <pilot>, <tsid>, <onid>)
-       #                    0         1             2         3       4         5       6        7              8         9        10       11
+       # transponder = (0:frequency 1:symbolrate 2:polarisation 3:fec 4:inversion 5:orbpos 6:system 7:modulation 8:rolloff 9:pilot 10:is_id 11:pls_mode 12:pls_code 13:tsid 14:onid)
        def addTransponder(self, transponder):
                self.transponderlist.append(transponder)