if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder":
self.list.append(getConfigListEntry(_("Frequency"), config.scan.ter.frequency))
+ self.list.append(getConfigListEntry(_("Network scan"), config.scan.cab.networkScan))
self.list.append(getConfigListEntry(_("Inversion"), config.scan.ter.inversion))
self.list.append(getConfigListEntry(_("Bandwidth"), config.scan.ter.bandwidth))
self.list.append(getConfigListEntry(_("Code rate high"), config.scan.ter.fechigh))
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"))))
+ config.scan.ter.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
config.scan.scansat = {}
for sat in nimmanager.satList:
#parm.inversion = 2 #AUTO
tlist.append(parm)
- # FIXME use correct parameters
- def addTerTransponder(self, tlist, frequency):
+ def addTerTransponder(self, tlist, frequency,
+ inversion=2, bandwidth = 3, fechigh = 6, feclow = 6,
+ modulation = 2, transmission = 2, guard = 4,
+ hierarchy = 4):
+ # 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
+
+ f1_2 = 0
+ f2_3 = 1
+ f3_4 = 2
+ f5_6 = 3
+ f7_8 = 4
+ fAuto = 5
+
+ TM2k = 0
+ TM8k = 1
+ TM4k = 2
+ TMAuto = 3
+
+ GI_1_32 = 0
+ GI_1_16 = 1
+ GI_1_8 = 2
+ GI_1_4 = 3
+ GI_Auto = 4
+
+ HNone = 0
+ H1 = 1
+ H2 = 2
+ H4 = 3
+ HAuto = 4
+
+ QPSK = 0
+ QAM16 = 1
+ QAM64 = 2
+ Auto = 3
+
+ Off = 0
+ On = 1
+ Unknown = 2
+
parm = eDVBFrontendParametersTerrestrial()
parm.frequency = frequency * 1000000
- parm.inversion = 2 # eDVBFrontendParametersTerrestrial.Inversion.Unknown;
- parm.bandwidth = 0 #eDVBFrontendParametersTerrestrial.Bandwidth.Bw8MHz;
- parm.code_rate_HP = parm.code_rate_LP = 6 #eDVBFrontendParametersTerrestrial.FEC.fAuto;
- parm.modulation = 1 #eDVBFrontendParametersTerrestrial.Modulation.QAM16;
- parm.transmission_mode = 1 # eDVBFrontendParametersTerrestrial.TransmissionMode.TM8k;
- parm.guard_interval = 0 # eDVBFrontendParametersTerrestrial.GuardInterval.GI_1_32;
- parm.hierarchy = 0 #eDVBFrontendParametersTerrestrial.Hierarchy.HNone;
+
+ parm.inversion = [Off, On, Unknown][inversion]
+ 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.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]
tlist.append(parm)
def keyGo(self):
elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder":
self.addTerTransponder(tlist,
- config.scan.ter.frequency.value[0])
+ config.scan.ter.frequency.value[0],
+ inversion = config.scan.ter.inversion.value,
+ bandwidth = config.scan.ter.bandwidth.value,
+ fechigh = config.scan.ter.fechigh.value,
+ feclow = config.scan.ter.feclow.value,
+ modulation = config.scan.ter.modulation.value,
+ transmission = config.scan.ter.transmission.value,
+ guard = config.scan.ter.guard.value,
+ hierarchy = config.scan.ter.hierarchy.value)
+ if currentConfigSelectionElement(config.scan.ter.networkScan) == "yes":
+ flags |= eComponentScan.scanNetworkSearch
if currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
pass
-
-
for x in self["config"].list:
x[1].save()
def keyGo(self):
scanList = []
+ if nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"] and nimmanager.getNimType(0) == nimmanager.getNimType(1):
+ sec = eDVBSatelliteEquipmentControl.getInstance()
+ if sec is not None:
+ exclusive_satellites = sec.get_exclusive_satellites(0,1)
+ else:
+ exclusive_satellites = [0,0]
+ else:
+ exclusive_satellites = [0,0]
+ print "exclusive satellites", exclusive_satellites
for x in self.list:
slotid = x[1].parent.configPath
- print "configpath:", x[1].parent.configPath, "-", currentConfigSelectionElement(x[1].parent)
+ print "Scan Tuner", slotid, "-", currentConfigSelectionElement(x[1].parent)
if currentConfigSelectionElement(x[1].parent) == "yes":
tlist = [ ]
if nimmanager.getNimType(x[1].parent.configPath) == nimmanager.nimType["DVB-S"]:
+ if slotid > 0:
+ idx = exclusive_satellites[0]+1
+ else:
+ idx = 0
+ exclusive_nim_sats = exclusive_satellites[idx+1:idx+1+exclusive_satellites[idx]]
+ print "exclusive_nim_sats", exclusive_nim_sats
SatList = nimmanager.getSatListForNim(slotid)
for sat in SatList:
- getInitialTransponderList(tlist, sat[1])
+ if sat[1] in exclusive_nim_sats or slotid == 0:
+ print sat
+ 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})
return False
sec = eDVBSatelliteEquipmentControl.getInstance()
if sec is not None:
- different_satellites = sec.get_different_satellites(0,1)
- if different_satellites is None:# or not len(different_satellites):
+ exclusive_satellites = sec.get_exclusive_satellites(0,1)
+ if len(exclusive_satellites) == 0:
return False
return True
git.cweiske.de / enigma2.git / blobdiff