self.updateColors("tune")
self.statusTimer = eTimer()
- self.statusTimer.timeout.get().append(self.updateStatus)
- self.statusTimer.start(50, False)
+ self.statusTimer.callback.append(self.updateStatus)
+ self.statusTimer.start(50, True)
+ self.onClose.append(self.__onClose)
+
+ def __onClose(self):
+ self.session.nav.playService(self.oldref)
def restartPrevService(self, yesno):
if yesno:
if self.frontend:
self.frontend = None
del self.raw_channel
- self.session.nav.playService(self.oldref)
- self.close(None)
-
+ else:
+ self.oldref=None
+ self.close(None)
+
def keyCancel(self):
if self.oldref:
self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO)
self.isMoving = False
self.stopOnLock = False
self.updateColors(self.getCurrentConfigPath())
+ self.statusTimer.start(50, True)
def tune(self, transponder):
if transponder is not None:
pol = "CL"
elif x[3] == 3:
pol = "CR"
+ else:
+ pol = "??"
if x[4] == 0:
fec = "FEC_AUTO"
elif x[4] == 1:
fec = "FEC_5_6"
elif x[4] == 5:
fec = "FEC_7_8"
- elif x[4] == 5:
- fec = "FEC_8_9"
elif x[4] == 6:
+ fec = "FEC_8_9"
+ elif x[4] == 7:
+ fec = "FEC_3_5"
+ elif x[4] == 8:
+ fec = "FEC_4_5"
+ elif x[4] == 9:
+ fec = "FEC_9_10"
+ elif x[4] == 15:
fec = "FEC_None"
+ else:
+ fec = "FEC_Unknown"
tps.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
tuning.transponder = ConfigSelection(choices=tps)
def keyCancel(self):
self.close(None)
-class NimSelection(Screen):
+class RotorNimSelection(Screen):
skin = """
<screen position="140,165" size="400,100" title="select Slot">
<widget name="nimlist" position="20,10" size="360,75" />
def __init__(self, session):
Screen.__init__(self, session)
- nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+ nimlist = nimmanager.getNimListOfType("DVB-S")
nimMenuList = []
for x in nimlist:
- n = nimmanager.nim_slots[x]
- nimMenuList.append((n.friendly_full_name, x))
+ nimMenuList.append((nimmanager.nim_slots[x].friendly_full_description, x))
self["nimlist"] = MenuList(nimMenuList)
if len(usableNims) == 1:
session.open(PositionerSetup, usableNims[0])
elif len(usableNims) > 1:
- session.open(NimSelection)
+ session.open(RotorNimSelection)
else:
session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)