X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3e0a413bb4a34a9cdc72ca14b5399e31f59b1f3c..a782957c5f914aebbf1bbc458bb3cb046ebb4c7b:/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 8353f873..4f76d887 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -1,22 +1,25 @@
-from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager, eDVBDiseqcCommand, eDVBResourceManagerPtr, iDVBChannelPtr, iDVBFrontendPtr, iDVBFrontend
+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
from Components.ConfigList import ConfigList
from Components.TunerInfo import TunerInfo
from Components.ActionMap import ActionMap
-from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection
+from Components.NimManager import nimmanager
+from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist
class PositionerSetup(Screen):
skin = """
-
+
-
-
-
-
+
+
+
+
@@ -29,20 +32,32 @@ class PositionerSetup(Screen):
+
+
+
+
+
+
+
"""
- def __init__(self, session):
+ def __init__(self, session, feid):
self.skin = PositionerSetup.skin
Screen.__init__(self, session)
self.session.nav.stopService()
- self.diseqc = Diseqc()
+ self.feid = feid
+
+ self.diseqc = Diseqc(self.feid)
+ self.tuner = Tuner(self.diseqc.getFrontend())
+ self.tuner.tune((0,0,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
@@ -53,8 +68,6 @@ class PositionerSetup(Screen):
self.blue = Label("")
self["blue"] = self.blue
- self.feid = 0
-
self.list = []
self["list"] = ConfigList(self.list)
self.createSetup()
@@ -63,13 +76,21 @@ class PositionerSetup(Screen):
self["agc"] = Label()
self["ber"] = Label()
self["lock"] = Label()
- self["snr_percentage"] = TunerInfo(TunerInfo.SNR_PERCENTAGE, self.session.nav.getCurrentService)
- self["agc_percentage"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, self.session.nav.getCurrentService)
- self["ber_value"] = TunerInfo(TunerInfo.BER_VALUE, self.session.nav.getCurrentService)
- self["snr_bar"] = TunerInfo(TunerInfo.SNR_BAR, self.session.nav.getCurrentService)
- self["agc_bar"] = TunerInfo(TunerInfo.AGC_BAR, self.session.nav.getCurrentService)
- self["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, self.session.nav.getCurrentService)
- self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, self.session.nav.getCurrentService)
+ self["snr_percentage"] = TunerInfo(TunerInfo.SNR_PERCENTAGE, frontendfkt = self.diseqc.getFrontend)
+ self["agc_percentage"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, frontendfkt = self.diseqc.getFrontend)
+ self["ber_value"] = TunerInfo(TunerInfo.BER_VALUE, frontendfkt = self.diseqc.getFrontend)
+ self["snr_bar"] = TunerInfo(TunerInfo.SNR_BAR, frontendfkt = self.diseqc.getFrontend)
+ self["agc_bar"] = TunerInfo(TunerInfo.AGC_BAR, frontendfkt = self.diseqc.getFrontend)
+ self["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, frontendfkt = self.diseqc.getFrontend)
+ self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, frontendfkt = self.diseqc.getFrontend)
+
+ self["frequency"] = Label()
+ self["symbolrate"] = Label()
+ self["fec"] = Label()
+
+ self["frequency_value"] = Label("")
+ self["symbolrate_value"] = Label("")
+ self["fec_value"] = Label("")
self["actions"] = ActionMap(["DirectionActions", "OkCancelActions", "ColorActions"],
{
@@ -89,12 +110,13 @@ class PositionerSetup(Screen):
self.statusTimer = eTimer()
self.statusTimer.timeout.get().append(self.updateStatus)
- self.statusTimer.start(200, False)
+ self.statusTimer.start(100, 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)
storepos = []
for x in range(255):
@@ -104,6 +126,7 @@ class PositionerSetup(Screen):
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))
@@ -116,12 +139,14 @@ class PositionerSetup(Screen):
return self["list"].getCurrent()[1].parent.configPath
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"])
@@ -131,8 +156,8 @@ class PositionerSetup(Screen):
def updateColors(self, entry):
if entry == "tune":
- self.red.setText("tune manually")
- self.green.setText("predefined transponder")
+ self.red.setText("tune")
+ self.green.setText("")
self.yellow.setText("")
self.blue.setText("")
elif entry == "move":
@@ -143,16 +168,21 @@ 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("")
elif entry == "storage":
- self.red.setText()
+ self.red.setText("")
self.green.setText(_("Store position"))
self.yellow.setText(_("Goto position"))
self.blue.setText("")
@@ -166,49 +196,76 @@ class PositionerSetup(Screen):
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)
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", 1)
elif entry == "storage":
print "store at position", (config.positioner.storage.value + 1)
- self.diseqc.command("store", config.positioner.storage.value + 1)
+ self.diseqccommand("store", config.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", 1)
elif entry == "storage":
print "move to position", (config.positioner.storage.value + 1)
- self.diseqc.command("moveTo", config.positioner.storage.value + 1)
+ self.diseqccommand("moveTo", config.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"
+
+ def diseqccommand(self, cmd, param = 0):
+ self.diseqc.command(cmd, param)
+ self.tuner.retune()
def updateStatus(self):
self["snr_percentage"].update()
@@ -217,55 +274,213 @@ 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:
+ self.tuner.tune(transponder)
+
class Diseqc:
def __init__(self, feid = 0):
self.ready = False
self.feid = feid
res_mgr = eDVBResourceManagerPtr()
if eDVBResourceManager.getInstance(res_mgr) == 0:
- raw_channel = iDVBChannelPtr()
- if res_mgr.allocateRawChannel(raw_channel, self.feid) == 0:
+ self.raw_channel = iDVBChannelPtr()
+ if res_mgr.allocateRawChannel(self.raw_channel, self.feid) == 0:
self.frontend = iDVBFrontendPtr()
- if raw_channel.getFrontend(self.frontend) == 0:
- self.frontend.setVoltage(iDVBFrontend.voltage18)
+ if self.raw_channel.getFrontend(self.frontend) == 0:
self.ready = True
else:
print "getFrontend failed"
else:
print "getRawChannel failed"
else:
- print "getResourceManager instance failed"
+ print "getResourceManager instance failed"
+
+ def getFrontend(self):
+ return self.frontend
def command(self, what, param = 0):
if self.ready:
cmd = eDVBDiseqcCommand()
if what == "moveWest":
- string = 'e13169' + ("%02x" % param)
+ string = 'e03169' + ("%02x" % param)
elif what == "moveEast":
- string = 'e13168' + ("%02x" % param)
+ string = 'e03168' + ("%02x" % param)
elif what == "moveTo":
- string = 'e1316b' + ("%02x" % param)
+ string = 'e0316b' + ("%02x" % param)
elif what == "store":
- string = 'e1316a' + ("%02x" % param)
+ string = 'e0316a' + ("%02x" % param)
elif what == "limitOff":
- string = 'e13163'
+ string = 'e03163'
elif what == "limitEast":
- string = 'e13166'
+ string = 'e03166'
elif what == "limitWest":
- string = 'e13167'
+ string = 'e03167'
else:
string = 'e03160' #positioner stop
print "diseqc command:",
- for x in string:
- print hex(ord(x)),
- print
+ print string
cmd.setCommandString(string)
self.frontend.sendDiseqc(cmd)
-
+
+class Tuner:
+ def __init__(self, frontend):
+ self.frontend = frontend
+
+ def tune(self, transponder):
+ print "tuning to transponder with data", transponder
+ parm = eDVBFrontendParametersSatellite()
+ parm.frequency = transponder[0] * 1000
+ parm.symbol_rate = transponder[1] * 1000
+ parm.polarisation = transponder[2]
+ parm.fec = transponder[3]
+ parm.inversion = transponder[4]
+ parm.orbital_position = 192
+ 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)
+
+class TunerScreen(ScanSetup):
+ skin = """
+
+
+
+ """
+
+ def __init__(self, session, feid):
+ self.feid = feid
+ ScanSetup.__init__(self, session)
+
+ self["introduction"].setText("")
+
+ def createSetup(self):
+ self.typeOfTuningEntry = None
+ self.satEntry = None
+
+ self.list = []
+ self.typeOfTuningEntry = getConfigListEntry(_('Tune'), config.tuning.type)
+ self.list.append(self.typeOfTuningEntry)
+ self.satEntry = getConfigListEntry(_('Satellite'), config.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))
+ self["config"].list = self.list
+ self["config"].l.setList(self.list)
+
+ def newConfig(self):
+ 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.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])
+ self.close(returnvalue)
+
+ def keyCancel(self):
+ self.close(None)
+
+class NimSelection(Screen):
+ skin = """
+
+
+ """
+
+ def __init__(self, session):
+ Screen.__init__(self, session)
+
+ self["nimlist"] = MenuList(nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"]))
+
+ self["actions"] = ActionMap(["OkCancelActions"],
+ {
+ "ok": self.okbuttonClick ,
+ "cancel": self.close
+ }, -1)
+
+ def okbuttonClick(self):
+ selection = self["nimlist"].getCurrent()
+ self.session.open(PositionerSetup, selection[1].slotid)
+
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)
+ elif len(nimList) == 1:
+ session.open(PositionerSetup, nimList[0])
+ else:
+ session.open(NimSelection)
+
def Plugins(**kwargs):
return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain)