inversion=2, bandwidth = 3, fechigh = 6, feclow = 6,
modulation = 2, transmission = 2, guard = 4,
hierarchy = 4):
+
+# print "freq", frequency, "inv", inversion, "bw", bandwidth, "fech", fechigh, "fecl", feclow, "mod", modulation, "tm", transmission, "guard", guard, "hierarchy", hierarchy
+
# WARNING: normally, enums are working directly.
# Don't copy this (very bad)!! Instead either fix swig (good) or
# move this into a central place.
Bw8MHz = 0
Bw7MHz = 1
Bw6MHz = 2
- Bw5MHz = 3
- BwAuto = 4
+ #Bw5MHz = 3 #not implemented for e1 compatibilty
+ BwAuto = 3
f1_2 = 0
f2_3 = 1
TM2k = 0
TM8k = 1
- TM4k = 2
- TMAuto = 3
+ #TM4k = 2 #not implemented for e1 compatibilty
+ TMAuto = 2
GI_1_32 = 0
GI_1_16 = 1
parm.bandwidth = [Bw8MHz, Bw7MHz, Bw6MHz, BwAuto][bandwidth] # Bw5MHz unsupported
parm.code_rate_HP = [fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto][fechigh]
parm.code_rate_LP = [fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto][feclow]
- parm.modulation = [QPSK, QAM16, Auto][modulation] # QAM64 unsupported
+ parm.modulation = [QPSK, QAM16, QAM64, Auto][modulation]
parm.transmission_mode = [TM2k, TM8k, TMAuto][transmission] # TM4k unsupported
parm.guard_interval = [GI_1_32, GI_1_16, GI_1_8, GI_1_4, GI_Auto][guard]
parm.hierarchy = [HNone, H1, H2, H4, HAuto][hierarchy]
parm = eDVBFrontendParametersSatellite()
parm.frequency = x[1]
parm.symbol_rate = x[2]
- 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;
- parm.inversion = 2 #AUTO
+ parm.polarisation = x[3]
+ parm.fec = x[4]
+ parm.inversion = 2 # AUTO
parm.orbital_position = pos
+ parm.system = x[5]
+ parm.modulation = x[6]
tlist.append(parm)
def getInitialCableTransponderList(tlist, cable):
list = nimmanager.getTranspondersCable(cable)
for x in list:
- if x[0] == 1: #CABLE
+ if x[0] == 1: #CABLE
parm = eDVBFrontendParametersCable()
parm.frequency = x[1]
parm.symbol_rate = x[2]
- parm.modulation = x[3] # AUTO
- parm.fec_inner = x[4] # AUTO
+ parm.modulation = x[3]
+ parm.fec_inner = x[4]
parm.inversion = 2 # AUTO
tlist.append(parm)
def getInitialTerrestrialTransponderList(tlist, region):
list = nimmanager.getTranspondersTerrestrial(region)
-
-# inversion=2, bandwidth = 3, fechigh = 6, feclow = 6,
-# modulation = 2, transmission = 2, guard = 4,
-# hierarchy = 4):
+ #self.transponders[self.parsedTer].append((2,freq,bw,const,crh,crl,guard,transm,hierarchy,inv))
+
+ #def buildTerTransponder(frequency, inversion = 2, bandwidth = 3, fechigh = 6, feclow = 6,
+ #modulation = 2, transmission = 2, guard = 4, hierarchy = 4):
for x in list:
-#self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
- if x[0] == 2: #TERRESTRIAL
- # 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]])
- parm = buildTerTransponder(x[1], inversion = x[9], bandwidth = x[2])
+ if x[0] == 2: #TERRESTRIAL
+ parm = buildTerTransponder(x[1], x[9], x[2], x[4], x[5], x[3], x[7], x[6], x[8])
tlist.append(parm)
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"],
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]
elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
- 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()
+# 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": 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()
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():
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"], (("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
# WORKAROUND: we can't use BW-auto
config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 0, (("8MHz", "8MHz"), ("7MHz", "7MHz"), ("6MHz", "6MHz")))
#, ("auto", _("Auto"))))
- config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 6, (("none", _("None")), "1/2", "2/3", "3/4", "5/6", "7/8", _("Auto")))
- config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 6, (_("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.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 2, (("qpsk", "QPSK"), ("qam16", "QAM16"), ("auto", _("Auto"))))
+ config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 5, (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("auto", _("Auto"))))
+ config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 5, (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("auto", _("Auto"))))
+ config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 3, (("qpsk", "QPSK"), ("qam16", "QAM16"), ("qam64", "QAM64"), ("auto", _("Auto"))))
config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 2, (("2k", "2K"), ("8k", "8K"), ("auto", _("Auto"))))
config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 4, (("1_32", "1/32"), ("1_16", "1/16"), ("1_8", "1/8"), ("1_4", "1/4"), ("auto", _("Auto"))))
config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 4, (("none", _("None")), ("1", "1"), ("2", "2"), ("4", "4"), ("auto", _("Auto"))))
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):
- print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion)
+ 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(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 = fec # eDVBFrontendParametersSatellite.FEC.f3_4;
- #parm.fec = 6 # AUTO
- parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off;
- #parm.inversion = 2 #AUTO
+ parm.polarisation = polarisation
+ parm.fec = self.fecmap[fec]
+ parm.inversion = inversion
parm.orbital_position = int(orbital_position)
tlist.append(parm)
- # FIXME use correct parameters
def addCabTransponder(self, tlist, frequency, symbol_rate, modulation, fec, 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 # modulation # eDVBFrontendParametersSatellite.Polarisation.Verti
- parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4;
- #parm.fec = 6 # AUTO
- parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off;
- #parm.inversion = 2 #AUTO
+ parm.modulation = modulation
+ parm.fec = self.fecmap[fec]
+ parm.inversion = inversion
tlist.append(parm)
def addTerTransponder(self, tlist, *args, **kwargs):
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,
- config.scan.sat.fec.value,
+ fec,
config.scan.sat.inversion.value,
- orbpos)
+ orbpos,
+ 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]))
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":
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))
git.cweiske.de / enigma2.git / blobdiff