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
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
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
nimList = [ ]
for nim in nimmanager.nimList():
nimList.append(nim[0])
- nimList.append("all")
+ #nimList.append("all")
config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList)
# 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)))
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:
class ScanSimple(Screen):
- def keyOK(self):
+ def run(self):
print "start scan for sats:"
tlist = [ ]
for x in self.list:
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 keyGo(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 doNothing(self):
+ pass
+
def keyCancel(self):
self.close()
self["actions"] = ActionMap(["SetupActions"],
{
- "ok": self.keyOK,
+ "ok": self.keyGo,
"cancel": self.keyCancel,
"left": self.keyLeft,
"right": self.keyRight,