from Components.TunerInfo import TunerInfo
from Components.ActionMap import ActionMap
from Components.NimManager import nimmanager
+from Components.MenuList import MenuList
from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist
class PositionerSetup(Screen):
self.diseqc = Diseqc(self.feid)
self.tuner = Tuner(self.diseqc.getFrontend())
+ self.tuner.tune((0,0,0,0,0,0,0,0,0))
#self.session.nav.stopService()
self.statusTimer = eTimer()
self.statusTimer.timeout.get().append(self.updateStatus)
- self.statusTimer.start(100, False)
+ self.statusTimer.start(50, False)
def createConfig(self):
config.positioner = ConfigSubsection()
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")
elif entry == "limits":
- self.diseqc.command("limitOff")
+ self.diseqccommand("limitOff")
elif entry == "tune":
self.session.openWithCallback(self.tune, TunerScreen, self.feid)
entry = self.getCurrentConfigPath()
if entry == "move":
if self.isMoving:
- self.diseqc.command("stop")
+ self.diseqccommand("stop")
self.isMoving = False
self.stopOnLock = False
else:
self.isMoving = True
self.stopOnLock = True
- self.diseqc.command("moveWest", 0)
+ 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.diseqc.command("stop")
+ self.diseqccommand("stop")
self.isMoving = False
self.stopOnLock = False
else:
self.isMoving = True
self.stopOnLock = True
- self.diseqc.command("moveEast", 0)
+ 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()
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.diseqc.command("stop")
+ self.diseqccommand("stop")
self.isMoving = False
self.stopOnLock = False
self.updateColors(self.getCurrentConfigPath())
parm.polarisation = transponder[2]
parm.fec = transponder[3]
parm.inversion = transponder[4]
- parm.orbital_position = 192
+ parm.orbital_position = transponder[5]
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)
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))
+
+ config.tuning.sat = configElement_nonSave("config.tuning.sat", configSatlist, 192, nimmanager.getRotorSatListForNim(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)
+ satnum = config.tuning.sat.value
+ satlist = config.tuning.sat.vals
+ if len(satlist):
+ transponderlist = nimmanager.getTransponders(satlist[satnum][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)
+ returnvalue = (0, 0, 0, 0, 0, 0, 0)
+ satpos = config.tuning.sat.vals[config.tuning.sat.value][1]
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)
+ 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, satpos)
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])
+ returnvalue = (int(transponder[1] / 100), int(transponder[2] / 1000), transponder[3], transponder[4], 2, config.tuning.sat.vals[config.tuning.sat.value][1], satpos)
self.close(returnvalue)
def keyCancel(self):
def __init__(self, session):
Screen.__init__(self, session)
- self["nimlist"] = MenuList(nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"]))
+ nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+ nimMenuList = []
+ for x in nimlist:
+ nimMenuList.append((_("NIM ") + (["A", "B", "C", "D"][x]) + ": " + nimmanager.getNimName(x) + " (" + nimmanager.getNimTypeName(x) + ")", x))
+
+ self["nimlist"] = MenuList(nimMenuList)
self["actions"] = ActionMap(["OkCancelActions"],
{
def okbuttonClick(self):
selection = self["nimlist"].getCurrent()
- self.session.open(PositionerSetup, selection[1].slotid)
+ self.session.open(PositionerSetup, selection[1])
def PositionerMain(session, **kwargs):
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)
-
+ usableNims = []
+ for x in nimList:
+ configured_rotor_sats = nimmanager.getRotorSatListForNim(x)
+ if len(configured_rotor_sats) != 0:
+ usableNims.append(x)
+ if len(usableNims) == 1:
+ session.open(PositionerSetup, usableNims[0])
+ elif len(usableNims) > 1:
+ session.open(NimSelection)
+ else:
+ session.open(MessageBox, _("No tuner is configured for use with a diseqc rotor!"), MessageBox.TYPE_ERROR)
def Plugins(**kwargs):
return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain)
git.cweiske.de / enigma2.git / blobdiff