X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=cc11aa71141718d6db4665baf27278fe16e24d74;hb=633c730e5feed206333c5174d53c6384c08047b2;hp=6aeaf787a1633b8eaeb0181be8c1120f9a5dedd1;hpb=6bedec7c59e07ebd4816dc8ed69c8661b958dc13;p=vuplus_dvbapp diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 6aeaf78..cc11aa7 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -84,6 +84,7 @@ def getInitialTransponderList(tlist, pos): parm.inversion = 2 #AUTO parm.orbital_position = pos parm.system = x[5] #DVB-S or DVB-S2 + parm.modulation = x[6] tlist.append(parm) def getInitialCableTransponderList(tlist, cable): @@ -128,7 +129,15 @@ class ScanSetup(Screen): Screen.__init__(self, session) self.updateSatList() - self.createConfig() + self.service = session.nav.getCurrentService() + self.feinfo = None + frontendData = None + if self.service is not None: + self.feinfo = self.service.frontendInfo() + frontendData = self.feinfo and self.feinfo.getFrontendData(True) + self.createConfig(frontendData) + del self.feinfo + del self.service self["actions"] = NumberActionMap(["SetupActions"], @@ -205,6 +214,7 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec)) elif currentConfigSelectionElement(config.scan.sat.system) == "dvb-s2": self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec_s2)) + self.list.append(getConfigListEntry(_('Modulation'), config.scan.sat.modulation)) elif currentConfigSelectionElement(config.scan.type) == "single_satellite": self.updateSatList() print config.scan.satselection[config.scan.nims.value] @@ -284,7 +294,56 @@ class ScanSetup(Screen): elif self["config"].getCurrent() == self.systemEntry: self.createSetup() - def createConfig(self): + def createConfig(self, frontendData): + #("Type", frontendData["system"], TYPE_TEXT), + #("Modulation", frontendData["modulation"], TYPE_TEXT), + #("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC), + #("Frequency", frontendData["frequency"], TYPE_VALUE_DEC), + #("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC), + #("Polarization", frontendData["polarization"], TYPE_TEXT), + #("Inversion", frontendData["inversion"], TYPE_TEXT), + #("FEC inner", frontendData["fec_inner"], TYPE_TEXT), + #) + #elif frontendData["tuner_type"] == "DVB-C": + #return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT), + #("Type", frontendData["tuner_type"], TYPE_TEXT), + #("Frequency", frontendData["frequency"], TYPE_VALUE_DEC), + #("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC), + #("Modulation", frontendData["modulation"], TYPE_TEXT), + #("Inversion", frontendData["inversion"], TYPE_TEXT), + # ("FEC inner", frontendData["fec_inner"], TYPE_TEXT), + #) + #elif frontendData["tuner_type"] == "DVB-T": + #return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT), + #("Type", frontendData["tuner_type"], TYPE_TEXT), + #("Frequency", frontendData["frequency"], TYPE_VALUE_DEC), + #("Inversion", frontendData["inversion"], TYPE_TEXT), + #("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC), + #("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT), + #("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT), + #("Constellation", frontendData["constellation"], TYPE_TEXT), + #("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT), + #("Guard Interval", frontendData["guard_interval"], TYPE_TEXT), + #("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT), + defaultSat = { "orbpos": 192, "system": 0, "frequency": [11836], "inversion": 2, "symbolrate": [27500], "polarization": 0, "fec": 0, "fec_s2": 8, "modulation": 0 } + defaultCab = {"frequency": [466], "inversion": 2, "modulation": 2, "fec": 0, "symbolrate": [6900]} + if frontendData is not None: + if frontendData["tuner_type"] == "DVB-S": + defaultSat["system"] = {"DVB-S": 0, "DVB-S2": 1}[frontendData["system"]] + defaultSat["frequency"] = [int(frontendData["frequency"] / 1000)] + defaultSat["inversion"] = {"INVERSION_OFF": 0, "INVERSION_ON": 1, "INVERSION_AUTO": 2}[frontendData["inversion"]] + defaultSat["symbolrate"] = [int(frontendData["symbol_rate"] / 1000)] + defaultSat["polarization"] = {"HORIZONTAL": 0, "VERTICAL": 1, "CIRCULAR_LEFT": 2, "CIRCULAR_RIGHT": 3, "UNKNOWN": 0}[frontendData["polarization"]] + defaultSat["fec"] = {"DVB-S": {"FEC_AUTO": 0, "FEC_1_2": 1, "FEC_2_3": 2, "FEC_3_4": 3, "FEC_5_6": 4, "FEC_7_8": 5, "FEC_NONE": 6}, "DVB-S2": {"FEC_1_2": 0, "FEC_2_3": 1, "FEC_3_4": 2, "FEC_4_5": 3, "FEC_5_6": 4, "FEC_7_8": 5, "FEC_8_9": 6, "FEC_9_10": 7}}[frontendData["system"]][frontendData["fec_inner"]] + defaultSat["modulation"] = {"QPSK": 0, "8PSK": 1}[frontendData["modulation"]] + defaultSat["orbpos"] = frontendData["orbital_position"] + elif frontendData["tuner_type"] == "DVB-C": + defaultCab["frequency"] = [int(frontendData["frequency"] / 1000)] + defaultCab["symbolrate"] = [int(frontendData["symbol_rate"] / 1000)] + defaultSat["inversion"] = {"INVERSION_OFF": 0, "INVERSION_ON": 1, "INVERSION_AUTO": 2}[frontendData["inversion"]] + defaultSat["fec"] = {"FEC_AUTO": 0, "FEC_1_2": 1, "FEC_2_3": 2, "FEC_3_4": 3, "FEC_5_6": 4, "FEC_7_8": 5, "FEC_8_9": 6, "FEC_NONE": 7}[frontendData["fec_inner"]] + defaultSat["modulation"] = {"QAM_AUTO": 0, "QAM_16": 1, "QAM_16": 2, "QAM_32": 3, "QAM_64": 4, "QAM_128": 5, "QAM_256": 6}[frontendData["modulation"]] + config.scan = ConfigSubsection() config.scan.sat = ConfigSubsection() config.scan.cab = ConfigSubsection() @@ -293,7 +352,7 @@ class ScanSetup(Screen): config.scan.type = configElement_nonSave("config.scan.type", configSelection, 0, (("single_transponder", _("Single transponder")), ("single_satellite", _("Single satellite")), ("multisat", _("Multisat")))) config.scan.typecable = configElement_nonSave("config.scan.typecable", configSelection, 0, (("single_transponder", _("Single transponder")), ("complete", _("Complete")))) config.scan.typeterrestrial = configElement_nonSave("config.scan.typeterrestrial", configSelection, 0, (("single_transponder", _("Single transponder")), ("complete", _("Complete")))) - config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (hold feeds)")))) + config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (keep feeds)")))) nimList = [ ] for nim in nimmanager.nimList(): @@ -310,20 +369,21 @@ class ScanSetup(Screen): config.scan.ber.enabled = False # sat - config.scan.sat.system = configElement_nonSave("config.scan.sat.system", configSelection, 0, (("dvb-s", _("DVB-S")), ("dvb-s2", _("DVB-S2")))) - config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999))) - config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (("off", _("off")), ("on", _("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", _("horizontal")), ("vertical", _("vertical")), ("circular_left", _("circular left")), ("circular_right", _("circular right")))) - 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")))) - config.scan.sat.fec_s2 = configElement_nonSave("config.scan.sat.fec_s2", configSelection, 8, (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("3_5", "3/5"), ("4_5", "4/5"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("9_10", "9/10"))) - + config.scan.sat.system = configElement_nonSave("config.scan.sat.system", configSelection, defaultSat["system"], (("dvb-s", _("DVB-S")), ("dvb-s2", _("DVB-S2")))) + config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, defaultSat["frequency"], configsequencearg.get("INTEGER", (1, 99999))) + config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, defaultSat["inversion"], (("off", _("off")), ("on", _("on")), ("auto", _("Auto")))) + config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, defaultSat["symbolrate"], configsequencearg.get("INTEGER", (1, 99999))) + config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, defaultSat["polarization"], (("horizontal", _("horizontal")), ("vertical", _("vertical")), ("circular_left", _("circular left")), ("circular_right", _("circular right")))) + config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, defaultSat["fec"], (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("none", _("None")))) + config.scan.sat.fec_s2 = configElement_nonSave("config.scan.sat.fec_s2", configSelection, defaultSat["fec_s2"], (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("3_5", "3/5"), ("4_5", "4/5"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("9_10", "9/10"))) + config.scan.sat.modulation = configElement_nonSave("config.scan.sat.modulation", configSelection, defaultSat["modulation"], (("qpsk", "QPSK"), ("8psk", "8PSK"))) + # cable - 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, 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.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, defaultCab["frequency"], configsequencearg.get("INTEGER", (50, 999))) + config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, defaultCab["inversion"], (("off", _("off")), ("on", _("on")), ("auto", _("Auto")))) + config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, defaultCab["modulation"], (("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, defaultCab["fec"], (("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, defaultCab["symbolrate"], configsequencearg.get("INTEGER", (1, 9999))) config.scan.cab.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes")))) # terrestial @@ -350,7 +410,7 @@ class ScanSetup(Screen): for slot in nimmanager.nimslots: if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]): print str(slot.slotid) + " : " + str(self.satList) - config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid])) + config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, defaultSat["orbpos"], self.satList[slot.slotid])) else: config.scan.satselection.append(None) def keyLeft(self): @@ -382,15 +442,18 @@ class ScanSetup(Screen): "none": 15 } - def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system): - print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion) + def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system, modulation): + print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(self.fecmap[fec]) + " inversion: " + str(inversion) + " modulation: " + str(modulation) + " system: " + str(system) print "orbpos: " + str(orbital_position) parm = eDVBFrontendParametersSatellite() + if modulation == 1: + parm.modulation = 2 # eDVBFrontendParametersSatellite.Modulation.8PSK + else: + parm.modulation = 1 # eDVBFrontendParametersSatellite.Modulation.QPSK parm.system = system parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti - parm.fec = self.fecmap[fec] # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -438,7 +501,8 @@ class ScanSetup(Screen): fec, config.scan.sat.inversion.value, orbpos, - config.scan.sat.system.value) + config.scan.sat.system.value, + config.scan.sat.modulation.value) elif currentConfigSelectionElement(config.scan.type) == "single_satellite": sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value] getInitialTransponderList(tlist, int(sat[1])) @@ -467,7 +531,7 @@ class ScanSetup(Screen): if currentConfigSelectionElement(config.scan.typecable) == "single_transponder": self.addCabTransponder(tlist, config.scan.cab.frequency.value[0], config.scan.cab.symbolrate.value[0], - config.scan.cab.modulation.value, + config.scan.cab.modulation.value + 1, config.scan.cab.fec.value, config.scan.cab.inversion.value) if currentConfigSelectionElement(config.scan.cab.networkScan) == "yes": @@ -632,15 +696,17 @@ class ScanSimple(Screen): nimcount = nimmanager.getNimSocketCount() if nimcount > 0: + nimtype = nimmanager.getNimType(0) scan_possible=True config.scan = ConfigSubsection() - config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (hold feeds)")))) + config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (keep feeds)")))) self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) nim = configElement_nonSave(0, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) - if nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): + if nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): scan_possible=False if scan_possible: self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim)) + if nimcount > 1 and self.ScanNimTwoNeeded(): nim = configElement_nonSave(1, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) self.list.append(getConfigListEntry(_("Scan NIM") + " 1 (" + nimmanager.getNimTypeName(1) + ")", nim))