X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9982cd52929f624aaeafcc050fa4f94bf4f53f4e..86fda4cfacce19566a0557375960d507e720afb6:/lib/python/Screens/Satconfig.py diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index de04dc45..7d449658 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -1,9 +1,12 @@ +from enigma import eDVBDB from Screen import Screen +from Components.SystemInfo import SystemInfo from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.NimManager import nimmanager -from Components.config import getConfigListEntry, config, ConfigNothing +from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement +from Screens.MessageBox import MessageBox from time import mktime, localtime from datetime import datetime @@ -22,23 +25,43 @@ class NimSetup(Screen, ConfigListScreen): list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD)) def createPositionerSetup(self, list): -# list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode)) -# if self.nimConfig.positionerMode.value == "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)) - self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), self.nimConfig.turningSpeed) - self.list.append(self.turningSpeed) - if self.nimConfig.turningSpeed.value == "fast epoch": - self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), self.nimConfig.fastTurningBegin) - self.turnFastEpochEnd = getConfigListEntry(_("End time"), self.nimConfig.fastTurningEnd) - self.list.append(self.turnFastEpochBegin) - self.list.append(self.turnFastEpochEnd) - -# elif self.nimConfig.positionerMode.value == "manual": # manual -# pass - + nim = self.nimConfig + list.append(getConfigListEntry(_("Longitude"), nim.longitude)) + list.append(getConfigListEntry(" ", nim.longitudeOrientation)) + list.append(getConfigListEntry(_("Latitude"), nim.latitude)) + list.append(getConfigListEntry(" ", nim.latitudeOrientation)) + if SystemInfo["CanMeasureFrontendInputPower"]: + self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), nim.powerMeasurement) + list.append(self.advancedPowerMeasurement) + if nim.powerMeasurement.value: + list.append(getConfigListEntry(_("Power threshold in mA"), nim.powerThreshold)) + self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), nim.turningSpeed) + list.append(self.turningSpeed) + if nim.turningSpeed.value == "fast epoch": + self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), nim.fastTurningBegin) + self.turnFastEpochEnd = getConfigListEntry(_("End time"), nim.fastTurningEnd) + list.append(self.turnFastEpochBegin) + list.append(self.turnFastEpochEnd) + else: + if nim.powerMeasurement.value: + nim.powerMeasurement.value = False + nim.powerMeasurement.save() + + def createConfigMode(self): + choices = { "nothing": _("nothing connected"), + "simple": _("simple"), + "advanced": _("advanced")} + #if len(nimmanager.getNimListOfType(nimmanager.getNimType(self.slotid), exception = x)) > 0: + # choices["equal"] = _("equal to") + # choices["satposdepends"] = _("second cable of motorized LNB") + if len(nimmanager.canEqualTo(self.slotid)) > 0: + choices["equal"] = _("equal to") + if len(nimmanager.canDependOn(self.slotid)) > 0: + choices["satposdepends"] = _("second cable of motorized LNB") + if len(nimmanager.canConnectTo(self.slotid)) > 0: + choices["loopthrough"] = _("loopthrough to") + self.nimConfig.configMode.setChoices(choices) + def createSetup(self): print "Creating setup" self.list = [ ] @@ -54,8 +77,9 @@ class NimSetup(Screen, ConfigListScreen): self.turningSpeed = None self.turnFastEpochBegin = None self.turnFastEpochEnd = None - + self.uncommittedDiseqcCommand = None self.cableScanType = None + self.have_advanced = False if self.nim.isCompatible("DVB-S"): self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) @@ -68,7 +92,34 @@ class NimSetup(Screen, ConfigListScreen): self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value) if self.nimConfig.diseqcMode.value == "positioner": self.createPositionerSetup(self.list) - elif self.nimConfig.configMode.value in ["loopthrough", "satposdepends", "nothing", "equal"]: + elif self.nimConfig.configMode.value == "equal": + choices = [] + nimlist = nimmanager.canEqualTo(self.nim.slot) + for id in nimlist: + #choices.append((str(id), str(chr(65 + id)))) + choices.append((str(id), nimmanager.getNimDescription(id))) + self.nimConfig.connectedTo.setChoices(choices) + #self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices)) + self.list.append(getConfigListEntry(_("Tuner"), self.nimConfig.connectedTo)) + elif self.nimConfig.configMode.value == "satposdepends": + choices = [] + nimlist = nimmanager.canDependOn(self.nim.slot) + for id in nimlist: + #choices.append((str(id), str(chr(65 + id)))) + choices.append((str(id), nimmanager.getNimDescription(id))) + self.nimConfig.connectedTo.setChoices(choices) + #self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices)) + self.list.append(getConfigListEntry(_("Tuner"), self.nimConfig.connectedTo)) + elif self.nimConfig.configMode.value == "loopthrough": + choices = [] + print "connectable to:", nimmanager.canConnectTo(self.slotid) + connectable = nimmanager.canConnectTo(self.slotid) + for id in connectable: + choices.append((str(id), nimmanager.getNimDescription(id))) + self.nimConfig.connectedTo.setChoices(choices) + #self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices)) + self.list.append(getConfigListEntry(_("Connected to"), self.nimConfig.connectedTo)) + elif self.nimConfig.configMode.value == "nothing": pass elif self.nimConfig.configMode.value == "advanced": # advanced # SATs @@ -76,11 +127,12 @@ class NimSetup(Screen, ConfigListScreen): self.list.append(self.advancedSatsEntry) cur_orb_pos = self.nimConfig.advanced.sats.orbital_position satlist = self.nimConfig.advanced.sat.keys() - if cur_orb_pos not in satlist: - cur_orb_pos = satlist[0] - currSat = self.nimConfig.advanced.sat[cur_orb_pos] - self.fillListWithAdvancedSatEntrys(currSat) - self.have_advanced = True + if cur_orb_pos is not None: + if cur_orb_pos not in satlist: + cur_orb_pos = satlist[0] + currSat = self.nimConfig.advanced.sat[cur_orb_pos] + self.fillListWithAdvancedSatEntrys(currSat) + self.have_advanced = True elif self.nim.isCompatible("DVB-C"): self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) self.list.append(self.configMode) @@ -117,6 +169,7 @@ class NimSetup(Screen, ConfigListScreen): self.have_advanced = False elif self.nim.isCompatible("DVB-T"): self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) + self.list.append(self.configMode) self.have_advanced = False if self.nimConfig.configMode.value == "enabled": self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial)) @@ -129,7 +182,8 @@ class NimSetup(Screen, ConfigListScreen): def newConfig(self): checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, \ self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \ - self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, self.cableScanType) + self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, \ + self.uncommittedDiseqcCommand, self.cableScanType) for x in checkList: if self["config"].getCurrent() == x: self.createSetup() @@ -137,7 +191,7 @@ class NimSetup(Screen, ConfigListScreen): def run(self): if self.have_advanced and self.nim.config_mode == "advanced": self.fillAdvancedList() - for x in self["config"].list: + for x in self.list: if x in [self.turnFastEpochBegin, self.turnFastEpochEnd]: # workaround for storing only hour*3600+min*60 value in configfile # not really needed.. just for cosmetics.. @@ -146,6 +200,7 @@ class NimSetup(Screen, ConfigListScreen): x[1].value = int(mktime(dt.timetuple())) x[1].save() nimmanager.sec.update() + self.saveAll() def fillListWithAdvancedSatEntrys(self, Sat): currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)] @@ -175,25 +230,41 @@ class NimSetup(Screen, ConfigListScreen): if currLnb.diseqcMode.value == "1_0": self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0)) else: + if currLnb.uncommittedDiseqcCommand.index: + if currLnb.commandOrder.value == "ct": + currLnb.commandOrder.value = "cut" + elif currLnb.commandOrder.value == "tc": + currLnb.commandOrder.value = "tcu" + else: + if currLnb.commandOrder.index & 1: + currLnb.commandOrder.value = "tc" + else: + currLnb.commandOrder.value = "ct" self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder)) - self.list.append(getConfigListEntry(_("Uncommitted DiSEqC command"), currLnb.uncommittedDiseqcCommand)) + self.uncommittedDiseqcCommand = getConfigListEntry(_("Uncommitted DiSEqC command"), currLnb.uncommittedDiseqcCommand) + self.list.append(self.uncommittedDiseqcCommand) self.list.append(getConfigListEntry(_("DiSEqC repeats"), currLnb.diseqcRepeats)) if currLnb.diseqcMode.value == "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 currLnb.powerMeasurement.value: - self.list.append(getConfigListEntry(_("Power threshold in mA"), currLnb.powerThreshold)) - self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), currLnb.turningSpeed) - self.list.append(self.turningSpeed) - if currLnb.turningSpeed.value == "fast epoch": - self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), currLnb.fastTurningBegin) - self.turnFastEpochEnd = getConfigListEntry(_("End time"), currLnb.fastTurningEnd) - self.list.append(self.turnFastEpochBegin) - self.list.append(self.turnFastEpochEnd) + if SystemInfo["CanMeasureFrontendInputPower"]: + self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), currLnb.powerMeasurement) + self.list.append(self.advancedPowerMeasurement) + if currLnb.powerMeasurement.value: + self.list.append(getConfigListEntry(_("Power threshold in mA"), currLnb.powerThreshold)) + self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), currLnb.turningSpeed) + self.list.append(self.turningSpeed) + if currLnb.turningSpeed.value == "fast epoch": + self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), currLnb.fastTurningBegin) + self.turnFastEpochEnd = getConfigListEntry(_("End time"), currLnb.fastTurningEnd) + self.list.append(self.turnFastEpochBegin) + self.list.append(self.turnFastEpochEnd) + else: + if currLnb.powerMeasurement.value: + currLnb.powerMeasurement.value = False + currLnb.powerMeasurement.save() self.advancedLof = getConfigListEntry(_("LOF"), currLnb.lof) self.list.append(self.advancedLof) if currLnb.lof.value == "user_defined": @@ -215,8 +286,38 @@ class NimSetup(Screen, ConfigListScreen): self["config"].list = self.list def keySave(self): + old_configured_sats = nimmanager.getConfiguredSats() self.run() - self.close() + new_configured_sats = nimmanager.getConfiguredSats() + self.unconfed_sats = old_configured_sats - new_configured_sats + self.satpos_to_remove = None + self.deleteConfirmed(False) + + def deleteConfirmed(self, confirmed): + if confirmed: + eDVBDB.getInstance().removeServices(-1, -1, -1, self.satpos_to_remove) + + if self.satpos_to_remove is not None: + self.unconfed_sats.remove(self.satpos_to_remove) + + self.satpos_to_remove = None + for orbpos in self.unconfed_sats: + self.satpos_to_remove = orbpos + orbpos = self.satpos_to_remove + try: + # why we need this cast? + sat_name = str(nimmanager.getSatDescription(orbpos)) + except: + if orbpos > 1800: # west + orbpos = 3600 - orbpos + h = _("W") + else: + h = _("E") + sat_name = ("%d.%d" + h) % (orbpos / 10, orbpos % 10) + self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Delete no more configured satellite\n%s?") %(sat_name)) + break + if not self.satpos_to_remove: + self.close() def __init__(self, session, slotid): Screen.__init__(self, session) @@ -230,8 +331,10 @@ class NimSetup(Screen, ConfigListScreen): "cancel": self.keyCancel, }, -2) + self.slotid = slotid self.nim = nimmanager.nim_slots[slotid] self.nimConfig = self.nim.config + self.createConfigMode() self.createSetup() def keyLeft(self): @@ -241,7 +344,28 @@ class NimSetup(Screen, ConfigListScreen): def keyRight(self): ConfigListScreen.keyRight(self) self.newConfig() + + def saveAll(self): + if self.nim.isCompatible("DVB-S"): + # reset connectedTo to all choices to properly store the default value + choices = [] + nimlist = nimmanager.getNimListOfType("DVB-S", self.slotid) + for id in nimlist: + choices.append((str(id), nimmanager.getNimDescription(id))) + self.nimConfig.connectedTo.setChoices(choices) + for x in self["config"].list: + x[1].save() + + def cancelConfirm(self, result): + if not result: + return + for x in self["config"].list: + x[1].cancel() + # we need to call saveAll to reset the connectedTo choices + self.saveAll() + self.close() + class NimSelection(Screen): def __init__(self, session): Screen.__init__(self, session)