fix autoscan

[enigma2.git] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index d15e0bd14e098dcd5d3baf95469b514b1985ae68..b3fdcde0f0a1b06a0e02e0b534835339a2136a4f 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -158,14 +158,14 @@ class CableTransponderSearchSupport:
                print "cableTransponderSearchSessionClosed, val", val
                self.cable_search_container = None
                self.cable_search_session = None
-               if val and len(val) and not val[0]:
+               if val and len(val) and val[0]:
                        self.setCableTransponderSearchResult(self.__tlist)
                self.__tlist = None
                self.cableTransponderSearchFinished()
 
        def cableTransponderSearchClosed(self, retval):
                print "cableTransponderSearch finished", retval
-               self.cable_search_session.close(0)
+               self.cable_search_session.close(True)
 
        def getCableTransponderData(self, str):
                data = str.split()
@@ -204,10 +204,16 @@ class CableTransponderSearchSupport:
                self.cable_search_container.appClosed.get().append(self.cableTransponderSearchClosed)
                self.cable_search_container.dataAvail.get().append(self.getCableTransponderData)
                cableConfig = config.Nims[nim_idx].cable
-               cmd = "tda1002x --scan --verbose --wakeup --bus="
-               cmd += str(nim_idx)
+               cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus "
+               if nim_idx < 2:
+                       cmd += str(nim_idx)
+               else: # FIXMEE DM8000
+                       if nim_idx == 2:
+                               cmd += "2" # first nim socket on DM8000 use /dev/i2c/2
+                       else:
+                               cmd += "4" # second nim socket on DM8000 use /dev/i2c/4
                if cableConfig.scan_type.value == "bands":
-                       cmd += " --scan_bands="
+                       cmd += " --scan-bands="
                        bands = 0
                        if cableConfig.scan_band_EU_VHF_I.value:
                                bands |= cable_bands["DVBC_BAND_EU_VHF_I"]
@@ -235,7 +241,7 @@ class CableTransponderSearchSupport:
                                bands |= cable_bands["DVBC_BAND_US_HYPER"]
                        cmd += str(bands)
                else:
-                       cmd += " --scan_stepsize="
+                       cmd += " --scan-stepsize "
                        cmd += str(cableConfig.scan_frequency_steps.value)
                if cableConfig.scan_mod_qam16.value:
                        cmd += " --mod 16"
@@ -251,11 +257,11 @@ class CableTransponderSearchSupport:
                        cmd += " --sr 6900000"
                if cableConfig.scan_sr_6875.value:
                        cmd += " --sr 6875000"
-               if cableConfig.scan_sr_ext1.value > 1000:
+               if cableConfig.scan_sr_ext1.value > 450:
                        cmd += " --sr "
                        cmd += str(cableConfig.scan_sr_ext1.value)
                        cmd += "000"
-               if cableConfig.scan_sr_ext2.value > 1000:
+               if cableConfig.scan_sr_ext2.value > 450:
                        cmd += " --sr "
                        cmd += str(cableConfig.scan_sr_ext2.value)
                        cmd += "000"
@@ -822,18 +828,16 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
                self.buildTransponderList()
 
        def buildTransponderList(self): # this method is called multiple times because of asynchronous stuff
+               print "buildTransponderList"
                APPEND_NOW = 0
                SEARCH_CABLE_TRANSPONDERS = 1
                action = APPEND_NOW
-               
-               skip = self.nim_iter
-               self.nim_iter = 0
-               
-               for n in self.nim_enable:
-                       self.nim_iter += 1
-                       if skip > 0:
-                               skip -= 1
-                       elif n.value: # check if nim is enabled
+
+               n = self.nim_iter < len(self.nim_enable) and self.nim_enable[self.nim_iter] or None
+               self.nim_iter += 1
+               if n:
+                       if n.value: # check if nim is enabled
+                               flags = 0
                                nim = nimmanager.nim_slots[n.nim_index]
                                networks = set(self.getNetworksForNim(nim))
 
@@ -855,7 +859,7 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                else:
                                        assert False
 
-                               flags |= eComponentScan.scanNetworkSearch
+                               flags |= eComponentScan.scanNetworkSearch #FIXMEEE.. use flags from cables / satellites / terrestrial.xml
                                tmp = self.scan_clearallservices.value
                                if tmp == "yes":
                                        flags |= eComponentScan.scanRemoveServices
@@ -872,11 +876,16 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                        return
                                else:
                                        assert False
+
+                       self.buildTransponderList() # recursive call of this function !!!
+                       return
+               # when we are here, then the recursion is finished and all enabled nims are checked
+               # so we now start the real transponder scan
                self.startScan(self.scanList)
 
        def startScan(self, scanList):
                if len(scanList):
-                       self.session.openWithCallback(self.doNothing, ServiceScan, scanList = scanList)
+                       self.session.open(ServiceScan, scanList = scanList)
                else:
                        self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
 
@@ -886,9 +895,6 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
        def cableTransponderSearchFinished(self):
                self.buildTransponderList()
 
-       def doNothing(self):
-               pass
-
        def keyCancel(self):
                self.close()