#parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off;
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):
# FIXME: we need to convert the other parameters...
# convert terrestrial.xml bandwidth to our enum
- if x[2] in [0, 1]:
- bandwidth = [1, 0][x[2]]
- else:
- bandwidth = 3 # auto
-
- parm = buildTerTransponder(x[1], bandwidth = [1, 0][x[2]])
+ #if x[2] in [0, 1]:
+ # bandwidth = [1, 0][x[2]]
+ #else:
+ # bandwidth = 3 # auto
+ #
+ #parm = buildTerTransponder(x[1], bandwidth = [1, 0][x[2]])
+ parm = buildTerTransponder(x[1], inversion = x[9], bandwidth = x[2])
tlist.append(parm)
Screen.__init__(self, session)
self.updateSatList()
- self.createConfig()
+ self.service = session.nav.getCurrentService()
+ frontendData = None
+ if self.service is not None:
+ self.feinfo = self.service.frontendInfo()
+ frontendData = self.feinfo and self.feinfo.getFrontendData(True)
+ self.createConfig(frontendData)
self["actions"] = NumberActionMap(["SetupActions"],
self.list.append(self.tunerEntry)
self.typeOfScanEntry = None
+ self.systemEntry = None
if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]):
self.typeOfScanEntry = getConfigListEntry(_("Type of scan"), config.scan.type)
self.list.append(self.typeOfScanEntry)
if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]):
if currentConfigSelectionElement(config.scan.type) == "single_transponder":
+ self.systemEntry = getConfigListEntry(_('Transpondertype'), config.scan.sat.system)
+ self.list.append(self.systemEntry)
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(_('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 currentConfigSelectionElement(config.scan.sat.system) == "dvb-s":
+ 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]
self.list.append(getConfigListEntry(_("Satellite"), config.scan.satselection[config.scan.nims.value]))
+ self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
elif currentConfigSelectionElement(config.scan.type) == "multisat":
# if (norotor)
tlist = []
SatList = nimmanager.getSatListForNim(config.scan.nims.value)
-
+ self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
for x in SatList:
if self.Satexists(tlist, x[1]) == 0:
tlist.append(x[1])
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
+ self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder":
self.list.append(getConfigListEntry(_("Guard interval mode"), config.scan.ter.guard))
self.list.append(getConfigListEntry(_("Hierarchy mode"), config.scan.ter.hierarchy))
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.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
+ self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V))
+
+# 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)
print self["config"].getCurrent()
if self["config"].getCurrent() == self.typeOfScanEntry:
self.createSetup()
- if self["config"].getCurrent() == self.tunerEntry:
+ elif self["config"].getCurrent() == self.tunerEntry:
+ self.createSetup()
+ 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": 0, "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()
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 (keep feeds)"))))
nimList = [ ]
for nim in nimmanager.nimList():
config.scan.ber.enabled = False
# sat
- 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.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"], (("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, 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
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):
if (self["config"].getCurrent()[1].parent.enabled == True):
self["config"].handleKey(config.key[str(number)])
- def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position):
+ fecmap = { "auto": 0,
+ "1_2": 1,
+ "2_3": 2,
+ "3_4": 3,
+ "5_6": 4,
+ "7_8": 5,
+ "8_9": 6,
+ "3_5": 7,
+ "4_5": 8,
+ "9_10": 9,
+ "none": 15
+ }
+
+ 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(fec) + " inversion: " + str(inversion)
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 = fec # eDVBFrontendParametersSatellite.FEC.f3_4;
+ 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;
#parm.inversion = 2 #AUTO
parm = eDVBFrontendParametersCable()
parm.frequency = frequency * 1000
parm.symbol_rate = symbol_rate * 1000
- parm.modulation = 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;
flags = 0
if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]):
if currentConfigSelectionElement(config.scan.type) == "single_transponder":
-
- self.addSatTransponder(tlist, config.scan.sat.frequency.value[0],
- config.scan.sat.symbolrate.value[0],
- config.scan.sat.polarization.value,
- config.scan.sat.fec.value,
- config.scan.sat.inversion.value,
- self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1])
+ l = len(self.satList)
+ if l and l > config.scan.nims.value:
+ nimsats=self.satList[config.scan.nims.value]
+ l = len(config.scan.satselection)
+ if l and l > config.scan.nims.value:
+ selsatidx=config.scan.satselection[config.scan.nims.value].value
+ l = len(nimsats)
+ if l and l > selsatidx:
+ orbpos=nimsats[selsatidx][1]
+ if currentConfigSelectionElement(config.scan.sat.system) == "dvb-s":
+ fec = currentConfigSelectionElement(config.scan.sat.fec)
+ else:
+ fec = currentConfigSelectionElement(config.scan.sat.fec_s2)
+ self.addSatTransponder(tlist, config.scan.sat.frequency.value[0],
+ config.scan.sat.symbolrate.value[0],
+ config.scan.sat.polarization.value,
+ fec,
+ config.scan.sat.inversion.value,
+ orbpos,
+ config.scan.sat.system.value,
+ config.scan.sat.modulation)
elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
- getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]))
+ sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]
+ getInitialTransponderList(tlist, int(sat[1]))
flags |= eComponentScan.scanNetworkSearch
-
+ tmp = currentConfigSelectionElement(config.scan.clearallservices)
+ if tmp == "yes":
+ flags |= eComponentScan.scanRemoveServices
+ elif tmp == "yes_hold_feeds":
+ flags |= eComponentScan.scanRemoveServices
+ flags |= eComponentScan.scanDontRemoveFeeds
elif currentConfigSelectionElement(config.scan.type) == "multisat":
SatList = nimmanager.getSatListForNim(config.scan.nims.value)
-
for x in self.multiscanlist:
if x[1].parent.value == 0:
print " " + str(x[1].parent.configPath)
getInitialTransponderList(tlist, x[1].parent.configPath)
flags |= eComponentScan.scanNetworkSearch
+ tmp = currentConfigSelectionElement(config.scan.clearallservices)
+ if tmp == "yes":
+ flags |= eComponentScan.scanRemoveServices
+ elif tmp == "yes_hold_feeds":
+ flags |= eComponentScan.scanRemoveServices
+ flags |= eComponentScan.scanDontRemoveFeeds
elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]):
if currentConfigSelectionElement(config.scan.typecable) == "single_transponder":
config.scan.cab.modulation.value,
config.scan.cab.fec.value,
config.scan.cab.inversion.value)
- if currentConfigSelectionElement(config.scan.cab.networkScan) == "yes":
+ 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
+ tmp = currentConfigSelectionElement(config.scan.clearallservices)
+ if tmp == "yes":
+ flags |= eComponentScan.scanRemoveServices
+ elif tmp == "yes_hold_feeds":
+ flags |= eComponentScan.scanRemoveServices
+ flags |= eComponentScan.scanDontRemoveFeeds
elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder":
- self.addTerTransponder(tlist,
+ self.addTerTransponder(tlist,
config.scan.ter.frequency.value[0] * 1000000,
inversion = config.scan.ter.inversion.value,
bandwidth = config.scan.ter.bandwidth.value,
elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(config.scan.nims.value))
flags |= eComponentScan.scanNetworkSearch
+ tmp = currentConfigSelectionElement(config.scan.clearallservices)
+ if tmp == "yes":
+ flags |= eComponentScan.scanRemoveServices
+ elif tmp == "yes_hold_feeds":
+ flags |= eComponentScan.scanRemoveServices
+ flags |= eComponentScan.scanDontRemoveFeeds
for x in self["config"].list:
x[1].save()
- feid = config.scan.nims.value
- # flags |= eComponentScan.scanSearchBAT
- self.session.openWithCallback(self.doNothing, ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
+ if len(tlist):
+ feid = config.scan.nims.value
+ # flags |= eComponentScan.scanSearchBAT
+ self.session.openWithCallback(self.doNothing, ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
+ else:
+ self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
- #self.close()
def doNothing(self):
pass
print sat
getInitialTransponderList(tlist, sat[1])
elif nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-C"]:
- ScanPossible = True
+ scanPossible = True
getInitialCableTransponderList(tlist, nimmanager.getCableDescription(slotid))
elif nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-T"]:
- ScanPossible = True
+ scanPossible = True
getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(slotid))
if scanPossible:
- scanList.append({"transponders": tlist, "feid": slotid, "flags": eComponentScan.scanNetworkSearch})
+ flags=eComponentScan.scanNetworkSearch
+ tmp = currentConfigSelectionElement(config.scan.clearallservices)
+ if tmp == "yes":
+ flags |= eComponentScan.scanRemoveServices
+ elif tmp == "yes_hold_feeds":
+ flags |= eComponentScan.scanRemoveServices
+ flags |= eComponentScan.scanDontRemoveFeeds
+ scanList.append({"transponders": tlist, "feid": slotid, "flags": flags})
if len(scanList):
self.session.openWithCallback(self.doNothing, ServiceScan, scanList = scanList)
else:
def doNothing(self):
pass
-
+
def keyCancel(self):
self.close()
sec = eDVBSatelliteEquipmentControl.getInstance()
if sec is not None:
exclusive_satellites = sec.get_exclusive_satellites(0,1)
- if len(exclusive_satellites) == 0:
+ if len(exclusive_satellites) == 2:
return False
- return True
+ idx = exclusive_satellites[0]+1
+ exclusive_nim_sats = exclusive_satellites[idx+1:idx+1+exclusive_satellites[idx]]
+ if len(exclusive_nim_sats):
+ return True
+ return False # two -C or two -T tuners
def __init__(self, session):
Screen.__init__(self, session)
tlist = []
nimcount = nimmanager.getNimSocketCount()
+ have_terrestrial = False
if nimcount > 0:
- nim = configElement_nonSave(0, configSelection, 0,(("yes", _("yes")),("no", _("no"))))
- self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim))
+ 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 (keep feeds)"))))
+ self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
+ nim = configElement_nonSave(0, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
+ if nimtype == nimmanager.nimType["DVB-T"]:
+ have_terrestrial = True
+ elif 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))
+ if nimmanager.getNimType(1) == nimmanager.nimType["DVB-T"]:
+ have_terrestrial = True
+
+ if have_terrestrial:
+ self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V))
self["config"] = ConfigList(self.list)
self["header"] = Label(_("Automatic Scan"))
git.cweiske.de / enigma2.git / blobdiff