X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c7a7c847e336cc9d46fe8b4b52f21ced036a8c4f..d85c75fc186d91f497d5997982db94259b041280:/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 554adaea..afdb6b6e 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -1,6 +1,7 @@
from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager, eDVBDiseqcCommand, eDVBResourceManagerPtr, iDVBChannelPtr, iDVBFrontendPtr, iDVBFrontend, eDVBFrontendParametersSatellite, eDVBFrontendParameters
from Screens.Screen import Screen
from Screens.ScanSetup import ScanSetup
+from Screens.MessageBox import MessageBox
from Plugins.Plugin import PluginDescriptor
from Components.Label import Label
@@ -8,53 +9,56 @@ from Components.ConfigList import ConfigList
from Components.TunerInfo import TunerInfo
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager
-from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist
+from Components.MenuList import MenuList
+from Components.config import ConfigSatlist, ConfigNothing, ConfigSelection, ConfigSubsection, KEY_LEFT, KEY_RIGHT, getConfigListEntry
class PositionerSetup(Screen):
skin = """
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"""
- def __init__(self, session):
+ def __init__(self, session, feid):
self.skin = PositionerSetup.skin
Screen.__init__(self, session)
self.session.nav.stopService()
- self.feid = 1
+ self.feid = feid
self.diseqc = Diseqc(self.feid)
self.tuner = Tuner(self.diseqc.getFrontend())
+ self.tuner.tune((0,0,0,0,0,0))
#self.session.nav.stopService()
self.createConfig()
self.isMoving = False
+ self.stopOnLock = False
self.red = Label("")
self["red"] = self.red
@@ -107,49 +111,53 @@ class PositionerSetup(Screen):
self.statusTimer = eTimer()
self.statusTimer.timeout.get().append(self.updateStatus)
- self.statusTimer.start(200, False)
-
+ 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.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(_("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):
- self["list"].instance.moveSelection(self["list"].instance.moveUp)
- self.updateColors(self.getCurrentConfigPath())
-
+ if not self.isMoving:
+ self["list"].instance.moveSelection(self["list"].instance.moveUp)
+ self.updateColors(self.getCurrentConfigPath())
+
def down(self):
- self["list"].instance.moveSelection(self["list"].instance.moveDown)
- self.updateColors(self.getCurrentConfigPath())
-
+ 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")
+ self.red.setText(_("Tune"))
self.green.setText("")
self.yellow.setText("")
self.blue.setText("")
@@ -161,74 +169,114 @@ class PositionerSetup(Screen):
self.blue.setText(_("Stop"))
else:
self.red.setText(_("Move west"))
- self.green.setText(_("Step west"))
- self.yellow.setText(_("Step east"))
+ self.green.setText(_("Search west"))
+ self.yellow.setText(_("Search east"))
self.blue.setText(_("Move east"))
+ elif entry == "finemove":
+ self.red.setText("")
+ self.green.setText(_("Step west"))
+ self.yellow.setText(_("Step east"))
+ self.blue.setText("")
elif entry == "limits":
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":
if self.isMoving:
- self.diseqc.command("stop")
+ self.diseqccommand("stop")
self.isMoving = False
+ self.stopOnLock = False
else:
- self.diseqc.command("moveWest", 0)
+ self.diseqccommand("moveWest", 0)
self.isMoving = True
self.updateColors("move")
- print "moving west"
elif entry == "limits":
- self.diseqc.command("limitOff")
+ 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":
+ if self.isMoving:
+ self.diseqccommand("stop")
+ self.isMoving = False
+ self.stopOnLock = False
+ else:
+ self.isMoving = True
+ self.stopOnLock = True
+ self.diseqccommand("moveWest", 0)
+ self.updateColors("move")
+ elif entry == "finemove":
print "stepping west"
- self.diseqc.command("moveWest", 1)
+ self.diseqccommand("moveWest", 0xFF) # one step
elif entry == "storage":
- print "store at position", (config.positioner.storage.value + 1)
- self.diseqc.command("store", config.positioner.storage.value + 1)
+ print "store at position", (self.positioner_storage.value + 1)
+ self.diseqccommand("store", self.positioner_storage.value + 1)
elif entry == "limits":
- self.diseqc.command("limitWest")
+ self.diseqccommand("limitWest")
def yellowKey(self):
entry = self.getCurrentConfigPath()
if entry == "move":
+ if self.isMoving:
+ self.diseqccommand("stop")
+ self.isMoving = False
+ self.stopOnLock = False
+ else:
+ self.isMoving = True
+ self.stopOnLock = True
+ self.diseqccommand("moveEast", 0)
+ self.updateColors("move")
+ elif entry == "finemove":
print "stepping east"
- self.diseqc.command("moveEast", 1)
+ self.diseqccommand("moveEast", 0xFF) # one step
elif entry == "storage":
- print "move to position", (config.positioner.storage.value + 1)
- self.diseqc.command("moveTo", config.positioner.storage.value + 1)
+ print "move to position", (self.positioner_storage.value + 1)
+ self.diseqccommand("moveTo", self.positioner_storage.value + 1)
elif entry == "limits":
- self.diseqc.command("limitEast")
+ self.diseqccommand("limitEast")
#
def blueKey(self):
entry = self.getCurrentConfigPath()
if entry == "move":
if self.isMoving:
- self.diseqc.command("stop")
+ self.diseqccommand("stop")
self.isMoving = False
+ self.stopOnLock = False
else:
- self.diseqc.command("moveEast", 0)
+ self.diseqccommand("moveEast", 0)
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()
def updateStatus(self):
self["snr_percentage"].update()
@@ -237,10 +285,16 @@ class PositionerSetup(Screen):
self["snr_bar"].update()
self["agc_bar"].update()
self["ber_bar"].update()
+ self["lock_state"].update()
transponderdata = self.tuner.getTransponderData()
self["frequency_value"].setText(str(transponderdata["frequency"]))
self["symbolrate_value"].setText(str(transponderdata["symbol_rate"]))
self["fec_value"].setText(str(transponderdata["fec_inner"]))
+ if transponderdata["tuner_locked"] == 1 and self.isMoving and self.stopOnLock:
+ self.diseqccommand("stop")
+ self.isMoving = False
+ self.stopOnLock = False
+ self.updateColors(self.getCurrentConfigPath())
def tune(self, transponder):
if transponder is not None:
@@ -278,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":
@@ -304,11 +360,17 @@ class Tuner:
parm.polarisation = transponder[2]
parm.fec = transponder[3]
parm.inversion = transponder[4]
- parm.orbital_position = 192
+ 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
self.frontend.tune(feparm)
+ def retune(self):
+ self.frontend.tune(self.lastparm)
+
def getTransponderData(self):
return self.frontend.readTransponderData(True)
@@ -330,18 +392,18 @@ class TunerScreen(ScanSetup):
self.satEntry = None
self.list = []
- self.typeOfTuningEntry = getConfigListEntry(_('Tune'), config.tuning.type)
+ self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning.type)
self.list.append(self.typeOfTuningEntry)
- self.satEntry = getConfigListEntry(_('Satellite'), config.tuning.sat)
+ self.satEntry = getConfigListEntry(_('Satellite'), self.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 self.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 self.tuning.type.value == "predefined_transponder":
+ self.list.append(getConfigListEntry(_("Transponder"), self.tuning.transponder))
self["config"].list = self.list
self["config"].l.setList(self.list)
@@ -349,63 +411,116 @@ class TunerScreen(ScanSetup):
if self["config"].getCurrent() == self.typeOfTuningEntry:
self.createSetup()
elif self["config"].getCurrent() == self.satEntry:
- self.updateSats()
+ self.updateTransponders()
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"))))
+ def createConfig(self, foo):
+ self.tuning = ConfigSubsection()
+ self.tuning.type = ConfigSelection(
+ default = "manual_transponder",
+ choices = { "manual_transponder" : _("Manual transponder"),
+ "predefined_transponder" : _("Predefined transponder") } )
+ self.tuning.sat = ConfigSatlist(list=nimmanager.getRotorSatListForNim(self.feid))
+ ScanSetup.createConfig(self, None)
+ self.updateTransponders()
+
+ def updateTransponders(self):
+ if len(self.tuning.sat.choices):
+ transponderlist = nimmanager.getTransponders(int(self.tuning.sat.value))
+ tps = []
+ cnt=0
+ for x in transponderlist:
+ if x[3] == 0:
+ pol = "H"
+ elif x[3] == 1:
+ pol = "V"
+ elif x[3] == 2:
+ pol = "CL"
+ elif x[3] == 3:
+ pol = "CR"
+ if x[4] == 0:
+ fec = "FEC_AUTO"
+ elif x[4] == 1:
+ fec = "FEC_1_2"
+ elif x[4] == 2:
+ fec = "FEC_2_3"
+ elif x[4] == 3:
+ fec = "FEC_3_4"
+ elif x[4] == 4:
+ 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_None"
+ tps.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
+ self.tuning.transponder = ConfigSelection(choices=tps)
- config.tuning.sat = configElement_nonSave("config.tuning.sat", configSatlist, 192, nimmanager.getSatListForNim(self.feid))
- ScanSetup.createConfig(self)
- self.updateSats()
-
- def updateSats(self):
- transponderlist = nimmanager.getTransponders(config.tuning.sat.vals[config.tuning.sat.value][1])
- list = []
- for x in transponderlist:
- if x[3] == 0:
- pol = "H"
- elif x[3] == 1:
- pol = "V"
- elif x[3] == 2:
- pol = "CL"
- elif x[3] == 3:
- pol = "CR"
- if x[4] == 0:
- fec = "FEC_AUTO"
- elif x[4] == 1:
- fec = "FEC_1_2"
- elif x[4] == 2:
- fec = "FEC_2_3"
- elif x[4] == 3:
- fec = "FEC_3_4"
- elif x[4] == 4:
- 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_None"
- list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
- config.tuning.transponder = configElement_nonSave("config.tuning.transponder", configSelection, 0, list)
-
def keyGo(self):
returnvalue = (0, 0, 0, 0, 0, 0)
- 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)
- 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 = int(self.tuning.sat.value)
+ if self.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 self.tuning.type.value == "predefined_transponder":
+ transponder = nimmanager.getTransponders(satpos)[self.tuning.transponder.index]
+ returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
self.close(returnvalue)
def keyCancel(self):
self.close(None)
+class NimSelection(Screen):
+ skin = """
+
+
+ """
+
+ def __init__(self, session):
+ Screen.__init__(self, session)
+
+ nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+ nimMenuList = []
+ for x in nimlist:
+ nimMenuList.append((_("NIM ") + (["A", "B", "C", "D"][x]) + ": " + nimmanager.getNimName(x) + " (" + nimmanager.getNimTypeName(x) + ")", x))
+
+ self["nimlist"] = MenuList(nimMenuList)
+
+ self["actions"] = ActionMap(["OkCancelActions"],
+ {
+ "ok": self.okbuttonClick ,
+ "cancel": self.close
+ }, -1)
+
+ def okbuttonClick(self):
+ selection = self["nimlist"].getCurrent()
+ self.session.open(PositionerSetup, selection[1])
+
def PositionerMain(session, **kwargs):
- session.open(PositionerSetup)
+ nimList = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+ if len(nimList) == 0:
+ session.open(MessageBox, _("No positioner capable frontend found."), MessageBox.TYPE_ERROR)
+ else:
+ if session.nav.RecordTimer.isRecording():
+ session.open(MessageBox, _("A recording is currently running. Please stop the recording before trying to configure the positioner."), MessageBox.TYPE_ERROR)
+ else:
+ usableNims = []
+ for x in nimList:
+ configured_rotor_sats = nimmanager.getRotorSatListForNim(x)
+ if len(configured_rotor_sats) != 0:
+ usableNims.append(x)
+ if len(usableNims) == 1:
+ session.open(PositionerSetup, usableNims[0])
+ elif len(usableNims) > 1:
+ session.open(NimSelection)
+ else:
+ session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
def Plugins(**kwargs):
return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain)