X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20..935c5f9abeb0d6189c57f8406855d8437db8b0db:/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py?ds=inline
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 6e4e27b5..8e148812 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -1,5 +1,5 @@
-from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager,\
- eDVBDiseqcCommand, eDVBFrontendParametersSatellite, eDVBFrontendParameters
+from enigma import eDVBResourceManager,\
+ eDVBFrontendParametersSatellite, eDVBFrontendParameters
from Screens.Screen import Screen
from Screens.ScanSetup import ScanSetup
@@ -7,56 +7,14 @@ 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.Sources.FrontendStatus import FrontendStatus
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager, getConfigSatlist
from Components.MenuList import MenuList
-from Components.config import ConfigSelection, ConfigSatlist, getConfigListEntry
-
-class Tuner:
- def __init__(self, frontend):
- self.frontend = frontend
-
- def tune(self, transponder):
- if self.frontend:
- 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 = 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)
- self.lastparm = feparm
- self.frontend.tune(feparm)
-
- def retune(self):
- if self.frontend:
- self.frontend.tune(self.lastparm)
+from Components.config import ConfigSelection, getConfigListEntry
+from Components.TuneTest import Tuner
class Satfinder(ScanSetup):
- skin = """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- """
-
def openFrontend(self):
res_mgr = eDVBResourceManager.getInstance()
if res_mgr:
@@ -77,8 +35,7 @@ class Satfinder(ScanSetup):
self.initcomplete = False
self.feid = feid
self.oldref = None
- self.frontendStatus = { }
-
+
if not self.openFrontend():
self.oldref = session.nav.getCurrentlyPlayingServiceReference()
session.nav.stopService() # try to disable foreground service
@@ -88,66 +45,60 @@ class Satfinder(ScanSetup):
del session.pip
if not self.openFrontend():
self.frontend = None # in normal case this should not happen
-
+
ScanSetup.__init__(self, session)
self.tuner = Tuner(self.frontend)
-
- self["snr"] = Label()
- self["agc"] = Label()
- self["ber"] = Label()
- self["lock"] = Label()
- self["snr_percentage"] = TunerInfo(TunerInfo.SNR_PERCENTAGE, statusDict = self.frontendStatus)
- self["agc_percentage"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, statusDict = self.frontendStatus)
- self["ber_value"] = TunerInfo(TunerInfo.BER_VALUE, statusDict = self.frontendStatus)
- self["snr_bar"] = TunerInfo(TunerInfo.SNR_BAR, statusDict = self.frontendStatus)
- self["agc_bar"] = TunerInfo(TunerInfo.AGC_BAR, statusDict = self.frontendStatus)
- self["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, statusDict = self.frontendStatus)
- self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, statusDict = self.frontendStatus)
-
self["introduction"].setText("")
-
- self.statusTimer = eTimer()
- self.statusTimer.timeout.get().append(self.updateStatus)
- self.statusTimer.start(50, False)
+ self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
self.initcomplete = True
+ self.onClose.append(self.__onClose)
- def updateStatus(self):
- if self.frontend:
- self.frontend.getFrontendStatus(self.frontendStatus)
- else:
- self.frontendStatus.clear()
- self["snr_percentage"].update()
- self["agc_percentage"].update()
- self["ber_value"].update()
- self["snr_bar"].update()
- self["agc_bar"].update()
- self["ber_bar"].update()
- self["lock_state"].update()
+ def __onClose(self):
+ self.session.nav.playService(self.oldref)
def createSetup(self):
self.typeOfTuningEntry = None
self.satEntry = None
self.list = []
+
self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning_type)
self.list.append(self.typeOfTuningEntry)
self.satEntry = getConfigListEntry(_('Satellite'), self.tuning_sat)
self.list.append(self.satEntry)
+
+ nim = nimmanager.nim_slots[self.feid]
+
+ self.systemEntry = None
if self.tuning_type.value == "manual_transponder":
+ if nim.isCompatible("DVB-S2"):
+ self.systemEntry = getConfigListEntry(_('System'), self.scan_sat.system)
+ self.list.append(self.systemEntry)
+ else:
+ # downgrade to dvb-s, in case a -s2 config was active
+ self.scan_sat.system.value = eDVBFrontendParametersSatellite.System_DVB_S
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))
+ if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S:
+ self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+ elif self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S2:
+ self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec_s2))
+ self.modulationEntry = getConfigListEntry(_('Modulation'), self.scan_sat.modulation)
+ self.list.append(self.modulationEntry)
+ self.list.append(getConfigListEntry(_('Rolloff'), self.scan_sat.rolloff))
+ self.list.append(getConfigListEntry(_('Pilot'), self.scan_sat.pilot))
elif self.tuning_transponder and 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)
def newConfig(self):
- if self["config"].getCurrent() == self.typeOfTuningEntry:
+ cur = self["config"].getCurrent()
+ if cur in (self.typeOfTuningEntry, self.systemEntry):
self.createSetup()
- elif self["config"].getCurrent() == self.satEntry:
+ elif cur == self.satEntry:
self.updateSats()
self.createSetup()
@@ -156,16 +107,33 @@ class Satfinder(ScanSetup):
self.retune(config_element)
def retune(self, configElement):
- returnvalue = (0, 0, 0, 0, 0, 0, 0)
- satpos = self.tuning_sat.orbital_position
-
- if satpos is not None:
- 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)
+ returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+ satpos = int(self.tuning_sat.value)
+ if self.tuning_type.value == "manual_transponder":
+ if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S2:
+ fec = self.scan_sat.fec_s2.value
+ else:
+ fec = self.scan_sat.fec.value
+ returnvalue = (
+ self.scan_sat.frequency.value,
+ self.scan_sat.symbolrate.value,
+ self.scan_sat.polarization.value,
+ fec,
+ self.scan_sat.inversion.value,
+ satpos,
+ self.scan_sat.system.value,
+ self.scan_sat.modulation.value,
+ self.scan_sat.rolloff.value,
+ self.scan_sat.pilot.value)
self.tune(returnvalue)
+ elif self.tuning_type.value == "predefined_transponder":
+ tps = nimmanager.getTransponders(satpos)
+ l = len(tps)
+ if l > self.tuning_transponder.index:
+ transponder = tps[self.tuning_transponder.index]
+ returnvalue = (transponder[1] / 1000, transponder[2] / 1000,
+ transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9])
+ self.tune(returnvalue)
def createConfig(self, foo):
self.tuning_transponder = None
@@ -174,20 +142,20 @@ class Satfinder(ScanSetup):
ScanSetup.createConfig(self, None)
self.updateSats()
-
- self.tuning_type.addNotifier(self.retune, initial_call = False)
- self.tuning_sat.addNotifier(self.sat_changed, initial_call = False)
- self.scan_sat.frequency.addNotifier(self.retune, initial_call = False)
- self.scan_sat.inversion.addNotifier(self.retune, initial_call = False)
- self.scan_sat.symbolrate.addNotifier(self.retune, initial_call = False)
- self.scan_sat.polarization.addNotifier(self.retune, initial_call = False)
- self.scan_sat.fec.addNotifier(self.retune, initial_call = False)
+
+ for x in (self.tuning_type, self.tuning_sat, self.scan_sat.frequency,
+ self.scan_sat.inversion, self.scan_sat.symbolrate,
+ self.scan_sat.polarization, self.scan_sat.fec, self.scan_sat.pilot,
+ self.scan_sat.fec_s2, self.scan_sat.fec, self.scan_sat.modulation,
+ self.scan_sat.rolloff, self.scan_sat.system):
+ x.addNotifier(self.retune, initial_call = False)
def updateSats(self):
orb_pos = self.tuning_sat.orbital_position
if orb_pos is not None:
transponderlist = nimmanager.getTransponders(orb_pos)
list = []
+ default = None
for x in transponderlist:
if x[3] == 0:
pol = "H"
@@ -197,24 +165,37 @@ class Satfinder(ScanSetup):
pol = "CL"
elif x[3] == 3:
pol = "CR"
+ else:
+ pol = "??"
if x[4] == 0:
- fec = "FEC_AUTO"
+ fec = "FEC Auto"
elif x[4] == 1:
- fec = "FEC_1_2"
+ fec = "FEC 1/2"
elif x[4] == 2:
- fec = "FEC_2_3"
+ fec = "FEC 2/3"
elif x[4] == 3:
- fec = "FEC_3_4"
+ fec = "FEC 3/4"
elif x[4] == 4:
- fec = "FEC_5_6"
- elif x[4] == 5:
- fec = "FEC_7_8"
+ fec = "FEC 5/6"
elif x[4] == 5:
- fec = "FEC_8_9"
+ fec = "FEC 7/8"
elif x[4] == 6:
- fec = "FEC_None"
- list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
- self.tuning_transponder = ConfigSelection(choices = list)
+ 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"
+ e = str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec
+ if default is None:
+ default = e
+ list.append(e)
+ self.tuning_transponder = ConfigSelection(choices = list, default = default)
self.tuning_transponder.addNotifier(self.retune, initial_call = False)
def keyGo(self):
@@ -225,7 +206,8 @@ class Satfinder(ScanSetup):
if self.frontend:
self.frontend = None
del self.raw_channel
- self.session.nav.playService(self.oldref)
+ else:
+ self.oldref = None
self.close(None)
def keyCancel(self):
@@ -239,20 +221,20 @@ class Satfinder(ScanSetup):
if transponder is not None:
self.tuner.tune(transponder)
-class NimSelection(Screen):
+class SatNimSelection(Screen):
skin = """
-
-
+
+
"""
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.append((_("NIM ") + (["A", "B", "C", "D"][x]) + ": " + nimmanager.getNimName(x) + " (" + nimmanager.getNimTypeName(x) + ")", x))
-
+ nimMenuList.append((nimmanager.nim_slots[x].friendly_full_description, x))
+
self["nimlist"] = MenuList(nimMenuList)
self["actions"] = ActionMap(["OkCancelActions"],
@@ -262,11 +244,17 @@ class NimSelection(Screen):
}, -1)
def okbuttonClick(self):
- selection = self["nimlist"].getCurrent()
- self.session.open(Satfinder, selection[1])
+ selection = self["nimlist"].getCurrent()[1]
+ self.session.open(Satfinder, selection)
def SatfinderMain(session, **kwargs):
- nimList = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+ nims = nimmanager.getNimListOfType("DVB-S")
+
+ nimList = []
+ for x in nims:
+ if not nimmanager.getNimConfig(x).configMode.value in ("loopthrough", "satposdepends", "nothing"):
+ nimList.append(x)
+
if len(nimList) == 0:
session.open(MessageBox, _("No satellite frontend found!!"), MessageBox.TYPE_ERROR)
else:
@@ -276,13 +264,16 @@ def SatfinderMain(session, **kwargs):
if len(nimList) == 1:
session.open(Satfinder, nimList[0])
else:
- session.open(NimSelection)
+ session.open(SatNimSelection)
-def SatfinderStart(menuid):
+def SatfinderStart(menuid, **kwargs):
if menuid == "scan":
- return [(_("Satfinder"), SatfinderMain)]
+ return [(_("Satfinder"), SatfinderMain, "satfinder", None)]
else:
return []
def Plugins(**kwargs):
- return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_SETUP, fnc=SatfinderStart)
+ if (nimmanager.hasNimType("DVB-S")):
+ return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_MENU, fnc=SatfinderStart)
+ else:
+ return []