git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add ConfigurationBackup
[enigma2.git] / lib / python / Screens / ScanSetup.py
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 9422bf5e58dc6fcdc06b745dcd157acf2be65b39..6875433f810530d49d6e4020e3f5c653ed2688d1 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -10,7 +10,6 @@ from Components.Label import Label
 from enigma import eDVBFrontendParametersSatellite, eComponentScan
 
 def getInitialTransponderList(tlist, pos):
-       print "pos", pos
        list = nimmanager.getTransponders(pos)
 
        for x in list:
@@ -27,12 +26,10 @@ def getInitialTransponderList(tlist, pos):
                        tlist.append(parm)
 
 def getInitialCableTransponderList(tlist, cable):
-       print "cable", cable
        list = nimmanager.getTranspondersCable(cable)
 
        for x in list:
                if x[0] == 1:           #CABLE
-                       print "[ScanSetup] cable-transponder to add:", x
                        parm = eDVBFrontendParametersCable()
                        parm.frequency = x[1]
                        parm.symbol_rate = x[2]
@@ -66,6 +63,10 @@ class ScanSetup(Screen):
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1)
+               
+               self.statusTimer = eTimer()
+               self.statusTimer.timeout.get().append(self.updateStatus)
+               #self.statusTimer.start(5000, True)
 
                self.list = []
                self["config"] = ConfigList(self.list)
@@ -73,6 +74,9 @@ class ScanSetup(Screen):
 
                self["introduction"] = Label(_("Press OK to start the scan"))
 
+       def run(self):
+               self.keyGo()
+
        def updateSatList(self):
                self.satList = []
                for slot in nimmanager.nimslots:
@@ -138,6 +142,7 @@ class ScanSetup(Screen):
                                self.list.append(getConfigListEntry(_("Symbol Rate"), config.scan.cab.symbolrate))
                                self.list.append(getConfigListEntry(_("Modulation"), config.scan.cab.modulation))
                                self.list.append(getConfigListEntry(_("FEC"), config.scan.cab.fec))
+                               self.list.append(getConfigListEntry(_("Network scan"), config.scan.cab.networkScan))
                        elif currentConfigSelectionElement(config.scan.typecable) == "complete":
                                pass
                                
@@ -155,6 +160,19 @@ class ScanSetup(Screen):
                        elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
                                pass
 
+               if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \
+                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \
+                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"] and currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder"):
+                               self.configElementSNR = getConfigListEntry(_("SNR"), config.scan.snr)
+                               self.list.append(self.configElementSNR)
+                               self.configElementACG = getConfigListEntry(_("AGC"), config.scan.agc)
+                               self.list.append(self.configElementACG)
+                               self.configElementBER = getConfigListEntry(_("BER"), config.scan.ber)
+                               self.list.append(self.configElementBER)
+                               self.statusTimer.start(500, False)
+               else:
+                       self.statusTimer.stop()
+
                self["config"].list = self.list
                self["config"].l.setList(self.list)
 
@@ -186,6 +204,14 @@ class ScanSetup(Screen):
                                nimList.append(nim[0])
                        #nimList.append("all")
                        config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList)
+                       
+                       # status
+                       config.scan.snr = configElement_nonSave("config.scan.snr", configSlider, 0, (1, 100))
+                       config.scan.snr.enabled = False
+                       config.scan.agc = configElement_nonSave("config.scan.agc", configSlider, 0, (1, 100))
+                       config.scan.agc.enabled = False
+                       config.scan.ber = configElement_nonSave("config.scan.ber", configSlider, 0, (1, 100))
+                       config.scan.ber.enabled = False
 
                        # sat
                        config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999)))
@@ -200,6 +226,7 @@ class ScanSetup(Screen):
                        config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, (("auto", _("Auto")), ("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM")))
                        config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("none", _("None"))))
                        config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 9999)))
+                       config.scan.cab.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
 
                        # terrestial
                        config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (100, 900)))
@@ -233,6 +260,9 @@ class ScanSetup(Screen):
                self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
+       def updateStatus(self):
+               print "updatestatus"
+
        def keyNumberGlobal(self, number):
                print "You pressed number " + str(number)
                if (self["config"].getCurrent()[1].parent.enabled == True):
@@ -311,6 +341,8 @@ class ScanSetup(Screen):
                                                                                          config.scan.cab.modulation.value,
                                                                                          config.scan.cab.fec.value,
                                                                                          config.scan.cab.inversion.value)
+                               if  currentConfigSelectionElement(config.scan.cab.networkScan) == "yes":
+                                       flags |= eComponentScan.scanNetworkSearch
                        elif currentConfigSelectionElement(config.scan.typecable) == "complete":
                                getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value))
                                flags |= eComponentScan.scanNetworkSearch
@@ -329,7 +361,7 @@ class ScanSetup(Screen):
 
                feid = config.scan.nims.value
                # flags |= eComponentScan.scanSearchBAT
-               self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, flags)
+               self.session.openWithCallback(self.doNothing, ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
 
                #self.close()
        def doNothing(self):
@@ -341,29 +373,24 @@ class ScanSetup(Screen):
                self.close()
 
 class ScanSimple(Screen):
-
        def run(self):
-               print "start scan for sats:"
-               tlist = [ ]
-               for x in self.list:
-                       if x[1].parent.value == 0:
-                               print "   " + str(x[1].parent.configPath)
-                               getInitialTransponderList(tlist, x[1].parent.configPath)
-
-               feid = 0 # FIXME
-               self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
-               
+               self.keyGo()
 
        def keyGo(self):
-               print "start scan for sats:"
-               tlist = [ ]
+               scanList = []
                for x in self.list:
-                       if x[1].parent.value == 0:
-                               print "   " + str(x[1].parent.configPath)
-                               getInitialTransponderList(tlist, x[1].parent.configPath)
-
-               feid = 0 # FIXME
-               self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
+                       slotid = x[1].parent.configPath
+                       print "configpath:", x[1].parent.configPath, "-", currentConfigSelectionElement(x[1].parent)
+                       if currentConfigSelectionElement(x[1].parent) == "yes":
+                               tlist = [ ]
+                               if nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-S"]:
+                                       SatList = nimmanager.getSatListForNim(slotid)
+                                       for sat in SatList:
+                                               getInitialTransponderList(tlist, sat[1])
+                               elif nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-C"]:
+                                       getInitialCableTransponderList(tlist, nimmanager.getCableDescription(slotid))
+                               scanList.append({"transponders": tlist, "feid": slotid, "flags": eComponentScan.scanNetworkSearch})
+               self.session.openWithCallback(self.doNothing, ServiceScan, scanList = scanList)
 
        def doNothing(self):
                pass
@@ -397,15 +424,9 @@ class ScanSimple(Screen):
                self.list = []
                tlist = []
 
-
-               for slotid in nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"]):
-                       SatList = nimmanager.getSatListForNim(slotid)
-
-                       for x in SatList:
-                               if self.Satexists(tlist, x[1]) == 0:
-                                       tlist.append(x[1])
-                                       sat = configElement_nonSave(x[1], configSelection, 0, (("enable", _("Enable")), ("disable", _("Disable"))))
-                                       self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat))
+               for slotid in range(nimmanager.getNimSocketCount()):
+                       nim = configElement_nonSave(slotid, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
+                       self.list.append(getConfigListEntry(_("Scan NIM") + " " + str(slotid) + " (" + nimmanager.getNimTypeName(slotid) + ")", nim))
 
                self["config"] = ConfigList(self.list)
                self["header"] = Label(_("Automatic Scan"))
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources