git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly fix GSOD from last commit
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
PositionerSetup
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 9ee477710d4bb09d69eef25aa3ed0518b11b64f1..90de8b2fbca7ed7da446b95b32bf490a4b4805cd 100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@
-123,7
+123,7
@@
class PositionerSetup(Screen):
self.updateColors("tune")
self.statusTimer = eTimer()
self.updateColors("tune")
self.statusTimer = eTimer()
- self.statusTimer.
timeout.get()
.append(self.updateStatus)
+ self.statusTimer.
callback
.append(self.updateStatus)
self.statusTimer.start(50, False)
def restartPrevService(self, yesno):
self.statusTimer.start(50, False)
def restartPrevService(self, yesno):
@@
-482,6
+482,8
@@
class TunerScreen(ScanSetup):
pol = "CL"
elif x[3] == 3:
pol = "CR"
pol = "CL"
elif x[3] == 3:
pol = "CR"
+ else:
+ pol = "??"
if x[4] == 0:
fec = "FEC_AUTO"
elif x[4] == 1:
if x[4] == 0:
fec = "FEC_AUTO"
elif x[4] == 1:
@@
-494,10
+496,18
@@
class TunerScreen(ScanSetup):
fec = "FEC_5_6"
elif x[4] == 5:
fec = "FEC_7_8"
fec = "FEC_5_6"
elif x[4] == 5:
fec = "FEC_7_8"
- elif x[4] == 5:
- fec = "FEC_8_9"
elif x[4] == 6:
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"
fec = "FEC_None"
+ else:
+ fec = "FEC_Unknown"
tps.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
tuning.transponder = ConfigSelection(choices=tps)
tps.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
tuning.transponder = ConfigSelection(choices=tps)
@@
-529,11
+539,10
@@
class NimSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
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:
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)
self["nimlist"] = MenuList(nimMenuList)
@@
-567,14
+576,14
@@
def PositionerMain(session, **kwargs):
else:
session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
else:
session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
-def PositionerSetupStart(menuid):
+def PositionerSetupStart(menuid
, **kwargs
):
if menuid == "scan":
if menuid == "scan":
- return [(_("Positioner setup"), PositionerMain)]
+ return [(_("Positioner setup"), PositionerMain
, "positioner_setup", None
)]
else:
return []
def Plugins(**kwargs):
if (nimmanager.hasNimType("DVB-S")):
else:
return []
def Plugins(**kwargs):
if (nimmanager.hasNimType("DVB-S")):
- return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_
SETUP
, fnc=PositionerSetupStart)
+ return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_
MENU
, fnc=PositionerSetupStart)
else:
return []
else:
return []