X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fdde0706735b9c687a22f7aed393174801cbf139..4f46a90d789f28eb0ca156caeb2bb55136d8ac85:/lib/python/Screens/ScanSetup.py diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 2f204b03..927c5667 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -19,8 +19,8 @@ def getInitialTransponderList(tlist, pos): parm.frequency = x[1] parm.symbol_rate = x[2] parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Vertical - #parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; - parm.fec = 6 # AUTO + parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; + #parm.fec = 6 # AUTO #parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; parm.inversion = 2 #AUTO parm.orbital_position = pos @@ -68,7 +68,7 @@ class ScanSetup(Screen): def createSetup(self): self.list = [] - + self.multiscanlist = [] print "ID: " + str(config.scan.nims.value) self.list.append(getConfigListEntry(_("Tuner"), config.scan.nims)) @@ -86,7 +86,7 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_('Satellite'), config.scan.satselection[config.scan.nims.value])) self.list.append(getConfigListEntry(_('Frequency'), config.scan.sat.frequency)) self.list.append(getConfigListEntry(_('Inversion'), config.scan.sat.inversion)) - self.list.append(getConfigListEntry(_('Symbolrate'), config.scan.sat.symbolrate)) + self.list.append(getConfigListEntry(_('Symbol Rate'), config.scan.sat.symbolrate)) self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization)) self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec)) if (config.scan.type.value == 1): # single satellite scan @@ -102,8 +102,9 @@ class ScanSetup(Screen): if self.Satexists(tlist, x[1]) == 0: tlist.append(x[1]) sat = configElement_nonSave(x[1], configSelection, 0, (_("Enable"), _("Disable"))) - self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) - + configEntry = getConfigListEntry(nimmanager.getSatDescription(x[1]), sat) + self.list.append(configEntry) + self.multiscanlist.append(configEntry) # if (rotor): # for sat in nimmanager.satList: # self.list.append(getConfigListEntry(sat[0], config.scan.scansat[sat[1]])) @@ -113,7 +114,7 @@ class ScanSetup(Screen): if (config.scan.typecable.value == 0): # single transponder self.list.append(getConfigListEntry(_("Frequency"), config.scan.cab.frequency)) self.list.append(getConfigListEntry(_("Inversion"), config.scan.cab.inversion)) - self.list.append(getConfigListEntry(_("Symbolrate"), config.scan.cab.symbolrate)) + 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)) if (config.scan.typecable.value == 1): # complete @@ -167,10 +168,10 @@ class ScanSetup(Screen): # sat config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (_("on"), _("off"), _("Auto"))) + config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (_("off"), _("on"), _("Auto"))) config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 99999))) config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, (_("horizontal"), _("vertical"), _("circular left"), _("circular right"))) - config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto")) + config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (_("Auto"), "1/2", "2/3", "3/4", "5/6", "7/8", _("None"))) # cable config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999))) @@ -290,7 +291,7 @@ class ScanSetup(Screen): if (config.scan.type.value == 2): # multi sat scan SatList = nimmanager.getSatListForNim(config.scan.nims.value) - for x in self.list: + for x in self.multiscanlist: if x[1].parent.value == 0: print " " + str(x[1].parent.configPath) getInitialTransponderList(tlist, x[1].parent.configPath) @@ -301,9 +302,11 @@ class ScanSetup(Screen): feid = config.scan.nims.value # flags |= eComponentScan.scanSearchBAT - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, flags) + self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, flags) #self.close() + def doNothing(self): + pass def keyCancel(self): for x in self["config"].list: @@ -312,7 +315,19 @@ class ScanSetup(Screen): class ScanSimple(Screen): - def keyOK(self): + 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) + + + def keyGo(self): print "start scan for sats:" tlist = [ ] for x in self.list: @@ -321,8 +336,11 @@ class ScanSimple(Screen): getInitialTransponderList(tlist, x[1].parent.configPath) feid = 0 # FIXME - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch) + self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch) + def doNothing(self): + pass + def keyCancel(self): self.close() @@ -343,7 +361,7 @@ class ScanSimple(Screen): self["actions"] = ActionMap(["SetupActions"], { - "ok": self.keyOK, + "ok": self.keyGo, "cancel": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, @@ -352,13 +370,15 @@ class ScanSimple(Screen): self.list = [] tlist = [] - SatList = nimmanager.getConfiguredSats() - for x in SatList: - if self.Satexists(tlist, x) == 0: - tlist.append(x) - sat = configElement_nonSave(x, configSelection, 0, (_("Enable"), _("Disable"))) - self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat)) + 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"), _("Disable"))) + self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) self["config"] = ConfigList(self.list) self["header"] = Label(_("Automatic Scan"))