more codecleanup
[enigma2.git] / lib / python / Plugins / SystemPlugins / PositionerSetup / plugin.py
index ca7ea9d27325b381b2f746d4a2def37682207d78..19076bad8a61c5671c683da9f7fcf564132b2a69 100644 (file)
@@ -1,48 +1,99 @@
-from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager, eDVBDiseqcCommand, eDVBResourceManagerPtr, iDVBChannelPtr, iDVBFrontendPtr, iDVBFrontend
+from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager, \
+       eDVBDiseqcCommand, eDVBFrontendParametersSatellite, eDVBFrontendParameters,\
+       iDVBFrontend
+
 from Screens.Screen import Screen
 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 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.MenuList import MenuList
+from Components.config import ConfigSatlist, ConfigNothing, ConfigSelection, ConfigSubsection, KEY_LEFT, KEY_RIGHT, getConfigListEntry
+from Components.TuneTest import Tuner
+
+from time import sleep
 
 class PositionerSetup(Screen):
        skin = """
                <screen position="100,100" size="560,400" title="Positioner setup..." >
 
 class PositionerSetup(Screen):
        skin = """
                <screen position="100,100" size="560,400" title="Positioner setup..." >
-                       <widget name="list" position="100,0" size="350,120" />
+                       <widget name="list" position="100,0" size="350,155" />
 
 
-                       <widget name="red" position="0,120" size="140,80" backgroundColor="red" halign="center" valign="center" font="Regular;21" />
-                       <widget name="green" position="140,120" size="140,80" backgroundColor="green" halign="center" valign="center" font="Regular;21" />
-                       <widget name="yellow" position="280,120" size="140,80" backgroundColor="yellow" halign="center" valign="center" font="Regular;21" />
-                       <widget name="blue" position="420,120" size="140,80" backgroundColor="blue" halign="center" valign="center" font="Regular;21" />
-                       
-                       <widget name="snr" text="SNR:" position="0,220" size="60,22" font="Regular;21" />
-                       <widget name="agc" text="AGC:" position="0,245" size="60,22" font="Regular;21" />
-                       <widget name="ber" text="BER:" position="0,270" size="60,22" font="Regular;21" />
-                       <widget name="lock" text="Lock:" position="0,295" size="60,22" font="Regular;21" />
-                       <widget name="snr_percentage" position="220,220" size="60,22" font="Regular;21" />
-                       <widget name="agc_percentage" position="220,245" size="60,22" font="Regular;21" />
-                       <widget name="ber_value" position="220,270" size="60,22" font="Regular;21" />
-                       <widget name="lock_state" position="60,295" size="150,22" font="Regular;21" />
-                       <widget name="snr_bar" position="60,220" size="150,22" />
-                       <widget name="agc_bar" position="60,245" size="150,22" />
-                       <widget name="ber_bar" position="60,270" size="150,22" />
+                       <widget name="red" position="0,155" size="140,80" backgroundColor="red" halign="center" valign="center" font="Regular;21" />
+                       <widget name="green" position="140,155" size="140,80" backgroundColor="green" halign="center" valign="center" font="Regular;21" />
+                       <widget name="yellow" position="280,155" size="140,80" backgroundColor="yellow" halign="center" valign="center" font="Regular;21" />
+                       <widget name="blue" position="420,155" size="140,80" backgroundColor="blue" halign="center" valign="center" font="Regular;21" />
+
+                       <widget name="snr_db" position="60,245" size="150,22" halign="center" valign="center" font="Regular;21" />
+                       <eLabel text="SNR:" position="0,270" size="60,22" font="Regular;21" />
+                       <eLabel text="BER:" position="0,295" size="60,22" font="Regular;21" />
+                       <eLabel text="Lock:" position="0,320" size="60,22" font="Regular;21" />
+                       <widget name="snr_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,270" size="150,22" />
+                       <widget name="ber_bar" position="60,295" size="150,22" />
+
+                       <eLabel text="Frequency:" position="300,245" size="120,22" font="Regular;21" />
+                       <eLabel text="Symbolrate:" position="300,270" size="120,22" font="Regular;21" />
+                       <eLabel text="FEC:" position="300,295" size="120,22" font="Regular;21" />
+                       <widget name="frequency_value" position="420,245" size="120,22" font="Regular;21" />
+                       <widget name="symbolrate_value" position="420,270" size="120,22" font="Regular;21" />
+                       <widget name="fec_value" position="420,295" size="120,22" font="Regular;21" />
                </screen>"""
                </screen>"""
-       def __init__(self, session):
+       def __init__(self, session, feid):
                self.skin = PositionerSetup.skin
                Screen.__init__(self, session)
                self.skin = PositionerSetup.skin
                Screen.__init__(self, session)
+               self.feid = feid
+               self.oldref = None
+
+               cur = { }
+               if not self.openFrontend():
+                       self.oldref = session.nav.getCurrentlyPlayingServiceReference()
+                       service = session.nav.getCurrentService()
+                       feInfo = service and service.frontendInfo()
+                       if feInfo:
+                               cur = feInfo.getTransponderData(True)
+                       del feInfo
+                       del service
+                       session.nav.stopService() # try to disable foreground service
+                       if not self.openFrontend():
+                               if session.pipshown: # try to disable pip
+                                       service = self.session.pip.pipservice
+                                       feInfo = service and service.frontendInfo()
+                                       if feInfo:
+                                               cur = feInfo.getTransponderData()
+                                       del feInfo
+                                       del service
+                                       session.pipshown = False
+                                       del session.pip
+                                       if not self.openFrontend():
+                                               self.frontend = None # in normal case this should not happen
                
                
-               self.session.nav.stopService()
-               
-               self.diseqc = Diseqc()
-               
-               #self.session.nav.stopService()
-               
+               self.frontendStatus = { }
+               self.diseqc = Diseqc(self.frontend)
+               self.tuner = Tuner(self.frontend)
+
+               tp = ( cur.get("frequency", 0) / 1000,
+                       cur.get("symbol_rate", 0) / 1000,
+                       cur.get("polarization", eDVBFrontendParametersSatellite.Polarisation_Horizontal),
+                       cur.get("fec_inner", eDVBFrontendParametersSatellite.FEC_Auto),
+                       cur.get("inversion", eDVBFrontendParametersSatellite.Inversion_Unknown),
+                       cur.get("orbital_position", 0),
+                       cur.get("system", eDVBFrontendParametersSatellite.System_DVB_S),
+                       cur.get("modulation", eDVBFrontendParametersSatellite.Modulation_QPSK),
+                       cur.get("rolloff", eDVBFrontendParametersSatellite.RollOff_alpha_0_35),
+                       cur.get("pilot", eDVBFrontendParametersSatellite.Pilot_Unknown))
+
+               self.tuner.tune(tp)
                self.createConfig()
                
                self.isMoving = False
                self.createConfig()
                
                self.isMoving = False
+               self.stopOnLock = False
                
                self.red = Label("")
                self["red"] = self.red
                
                self.red = Label("")
                self["red"] = self.red
@@ -52,29 +103,26 @@ class PositionerSetup(Screen):
                self["yellow"] = self.yellow
                self.blue = Label("")
                self["blue"] = self.blue
                self["yellow"] = self.yellow
                self.blue = Label("")
                self["blue"] = self.blue
-               
-               self.feid = 0
 
                self.list = []
                self["list"] = ConfigList(self.list)
                self.createSetup()
 
                self.list = []
                self["list"] = ConfigList(self.list)
                self.createSetup()
-               
-               self["snr"] = Label()
-               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_db"] = TunerInfo(TunerInfo.SNR_DB, statusDict = self.frontendStatus)
+               self["snr_percentage"] = TunerInfo(TunerInfo.SNR_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["ber_bar"] = TunerInfo(TunerInfo.BER_BAR, statusDict = self.frontendStatus)
+               self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, statusDict = self.frontendStatus)
+
+               self["frequency_value"] = Label("")
+               self["symbolrate_value"] = Label("")
+               self["fec_value"] = Label("")
                
                self["actions"] = ActionMap(["DirectionActions", "OkCancelActions", "ColorActions"],
                {
                        "ok": self.go,
                
                self["actions"] = ActionMap(["DirectionActions", "OkCancelActions", "ColorActions"],
                {
                        "ok": self.go,
-                       "cancel": self.close,
+                       "cancel": self.keyCancel,
                        "up": self.up,
                        "down": self.down,
                        "left": self.left,
                        "up": self.up,
                        "down": self.down,
                        "left": self.left,
@@ -88,51 +136,90 @@ class PositionerSetup(Screen):
                self.updateColors("tune")
                
                self.statusTimer = eTimer()
                self.updateColors("tune")
                
                self.statusTimer = eTimer()
-               self.statusTimer.timeout.get().append(self.updateStatus)
-               self.statusTimer.start(200, False)
-               
+               self.statusTimer.callback.append(self.updateStatus)
+               self.statusTimer.start(50, True)
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.oldref)
+
+       def restartPrevService(self, yesno):
+               if yesno:
+                       if self.frontend:
+                               self.frontend = None
+                               del self.raw_channel
+               else:
+                       self.oldref=None
+               self.close(None)        
+
+       def keyCancel(self):
+               if self.oldref:
+                       self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO)
+               else:
+                       self.restartPrevService(False)
+
+       def openFrontend(self):
+               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"
+                       else:
+                               print "getRawChannel failed"
+               else:
+                       print "getResourceManager instance failed"
+               return False
+
        def createConfig(self):
        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 = []
                storepos = []
-               for x in range(255):
+               for x in range(1,255):
                        storepos.append(str(x))
                        storepos.append(str(x))
-               config.positioner.storage = configElement_nonSave("storage", configSelection, 0, storepos)
-       
+               self.positioner_storage = ConfigSelection(choices = storepos)
+
        def createSetup(self):
        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)
                self["list"].l.setList(self.list)
-               
+
        def go(self):
                pass
        def go(self):
                pass
-       
+
        def getCurrentConfigPath(self):
        def getCurrentConfigPath(self):
-               return self["list"].getCurrent()[1].parent.configPath
-       
+               return self["list"].getCurrent()[2]
+
        def up(self):
        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):
        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):
        def left(self):
-               self["list"].handleKey(config.key["prevElement"])
-       
+               self["list"].handleKey(KEY_LEFT)
+
        def right(self):
        def right(self):
-               self["list"].handleKey(config.key["nextElement"])
-       
+               self["list"].handleKey(KEY_RIGHT)
+
        def updateColors(self, entry):
                if entry == "tune":
        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":
                        self.yellow.setText("")
                        self.blue.setText("")
                elif entry == "move":
@@ -143,102 +230,151 @@ class PositionerSetup(Screen):
                                self.blue.setText(_("Stop"))
                        else:
                                self.red.setText(_("Move west"))
                                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"))
                                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"))
                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 == "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("")
                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:
        def redKey(self):
                entry = self.getCurrentConfigPath()
                if entry == "move":
                        if self.isMoving:
-                               self.diseqc.command("stop")
+                               self.diseqccommand("stop")
                                self.isMoving = False
                                self.isMoving = False
+                               self.stopOnLock = False
                        else:
                        else:
-                               self.diseqc.command("moveWest", 0)
+                               self.diseqccommand("moveWest", 0)
                                self.isMoving = True
                        self.updateColors("move")
                                self.isMoving = True
                        self.updateColors("move")
-                       print "moving west"
                elif entry == "limits":
                elif entry == "limits":
-                       self.diseqc.command("limitOff")
-                               
+                       self.diseqccommand("limitOff")
+               elif entry == "tune":
+                       fe_data = { }
+                       self.frontend.getFrontendData(fe_data)
+                       self.frontend.getTransponderData(fe_data, True)
+                       feparm = self.tuner.lastparm.getDVBS()
+                       fe_data["orbital_position"] = feparm.orbital_position
+                       self.session.openWithCallback(self.tune, TunerScreen, self.feid, fe_data)
+               elif entry == "goto0":
+                       print "move to position 0"
+                       self.diseqccommand("moveTo", 0)
+
        def greenKey(self):
                entry = self.getCurrentConfigPath()
                if entry == "move":
        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"
                        print "stepping west"
-                       self.diseqc.command("moveWest", 1)
+                       self.diseqccommand("moveWest", 0xFF) # one step
                elif entry == "storage":
                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", int(self.positioner_storage.value)
+                       self.diseqccommand("store", int(self.positioner_storage.value))
+                       
                elif entry == "limits":
                elif entry == "limits":
-                       self.diseqc.command("limitWest")
-       
+                       self.diseqccommand("limitWest")
+
        def yellowKey(self):
                entry = self.getCurrentConfigPath()
                if entry == "move":
        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"
                        print "stepping east"
-                       self.diseqc.command("moveEast", 1)
+                       self.diseqccommand("moveEast", 0xFF) # one step
                elif entry == "storage":
                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", int(self.positioner_storage.value)
+                       self.diseqccommand("moveTo", int(self.positioner_storage.value))
                elif entry == "limits":
                elif entry == "limits":
-                       self.diseqc.command("limitEast")
-#      
+                       self.diseqccommand("limitEast")
+
        def blueKey(self):
                entry = self.getCurrentConfigPath()
                if entry == "move":
                        if self.isMoving:
        def blueKey(self):
                entry = self.getCurrentConfigPath()
                if entry == "move":
                        if self.isMoving:
-                               self.diseqc.command("stop")
+                               self.diseqccommand("stop")
                                self.isMoving = False
                                self.isMoving = False
+                               self.stopOnLock = False
                        else:
                        else:
-                               self.diseqc.command("moveEast", 0)
+                               self.diseqccommand("moveEast", 0)
                                self.isMoving = True
                        self.updateColors("move")
                        print "moving east"
                                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):
 
        def updateStatus(self):
+               if self.frontend:
+                       self.frontend.getFrontendStatus(self.frontendStatus)
+               self["snr_db"].update()
                self["snr_percentage"].update()
                self["snr_percentage"].update()
-               self["agc_percentage"].update()
                self["ber_value"].update()
                self["snr_bar"].update()
                self["ber_value"].update()
                self["snr_bar"].update()
-               self["agc_bar"].update()
                self["ber_bar"].update()
                self["ber_bar"].update()
+               self["lock_state"].update()
+               transponderdata = self.tuner.getTransponderData()
+               self["frequency_value"].setText(str(transponderdata.get("frequency")))
+               self["symbolrate_value"].setText(str(transponderdata.get("symbol_rate")))
+               self["fec_value"].setText(str(transponderdata.get("fec_inner")))
+               if self.frontendStatus.get("tuner_locked", 0) == 1 and self.isMoving and self.stopOnLock:
+                       self.diseqccommand("stop")
+                       self.isMoving = False
+                       self.stopOnLock = False
+                       self.updateColors(self.getCurrentConfigPath())
+               self.statusTimer.start(50, True)
+
+       def tune(self, transponder):
+               if transponder is not None:
+                       self.tuner.tune(transponder)
 
 class Diseqc:
 
 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.frontend = iDVBFrontendPtr()
-                               if raw_channel.getFrontend(self.frontend) == 0:
-                                       self.frontend.setVoltage(iDVBFrontend.voltage13)
-                                       self.ready = True
-                               else:
-                                       print "getFrontend failed"
-                       else:
-                               print "getRawChannel failed"
-               else:
-                               print "getResourceManager instance failed"
-               
+       def __init__(self, frontend):
+               self.frontend = frontend
+
        def command(self, what, param = 0):
        def command(self, what, param = 0):
-               if self.ready:
+               if self.frontend:
                        cmd = eDVBDiseqcCommand()
                        if what == "moveWest":
                                string = 'e03169' + ("%02x" % param)
                        cmd = eDVBDiseqcCommand()
                        if what == "moveWest":
                                string = 'e03169' + ("%02x" % param)
@@ -248,6 +384,8 @@ class Diseqc:
                                string = 'e0316b' + ("%02x" % param)
                        elif what == "store":
                                string = 'e0316a' + ("%02x" % param)
                                string = 'e0316b' + ("%02x" % param)
                        elif what == "store":
                                string = 'e0316a' + ("%02x" % param)
+                       elif what == "limitOn":
+                               string = 'e0316a00'
                        elif what == "limitOff":
                                string = 'e03163'
                        elif what == "limitEast":
                        elif what == "limitOff":
                                string = 'e03163'
                        elif what == "limitEast":
@@ -256,14 +394,219 @@ class Diseqc:
                                string = 'e03167'
                        else:
                                string = 'e03160' #positioner stop
                                string = 'e03167'
                        else:
                                string = 'e03160' #positioner stop
+                       
                        print "diseqc command:",
                        print string
                        print "diseqc command:",
                        print string
-                       
                        cmd.setCommandString(string)
                        cmd.setCommandString(string)
+                       self.frontend.setTone(iDVBFrontend.toneOff)
+                       sleep(0.015) # wait 15msec after disable tone
                        self.frontend.sendDiseqc(cmd)
                        self.frontend.sendDiseqc(cmd)
-                                       
+                       if string == 'e03160': #positioner stop
+                               sleep(0.05)
+                               self.frontend.sendDiseqc(cmd) # send 2nd time
+
+tuning = None
+
+class TunerScreen(ScanSetup):
+       skin = """
+               <screen position="90,100" size="520,400" title="Tune">
+                       <widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
+                       <widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
+               </screen>"""
+
+       def __init__(self, session, feid, fe_data):
+               self.feid = feid
+               self.fe_data = fe_data
+               ScanSetup.__init__(self, session)
+               self["introduction"].setText("")
+
+       def createSetup(self):
+               self.typeOfTuningEntry = None
+               self.satEntry = None
+               self.list = []
+               self.typeOfTuningEntry = getConfigListEntry(_('Tune'), tuning.type)
+               self.list.append(self.typeOfTuningEntry)
+               self.satEntry = getConfigListEntry(_('Satellite'), tuning.sat)
+               self.list.append(self.satEntry)
+               nim = nimmanager.nim_slots[self.feid]
+               self.systemEntry = None
+               
+               if 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))
+                       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 tuning.type.value == "predefined_transponder":
+                       self.list.append(getConfigListEntry(_("Transponder"), tuning.transponder))
+               self["config"].list = self.list
+               self["config"].l.setList(self.list)
+
+       def newConfig(self):
+               if self["config"].getCurrent() in (self.typeOfTuningEntry, self.satEntry, self.systemEntry):
+                       self.createSetup()
+
+       def createConfig(self, foo):
+               global tuning
+               if not 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()
+               orb_pos = self.fe_data.get("orbital_position", None)
+               if orb_pos is not None:
+                       for x in nimmanager.getRotorSatListForNim(self.feid):
+                               opos = str(orb_pos)
+                               if x[0] == orb_pos and tuning.sat.value != opos:
+                                       tuning.sat.value = opos
+                       del self.fe_data["orbital_position"]
+               ScanSetup.createConfig(self, self.fe_data)
+
+       def tuningSatChanged(self, *parm):
+               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"
+                               elif x[3] == 1:
+                                       pol = "V"
+                               elif x[3] == 2:
+                                       pol = "CL"
+                               elif x[3] == 3:
+                                       pol = "CR"
+                               else:
+                                       pol = "??"
+                               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] == 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"
+                               else:
+                                       fec = "FEC_Unknown"
+                               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, 0, 0, 0)
+               satpos = int(tuning.sat.value)
+               if 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)
+               elif tuning.type.value == "predefined_transponder":
+                       transponder = nimmanager.getTransponders(satpos)[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.close(returnvalue)
+
+       def keyCancel(self):
+               self.close(None)
+
+class RotorNimSelection(Screen):
+       skin = """
+               <screen position="140,165" size="400,130" title="select Slot">
+                       <widget name="nimlist" position="20,10" size="360,100" />
+               </screen>"""
+
+       def __init__(self, session):
+               Screen.__init__(self, session)
+
+               nimlist = nimmanager.getNimListOfType("DVB-S")
+               nimMenuList = []
+               for x in nimlist:
+                       nimMenuList.append((nimmanager.nim_slots[x].friendly_full_description, 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):
 def PositionerMain(session, **kwargs):
-       session.open(PositionerSetup)
+       nimList = nimmanager.getNimListOfType("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(RotorNimSelection)
+                       else:
+                               session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
+
+def PositionerSetupStart(menuid, **kwargs):
+       if menuid == "scan":
+               return [(_("Positioner setup"), PositionerMain, "positioner_setup", None)]
+       else:
+               return []
 
 def Plugins(**kwargs):
 
 def Plugins(**kwargs):
-       return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain)
+       if (nimmanager.hasNimType("DVB-S")):
+               return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_MENU, fnc=PositionerSetupStart)
+       else:
+               return []