X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3e76780009c5934db28c37aae9c32d0bc5a495e2..ca4309210fb3d5d3f7e2bd4a7a59c3fb86919977:/lib/python/Screens/Satconfig.py diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 1e788707..b8f0d902 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -1,4 +1,5 @@ from Screen import Screen +from Components.ActionMap import NumberActionMap from Components.ActionMap import ActionMap from Components.ConfigList import ConfigList from Components.config import * @@ -7,47 +8,74 @@ from Components.NimManager import nimmanager from Components.config import getConfigListEntry class NimSetup(Screen): - def createSimpleSetup(self, nim, list, mode): - + def createSimpleSetup(self, list, mode): if mode == 0: #single Sat - list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA)) + list.append(getConfigListEntry(_("Satellite"), self.nimConfig.diseqcA)) else: # > 1 Sats - list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA)) - + list.append(getConfigListEntry(_("Port A"), self.nimConfig.diseqcA)) + if mode >= 1: # > 1 Sats - list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB)) + list.append(getConfigListEntry(_("Port B"), self.nimConfig.diseqcB)) if mode >= 3: # > 2 Sats - list.append(getConfigListEntry("Port C", config.Nims[nim.slotid].diseqcC)) - list.append(getConfigListEntry("Port D", config.Nims[nim.slotid].diseqcD)) - def createPositionerSetup(self, nim, list): - list.append(getConfigListEntry("Longitude", config.Nims[nim.slotid].longitude)) - list.append(getConfigListEntry("Latitude", config.Nims[nim.slotid].latitude)) - pass - + list.append(getConfigListEntry(_("Port C"), self.nimConfig.diseqcC)) + list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD)) + + def createPositionerSetup(self, list): + list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode)) + if (currentConfigSelectionElement(self.nimConfig.positionerMode) == "usals"): # USALS + list.append(getConfigListEntry(_("Longitude"), self.nimConfig.longitude)) + list.append(getConfigListEntry(" ", self.nimConfig.longitudeOrientation)) + list.append(getConfigListEntry(_("Latitude"), self.nimConfig.latitude)) + list.append(getConfigListEntry(" ", self.nimConfig.latitudeOrientation)) + elif (currentConfigSelectionElement(self.nimConfig.positionerMode) == "manual"): # manual + pass + def createSetup(self): + print "Creating setup" self.list = [ ] - - self.list.append(getConfigListEntry("Configmode", config.Nims[self.nim.slotid].configMode)) - - if config.Nims[self.nim.slotid].configMode.value == 0: #simple setup - self.list.append(getConfigListEntry("Diseqcmode", config.Nims[self.nim.slotid].diseqcMode)) - - if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4): - self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value) - if (config.Nims[self.nim.slotid].diseqcMode.value == 4): - self.createPositionerSetup(self.nim, self.list) - else: - print "FIXME: implement advanced mode" + + self.configMode = None + self.diseqcModeEntry = None + self.advancedSatsEntry = None + self.advancedLnbsEntry = None + self.advancedDiseqcMode = None + self.advancedUsalsEntry = None + self.advancedLof = None + self.advancedPowerMeasurement = None + + if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]): + self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) + self.list.append(self.configMode) + + if currentConfigSelectionElement(self.nimConfig.configMode) == "simple": #simple setup + self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), self.nimConfig.diseqcMode) + self.list.append(self.diseqcModeEntry) + if (0 <= self.nimConfig.diseqcMode.value < 4): + self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value) + if (self.nimConfig.diseqcMode.value == 4): + self.createPositionerSetup(self.list) + elif currentConfigSelectionElement(self.nimConfig.configMode) in ["loopthrough", "satposdepends", "nothing", "equal"]: + pass + elif currentConfigSelectionElement(self.nimConfig.configMode) == "advanced": # advanced + # SATs + self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats) + self.list.append(self.advancedSatsEntry) + currSat = self.nimConfig.advanced.sat[nimmanager.satList[self.nimConfig.advanced.sats.value][1]] + self.fillListWithAdvancedSatEntrys(currSat) + elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]): + self.list.append(getConfigListEntry(_("Cable provider"), self.nimConfig.cable)) + elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-T"]): + self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial)) self["config"].list = self.list self["config"].l.setList(self.list) - - def newConfig(self): - if self["config"].getCurrent()[0] == "Diseqcmode": - self.createSetup() - if self["config"].getCurrent()[0] == "Configmode": - self.createSetup() - + + def newConfig(self): + checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, self.advancedLof, self.advancedPowerMeasurement) + for x in checkList: + if self["config"].getCurrent() == x: + self.createSetup() + def keyLeft(self): self["config"].handleKey(config.key["prevElement"]) self.newConfig() @@ -56,9 +84,77 @@ class NimSetup(Screen): self["config"].handleKey(config.key["nextElement"]) self.newConfig() - def keySave(self): + def keyNumberGlobal(self, number): + print "You pressed number " + str(number) + if (self["config"].getCurrent()[1].parent.enabled == True): + self["config"].handleKey(config.key[str(number)]) + + def run(self): for x in self["config"].list: x[1].save() + nimmanager.sec.update() + + def fillListWithAdvancedSatEntrys(self, Sat): + currLnb = self.nimConfig.advanced.lnb[Sat.lnb.value] + + self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage)) + self.list.append(getConfigListEntry(_("Tone mode"), Sat.tonemode)) + if (currLnb != 0 and currentConfigSelectionElement(currLnb.diseqcMode) == "1_2"): + self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals) + self.list.append(self.advancedUsalsEntry) + if (currentConfigSelectionElement(Sat.usals) == "no"): + self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition)) + + # LNBs + self.advancedLnbsEntry = getConfigListEntry(_("LNB"), Sat.lnb) + self.list.append(self.advancedLnbsEntry) + if currLnb != 0: + self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode) + self.list.append(self.advancedDiseqcMode) + if currentConfigSelectionElement(currLnb.diseqcMode) != "none": + self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst)) + self.list.append(getConfigListEntry(_("Committed DiSEqC command"), currLnb.commitedDiseqcCommand)) + self.list.append(getConfigListEntry(_("Fast DiSEqC"), currLnb.fastDiseqc)) + self.list.append(getConfigListEntry(_("Sequence repeat"), currLnb.sequenceRepeat)) + if currentConfigSelectionElement(currLnb.diseqcMode) == "1_0": + self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0)) + else: + self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder)) + self.list.append(getConfigListEntry(_("Uncommitted DiSEqC command"), currLnb.uncommittedDiseqcCommand)) + self.list.append(getConfigListEntry(_("DiSEqC repeats"), currLnb.diseqcRepeats)) + if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2": + self.list.append(getConfigListEntry(_("Longitude"), currLnb.longitude)) + self.list.append(getConfigListEntry(" ", currLnb.longitudeOrientation)) + self.list.append(getConfigListEntry(_("Latitude"), currLnb.latitude)) + self.list.append(getConfigListEntry(" ", currLnb.latitudeOrientation)) + self.advancedPowerMeasurement = getConfigListEntry("Use Power Measurement", currLnb.powerMeasurement) + self.list.append(self.advancedPowerMeasurement) + if currentConfigSelectionElement(currLnb.powerMeasurement) == "yes": + self.list.append(getConfigListEntry("Power Threshold in mA", currLnb.powerThreshold)) + self.advancedLof = getConfigListEntry(_("LOF"), currLnb.lof) + self.list.append(self.advancedLof) + if currentConfigSelectionElement(currLnb.lof) == "user_defined": + self.list.append(getConfigListEntry(_("LOF/L"), currLnb.lofl)) + self.list.append(getConfigListEntry(_("LOF/H"), currLnb.lofh)) + self.list.append(getConfigListEntry(_("Threshold"), currLnb.threshold)) + self.list.append(getConfigListEntry(_("12V Output"), currLnb.output_12v)) + self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage)) + + def fillAdvancedList(self): + self.list = [ ] + self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) + self.list.append(self.configMode) + self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats) + self.list.append(self.advancedSatsEntry) + for x in nimmanager.satList: + Sat = self.nimConfig.advanced.sat[x[1]] + self.fillListWithAdvancedSatEntrys(Sat) + self["config"].list = self.list + + def keySave(self): + if currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "advanced": + self.fillAdvancedList() + self.run() self.close() def keyCancel(self): @@ -66,21 +162,31 @@ class NimSetup(Screen): x[1].cancel() self.close() - def __init__(self, session, nim): + def __init__(self, session, slotid): Screen.__init__(self, session) - self.nim = nim - self["actions"] = ActionMap(["SetupActions"], + self["actions"] = NumberActionMap(["SetupActions"], { "ok": self.keySave, "cancel": self.keyCancel, "left": self.keyLeft, - "right": self.keyRight + "right": self.keyRight, + "1": self.keyNumberGlobal, + "2": self.keyNumberGlobal, + "3": self.keyNumberGlobal, + "4": self.keyNumberGlobal, + "5": self.keyNumberGlobal, + "6": self.keyNumberGlobal, + "7": self.keyNumberGlobal, + "8": self.keyNumberGlobal, + "9": self.keyNumberGlobal, + "0": self.keyNumberGlobal }, -1) + self.nim = nimmanager.nimList()[slotid][1] + self.nimConfig = config.Nims[self.nim.slotid] self.list = [ ] self["config"] = ConfigList(self.list) - self.createSetup() class NimSelection(Screen): @@ -98,5 +204,5 @@ class NimSelection(Screen): def okbuttonClick(self): selection = self["nimlist"].getCurrent() if selection[1].nimType != -1: #unknown/empty - self.session.open(NimSetup, selection[1]) - \ No newline at end of file + self.session.open(NimSetup, selection[1].slotid) +