X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d030fb234d74f1375bd318379ec5d2f643344839..27502137f7ebcbb1a783faf8cba14251e42a8998:/lib/python/Screens/ScanSetup.py diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index cd9a8f94..a51c1c87 100644 --- 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: @@ -18,7 +17,7 @@ def getInitialTransponderList(tlist, pos): parm = eDVBFrontendParametersSatellite() parm.frequency = x[1] parm.symbol_rate = x[2] - parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Vertical + parm.polarisation = x[3]#lookup_sat_polarisation[x[3]] # eDVBFrontendParametersSatellite.Polarisation.Vertical parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO #parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; @@ -27,20 +26,16 @@ 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] - parm.modulation = 2 # x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti - parm.fec = 6# x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; - #parm.fec = 6 # AUTO + parm.modulation = x[3] # AUTO + parm.fec_inner = x[4] # AUTO parm.inversion = 2 # AUTO - #parm.inversion = 2 #AUTO tlist.append(parm) class ScanSetup(Screen): @@ -75,6 +70,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: @@ -140,6 +138,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 @@ -197,11 +196,12 @@ class ScanSetup(Screen): config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("none", _("None")))) # cable - config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999))) + config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 999))) config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 2, (("off", _("off")), ("on", _("on")), ("auto", _("Auto")))) - config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 2, (("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM"), ("auto", _("Auto")))) - config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 9, (("none", _("None")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("auto", _("Auto")))) + 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))) @@ -256,11 +256,11 @@ class ScanSetup(Screen): # FIXME use correct parameters def addCabTransponder(self, tlist, frequency, symbol_rate, modulation, fec, inversion): - print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(modulation) + " fec: " + str(fec) + " inversion: " + str(inversion) + print "Add Cab: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(modulation) + " fec: " + str(fec) + " inversion: " + str(inversion) parm = eDVBFrontendParametersCable() parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.modulation = modulation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.modulation = modulation # modulation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -313,6 +313,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 @@ -331,7 +333,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): @@ -343,29 +345,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 @@ -399,15 +396,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"))