Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Plugins / SystemPlugins / Satfinder / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index b8f380d3d80e986c6f78c031a54a42c719a56cc8..7456885533002f271c1b959fc66538a49e2d2069 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -1,16 +1,17 @@
-from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager, eDVBDiseqcCommand, eDVBResourceManagerPtr, iDVBChannelPtr, iDVBFrontendPtr, iDVBFrontend, eDVBFrontendParametersSatellite, eDVBFrontendParameters
+from enigma import eDVBResourceManager,\
+       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 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.Sources.FrontendStatus import FrontendStatus

 from Components.ActionMap import ActionMap
 from Components.ActionMap import ActionMap

-from Components.NimManager import nimmanager
+from Components.NimManager import nimmanager, getConfigSatlist

 from Components.MenuList import MenuList
 from Components.MenuList import MenuList

-from Components.config import ConfigSelection, ConfigSatlist, getConfigListEntry
+from Components.config import ConfigSelection, getConfigListEntry

 
 class Tuner:
        def __init__(self, frontend):
 
 class Tuner:
        def __init__(self, frontend):


@@ -40,28 +41,51 @@ class Tuner:
 class Satfinder(ScanSetup):
        skin = """
                <screen position="90,100" size="520,400" title="Tune">
 class Satfinder(ScanSetup):
        skin = """
                <screen position="90,100" size="520,400" title="Tune">

-                       <widget name="config" position="20,10" size="460,240" scrollbarMode="showOnDemand" />
+                       <widget name="config" position="20,10" size="460,210" scrollbarMode="showOnDemand" />

                        <widget name="introduction" position="20,360" zPosition="-10" size="350,30" font="Regular;23" />
                        <widget name="introduction" position="20,360" zPosition="-10" size="350,30" font="Regular;23" />

-                       <widget name="snr" text="SNR:" position="0,245" size="60,22" font="Regular;21" />
-                       <widget name="agc" text="AGC:" position="0,270" size="60,22" font="Regular;21" />
-                       <widget name="ber" text="BER:" position="0,295" size="60,22" font="Regular;21" />
-                       <widget name="lock" text="Lock:" position="0,320" size="60,22" font="Regular;21" />
-                       <widget name="snr_percentage" position="220,245" size="60,22" font="Regular;21" />
-                       <widget name="agc_percentage" position="220,270" size="60,22" font="Regular;21" />
-                       <widget name="ber_value" position="220,295" size="60,22" font="Regular;21" />
-                       <widget name="lock_state" position="60,320" size="150,22" font="Regular;21" />
-                       <widget name="snr_bar" position="60,245" size="150,22" />
-                       <widget name="agc_bar" position="60,270" size="150,22" />
-                       <widget name="ber_bar" position="60,295" size="150,22" />
+                       <eLabel text="dB:" position="23,230" size="60,22" font="Regular;21" />
+                       <eLabel text="SNR:" position="23,255" size="60,22" font="Regular;21" />
+                       <eLabel text="AGC:" position="23,280" size="60,22" font="Regular;21" />
+                       <eLabel text="BER:" position="23,305" size="60,22" font="Regular;21" />
+                       <eLabel text="Lock:" position="23,330" size="60,22" font="Regular;21" />
+                       <widget source="Frontend" render="Label" position="295,230" size="60,22" font="Regular;21" >
+                               <convert type="FrontendInfo">SNRdB</convert>
+                       </widget>
+                       <widget source="Frontend" render="Label" position="295,255" size="60,22" font="Regular;21" >
+                               <convert type="FrontendInfo">SNR</convert>
+                       </widget>
+                       <widget source="Frontend" render="Label" position="295,280" size="60,22" font="Regular;21" >
+                               <convert type="FrontendInfo">AGC</convert>
+                       </widget>
+                       <widget source="Frontend" render="Label" position="295,305" size="60,22" font="Regular;21" >
+                               <convert type="FrontendInfo">BER</convert>
+                       </widget>
+                       <widget source="Frontend" render="Progress" position="85,257" size="200,22" >
+                               <convert type="FrontendInfo">SNR</convert>
+                       </widget>
+                       <widget source="Frontend" render="Progress" position="85,282" size="200,22" >
+                               <convert type="FrontendInfo">AGC</convert>
+                       </widget>
+                       <widget source="Frontend" render="Progress" position="85,307" size="200,22" >
+                               <convert type="FrontendInfo">BER</convert>
+                       </widget>
+                       <widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+                               <convert type="FrontendInfo">LOCK</convert>
+                       <convert type="ConditionalShowHide" />
+                       </widget>
+                       <widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+                               <convert type="FrontendInfo">LOCK</convert>
+                       <convert type="ConditionalShowHide">Invert</convert>
+                       </widget>

                </screen>"""
 
        def openFrontend(self):
                </screen>"""
 
        def openFrontend(self):

-               res_mgr = eDVBResourceManagerPtr()
-               if eDVBResourceManager.getInstance(res_mgr) == 0:
-                       self.raw_channel = iDVBChannelPtr()
-                       if res_mgr.allocateRawChannel(self.raw_channel, self.feid) == 0:
-                               self.frontend = iDVBFrontendPtr()
-                               if self.raw_channel.getFrontend(self.frontend) == 0:
+               res_mgr = eDVBResourceManager.getInstance()
+               if res_mgr:
+                       self.raw_channel = res_mgr.allocateRawChannel(self.feid)
+                       if self.raw_channel:
+                               self.frontend = self.raw_channel.getFrontend()
+                               if self.frontend:

                                        return True
                                else:
                                        print "getFrontend failed"
                                        return True
                                else:
                                        print "getFrontend failed"


@@ -71,14 +95,11 @@ class Satfinder(ScanSetup):
                        print "getResourceManager instance failed"
                return False
 
                        print "getResourceManager instance failed"
                return False
 

-       def getFrontend(self):
-               return self.frontend
-

        def __init__(self, session, feid):
                self.initcomplete = False
                self.feid = feid
                self.oldref = None
        def __init__(self, session, feid):
                self.initcomplete = False
                self.feid = feid
                self.oldref = None

-               
+

                if not self.openFrontend():
                        self.oldref = session.nav.getCurrentlyPlayingServiceReference()
                        session.nav.stopService() # try to disable foreground service
                if not self.openFrontend():
                        self.oldref = session.nav.getCurrentlyPlayingServiceReference()
                        session.nav.stopService() # try to disable foreground service


@@ -88,45 +109,21 @@ class Satfinder(ScanSetup):
                                        del session.pip
                                        if not self.openFrontend():
                                                self.frontend = None # in normal case this should not happen
                                        del session.pip
                                        if not self.openFrontend():
                                                self.frontend = None # in normal case this should not happen

-                                               self.getFrontend = None

 
                ScanSetup.__init__(self, session)
                self.tuner = Tuner(self.frontend)
 
                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, frontendfkt = self.getFrontend)
-               self["agc_percentage"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, frontendfkt = self.getFrontend)
-               self["ber_value"] = TunerInfo(TunerInfo.BER_VALUE, frontendfkt = self.getFrontend)
-               self["snr_bar"] = TunerInfo(TunerInfo.SNR_BAR, frontendfkt = self.getFrontend)
-               self["agc_bar"] = TunerInfo(TunerInfo.AGC_BAR, frontendfkt = self.getFrontend)
-               self["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, frontendfkt = self.getFrontend)
-               self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, frontendfkt = self.getFrontend)
-

                self["introduction"].setText("")
                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.initcomplete = True

-               self.session = session
-               
-       def updateStatus(self):
-               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()
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.oldref)

 
        def createSetup(self):
                self.typeOfTuningEntry = None
                self.satEntry = None
 
        def createSetup(self):
                self.typeOfTuningEntry = None
                self.satEntry = None

-
+               

                self.list = []
                self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning_type)
                self.list.append(self.typeOfTuningEntry)
                self.list = []
                self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning_type)
                self.list.append(self.typeOfTuningEntry)


@@ -161,20 +158,23 @@ class Satfinder(ScanSetup):
                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)
                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)

+                               self.tune(returnvalue)

                        elif self.tuning_type.value == "predefined_transponder":
                        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.tune(returnvalue)
+                               tps = nimmanager.getTransponders(satpos)
+                               l = len(tps)
+                               if l > self.tuning_transponder.index:
+                                       transponder = nimmanager.getTransponders(satpos)[self.tuning_transponder.index]
+                                       returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
+                                       self.tune(returnvalue)

 
        def createConfig(self, foo):
 
        def createConfig(self, foo):

-

                self.tuning_transponder = None
                self.tuning_transponder = None

-               self.tuning_type = ConfigSelection(choices = [("manual_transponder", _("Manual transponder")), ("predefined_transponder", _("Predefined satellite"))])
-               self.tuning_sat = ConfigSatlist(default = 192, list = nimmanager.getSatListForNim(self.feid))
+               self.tuning_type = ConfigSelection(choices = [("manual_transponder", _("Manual transponder")), ("predefined_transponder", _("Predefined transponder"))])
+               self.tuning_sat = getConfigSatlist(192, nimmanager.getSatListForNim(self.feid))

                ScanSetup.createConfig(self, None)
                
                self.updateSats()
                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.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)


@@ -188,6 +188,7 @@ class Satfinder(ScanSetup):
                if orb_pos is not None:
                        transponderlist = nimmanager.getTransponders(orb_pos)
                        list = []
                if orb_pos is not None:
                        transponderlist = nimmanager.getTransponders(orb_pos)
                        list = []

+                       default = None

                        for x in transponderlist:
                                if x[3] == 0:
                                        pol = "H"
                        for x in transponderlist:
                                if x[3] == 0:
                                        pol = "H"


@@ -197,6 +198,8 @@ class Satfinder(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:


@@ -209,31 +212,49 @@ class Satfinder(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"

-                               list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
-                       self.tuning_transponder = ConfigSelection(choices = list)
+                               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)
                        self.tuning_transponder.addNotifier(self.retune, initial_call = False)

-       
+

        def keyGo(self):
                self.retune(self.tuning_type)
 
        def keyGo(self):
                self.retune(self.tuning_type)
 

-       def keyCancel(self):
-               if self.oldref:
+       def restartPrevService(self, yesno):
+               if yesno:

                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel

-                       self.session.nav.playService(self.oldref)
+               else:
+                       self.oldref = None

                self.close(None)
                self.close(None)

-               
+
+       def keyCancel(self):
+               if self.oldref:
+                       self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before satfinder?"), MessageBox.TYPE_YESNO)
+               else:
+                       self.restartPrevService(False)
+

        def tune(self, transponder):
                if self.initcomplete:
                        if transponder is not None:
                                self.tuner.tune(transponder)
 
        def tune(self, transponder):
                if self.initcomplete:
                        if transponder is not None:
                                self.tuner.tune(transponder)
 

-class NimSelection(Screen):
+class SatNimSelection(Screen):

        skin = """
                <screen position="140,165" size="400,100" title="select Slot">
                        <widget name="nimlist" position="20,10" size="360,75" />
        skin = """
                <screen position="140,165" size="400,100" title="select Slot">
                        <widget name="nimlist" position="20,10" size="360,75" />


@@ -242,11 +263,11 @@ 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:

-                       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"],
                self["nimlist"] = MenuList(nimMenuList)
 
                self["actions"] = ActionMap(["OkCancelActions"],


@@ -256,24 +277,30 @@ class NimSelection(Screen):
                }, -1)
 
        def okbuttonClick(self):
                }, -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):
 
 def SatfinderMain(session, **kwargs):

-       nimList = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+       nimList = nimmanager.getNimListOfType("DVB-S")

        if len(nimList) == 0:
        if len(nimList) == 0:

-               session.open(MessageBox, _("No positioner capable frontend found."), MessageBox.TYPE_ERROR)
+               session.open(MessageBox, _("No satellite frontend found!!"), MessageBox.TYPE_ERROR)

        else:
                if session.nav.RecordTimer.isRecording():
        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)
+                       session.open(MessageBox, _("A recording is currently running. Please stop the recording before trying to start the satfinder."), MessageBox.TYPE_ERROR)

                else:
                        if len(nimList) == 1:
                                session.open(Satfinder, nimList[0])
                else:
                        if len(nimList) == 1:
                                session.open(Satfinder, nimList[0])

-                       elif len(nimList) > 1:
-                               session.open(NimSelection)

                        else:
                        else:

-                               session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
+                               session.open(SatNimSelection)

 
 

+def SatfinderStart(menuid, **kwargs):
+       if menuid == "scan":
+               return [(_("Satfinder"), SatfinderMain, "satfinder", None)]
+       else:
+               return []

 
 def Plugins(**kwargs):
 
 def Plugins(**kwargs):

-       return PluginDescriptor(name="Satfinder", description="Helps setting up your dish", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=SatfinderMain)
+       if (nimmanager.hasNimType("DVB-S")):
+               return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_MENU, fnc=SatfinderStart)
+       else:
+               return []