X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f1735026cf43b48fde28af179b4ef16ce4955cc0..f7b88cee0d1a27ddfda26ad4c77d16b3a0c4e168:/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 67da8bb9..46e5e63b 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -10,36 +10,36 @@ from Components.TunerInfo import TunerInfo
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager
from Components.MenuList import MenuList
-from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist
+from Components.config import ConfigSatlist, ConfigNothing, ConfigSelection, ConfigSubsection, KEY_LEFT, KEY_RIGHT, getConfigListEntry
class PositionerSetup(Screen):
skin = """
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"""
def __init__(self, session, feid):
self.skin = PositionerSetup.skin
@@ -51,7 +51,7 @@ class PositionerSetup(Screen):
self.diseqc = Diseqc(self.feid)
self.tuner = Tuner(self.diseqc.getFrontend())
- self.tuner.tune((0,0,0,0,0,0,0,0,0))
+ self.tuner.tune((0,0,0,0,0,0))
#self.session.nav.stopService()
@@ -112,49 +112,49 @@ class PositionerSetup(Screen):
self.statusTimer = eTimer()
self.statusTimer.timeout.get().append(self.updateStatus)
self.statusTimer.start(50, False)
-
+
def createConfig(self):
- config.positioner = ConfigSubsection()
- config.positioner.tune = configElement_nonSave("tune", configNothing, 0, None)
- config.positioner.move = configElement_nonSave("move", configNothing, 0, None)
- config.positioner.finemove = configElement_nonSave("finemove", configNothing, 0, None)
- config.positioner.limits = configElement_nonSave("limits", configNothing, 0, None)
+ self.positioner_tune = ConfigNothing()
+ self.positioner_move = ConfigNothing()
+ self.positioner_finemove = ConfigNothing()
+ self.positioner_limits = ConfigNothing()
+ self.positioner_goto0 = ConfigNothing()
storepos = []
- for x in range(255):
+ for x in range(1,255):
storepos.append(str(x))
- config.positioner.storage = configElement_nonSave("storage", configSelection, 0, storepos)
-
+ self.positioner_storage = ConfigSelection(choices = storepos)
+
def createSetup(self):
- self.list.append(getConfigListEntry(_("Tune"), config.positioner.tune))
- self.list.append(getConfigListEntry(_("Positioner movement"), config.positioner.move))
- self.list.append(getConfigListEntry(_("Positioner fine movement"), config.positioner.finemove))
- self.list.append(getConfigListEntry(_("Set limits"), config.positioner.limits))
- self.list.append(getConfigListEntry(_("Positioner storage"), config.positioner.storage))
-
+ self.list.append((_("Tune"), self.positioner_tune, "tune"))
+ self.list.append((_("Positioner movement"), self.positioner_move, "move"))
+ self.list.append((_("Positioner fine movement"), self.positioner_finemove, "finemove"))
+ self.list.append((_("Set limits"), self.positioner_limits, "limits"))
+ self.list.append((_("Positioner storage"), self.positioner_storage, "storage"))
+ self.list.append((_("Goto 0"), self.positioner_goto0, "goto0"))
self["list"].l.setList(self.list)
-
+
def go(self):
pass
-
+
def getCurrentConfigPath(self):
- return self["list"].getCurrent()[1].parent.configPath
-
+ return self["list"].getCurrent()[2]
+
def up(self):
if not self.isMoving:
self["list"].instance.moveSelection(self["list"].instance.moveUp)
self.updateColors(self.getCurrentConfigPath())
-
+
def down(self):
if not self.isMoving:
self["list"].instance.moveSelection(self["list"].instance.moveDown)
self.updateColors(self.getCurrentConfigPath())
-
+
def left(self):
- self["list"].handleKey(config.key["prevElement"])
-
+ self["list"].handleKey(KEY_LEFT)
+
def right(self):
- self["list"].handleKey(config.key["nextElement"])
-
+ self["list"].handleKey(KEY_RIGHT)
+
def updateColors(self, entry):
if entry == "tune":
self.red.setText(_("Tune"))
@@ -181,18 +181,23 @@ class PositionerSetup(Screen):
self.red.setText(_("Limits off"))
self.green.setText(_("Limit west"))
self.yellow.setText(_("Limit east"))
- self.blue.setText("")
+ self.blue.setText(_("Limits on"))
elif entry == "storage":
self.red.setText("")
self.green.setText(_("Store position"))
self.yellow.setText(_("Goto position"))
self.blue.setText("")
+ elif entry == "goto0":
+ self.red.setText(_("Goto 0"))
+ self.green.setText("")
+ self.yellow.setText("")
+ self.blue.setText("")
else:
self.red.setText("")
self.green.setText("")
self.yellow.setText("")
self.blue.setText("")
-
+
def redKey(self):
entry = self.getCurrentConfigPath()
if entry == "move":
@@ -208,7 +213,10 @@ class PositionerSetup(Screen):
self.diseqccommand("limitOff")
elif entry == "tune":
self.session.openWithCallback(self.tune, TunerScreen, self.feid)
-
+ elif entry == "goto0":
+ print "move to position 0"
+ self.diseqccommand("moveTo", 0)
+
def greenKey(self):
entry = self.getCurrentConfigPath()
if entry == "move":
@@ -223,10 +231,10 @@ class PositionerSetup(Screen):
self.updateColors("move")
elif entry == "finemove":
print "stepping west"
- self.diseqccommand("moveWest", 1)
+ self.diseqccommand("moveWest", 0xFF) # one step
elif entry == "storage":
- print "store at position", (config.positioner.storage.value + 1)
- self.diseqccommand("store", config.positioner.storage.value + 1)
+ print "store at position", int(self.positioner_storage.value)
+ self.diseqccommand("store", int(self.positioner_storage.value))
elif entry == "limits":
self.diseqccommand("limitWest")
@@ -244,10 +252,10 @@ class PositionerSetup(Screen):
self.updateColors("move")
elif entry == "finemove":
print "stepping east"
- self.diseqccommand("moveEast", 1)
+ self.diseqccommand("moveEast", 0xFF) # one step
elif entry == "storage":
- print "move to position", (config.positioner.storage.value + 1)
- self.diseqccommand("moveTo", config.positioner.storage.value + 1)
+ print "move to position", int(self.positioner_storage.value)
+ self.diseqccommand("moveTo", int(self.positioner_storage.value))
elif entry == "limits":
self.diseqccommand("limitEast")
#
@@ -263,7 +271,9 @@ class PositionerSetup(Screen):
self.isMoving = True
self.updateColors("move")
print "moving east"
-
+ elif entry == "limits":
+ self.diseqccommand("limitOn")
+
def diseqccommand(self, cmd, param = 0):
self.diseqc.command(cmd, param)
self.tuner.retune()
@@ -322,6 +332,8 @@ class Diseqc:
string = 'e0316b' + ("%02x" % param)
elif what == "store":
string = 'e0316a' + ("%02x" % param)
+ elif what == "limitOn":
+ string = 'e0316a00'
elif what == "limitOff":
string = 'e03163'
elif what == "limitEast":
@@ -350,6 +362,7 @@ class Tuner:
parm.inversion = transponder[4]
parm.orbital_position = transponder[5]
parm.system = 0 # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
+ parm.modulation = 1 # FIXMEE !! HARDCODED QPSK
feparm = eDVBFrontendParameters()
feparm.setDVBS(parm, True)
self.lastparm = feparm
@@ -361,6 +374,8 @@ class Tuner:
def getTransponderData(self):
return self.frontend.readTransponderData(True)
+tuning = None
+
class TunerScreen(ScanSetup):
skin = """
@@ -379,18 +394,18 @@ class TunerScreen(ScanSetup):
self.satEntry = None
self.list = []
- self.typeOfTuningEntry = getConfigListEntry(_('Tune'), config.tuning.type)
+ self.typeOfTuningEntry = getConfigListEntry(_('Tune'), tuning.type)
self.list.append(self.typeOfTuningEntry)
- self.satEntry = getConfigListEntry(_('Satellite'), config.tuning.sat)
+ self.satEntry = getConfigListEntry(_('Satellite'), tuning.sat)
self.list.append(self.satEntry)
- if currentConfigSelectionElement(config.tuning.type) == "manual_transponder":
- 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))
- elif currentConfigSelectionElement(config.tuning.type) == "predefined_transponder":
- self.list.append(getConfigListEntry(_("Transponder"), config.tuning.transponder))
+ if tuning.type.value == "manual_transponder":
+ self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
+ self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
+ self.list.append(getConfigListEntry(_('Symbol Rate'), self.scan_sat.symbolrate))
+ self.list.append(getConfigListEntry(_("Polarity"), self.scan_sat.polarization))
+ self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+ elif tuning.type.value == "predefined_transponder":
+ self.list.append(getConfigListEntry(_("Transponder"), tuning.transponder))
self["config"].list = self.list
self["config"].l.setList(self.list)
@@ -398,24 +413,31 @@ class TunerScreen(ScanSetup):
if self["config"].getCurrent() == self.typeOfTuningEntry:
self.createSetup()
elif self["config"].getCurrent() == self.satEntry:
- self.updateSats()
self.createSetup()
- def createConfig(self):
- config.tuning = ConfigSubsection()
-
- config.tuning.type = configElement_nonSave("config.tuning.type", configSelection, 0, (("manual_transponder", _("Manual transponder")), ("predefined_transponder", _("Predefined satellite"))))
-
- config.tuning.sat = configElement_nonSave("config.tuning.sat", configSatlist, 192, nimmanager.getRotorSatListForNim(self.feid))
- ScanSetup.createConfig(self)
- self.updateSats()
-
- def updateSats(self):
- satnum = config.tuning.sat.value
- satlist = config.tuning.sat.vals
- if len(satlist):
- transponderlist = nimmanager.getTransponders(satlist[satnum][1])
- list = []
+ def createConfig(self, foo):
+ if not tuning:
+ global tuning
+ tuning = ConfigSubsection()
+ tuning.type = ConfigSelection(
+ default = "manual_transponder",
+ choices = { "manual_transponder" : _("Manual transponder"),
+ "predefined_transponder" : _("Predefined transponder") } )
+ tuning.sat = ConfigSatlist(list=nimmanager.getRotorSatListForNim(self.feid))
+ tuning.sat.addNotifier(self.tuningSatChanged)
+ self.updateTransponders()
+ TunerScreenConfigCreated = True
+ ScanSetup.createConfig(self, None)
+
+ def tuningSatChanged(self, *parm):
+ if tuning.type.value == "predefined_transponder":
+ self.updateTransponders()
+
+ def updateTransponders(self):
+ if len(tuning.sat.choices):
+ transponderlist = nimmanager.getTransponders(int(tuning.sat.value))
+ tps = []
+ cnt=0
for x in transponderlist:
if x[3] == 0:
pol = "H"
@@ -441,17 +463,23 @@ class TunerScreen(ScanSetup):
fec = "FEC_8_9"
elif x[4] == 6:
fec = "FEC_None"
- list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
- config.tuning.transponder = configElement_nonSave("config.tuning.transponder", configSelection, 0, list)
-
+ tps.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
+ tuning.transponder = ConfigSelection(choices=tps)
+
def keyGo(self):
- returnvalue = (0, 0, 0, 0, 0, 0, 0)
- satpos = config.tuning.sat.vals[config.tuning.sat.value][1]
- if currentConfigSelectionElement(config.tuning.type) == "manual_transponder":
- returnvalue = (config.scan.sat.frequency.value[0], config.scan.sat.symbolrate.value[0], config.scan.sat.polarization.value, config.scan.sat.fec.value, config.scan.sat.inversion.value, satpos)
- elif currentConfigSelectionElement(config.tuning.type) == "predefined_transponder":
- transponder = nimmanager.getTransponders(config.tuning.sat.vals[config.tuning.sat.value][1])[config.tuning.transponder.value]
- returnvalue = (int(transponder[1] / 100), int(transponder[2] / 1000), transponder[3], transponder[4], 2, config.tuning.sat.vals[config.tuning.sat.value][1], satpos)
+ returnvalue = (0, 0, 0, 0, 0, 0)
+ satpos = int(tuning.sat.value)
+ if tuning.type.value == "manual_transponder":
+ returnvalue = (
+ self.scan_sat.frequency.value,
+ self.scan_sat.symbolrate.value,
+ self.scan_sat.polarization.index,
+ self.scan_sat.fec.index,
+ self.scan_sat.inversion.index,
+ satpos)
+ elif tuning.type.value == "predefined_transponder":
+ transponder = nimmanager.getTransponders(satpos)[tuning.transponder.index]
+ returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
self.close(returnvalue)
def keyCancel(self):