X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ad1e1a62302f33cf428da8141ae2a731bb3137de..119d2212d4ee135e5ec78cc6bbd3890a0e08514e:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 818a443e..00f9c18b 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -1,10 +1,11 @@ -from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff +from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff, ConfigDateTime from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteLNBParameters as lnbParam, \ eDVBSatelliteDiseqcParameters as diseqcParam, \ eDVBSatelliteSwitchParameters as switchParam, \ - eDVBSatelliteRotorParameters as rotorParam + eDVBSatelliteRotorParameters as rotorParam, \ + eDVBResourceManager import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE @@ -15,6 +16,8 @@ from xml.sax import make_parser from xml.sax.handler import ContentHandler from Tools.BoundFunction import boundFunction +from time import localtime, mktime +from datetime import datetime def getConfigSatlist(orbpos, satlist): default_orbpos = None @@ -28,11 +31,11 @@ def tryOpen(filename): try: procFile = open(filename) except IOError: - return "" + return None return procFile class SecConfigure: - def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = 0, diseqcpos = 0, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0): + def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST): #simple defaults sec.addLNB() tunermask = 1 << slotid @@ -55,9 +58,10 @@ class SecConfigure: sec.setDiSEqCMode(diseqcmode) sec.setToneburst(toneburstmode) sec.setCommittedCommand(diseqcpos) + sec.setUncommittedCommand(0) # SENDNO #print "set orbpos to:" + str(orbpos) - if (0 <= diseqcmode < 3): + if 0 <= diseqcmode < 3: sec.addSatellite(orbpos) self.satList.append(orbpos) elif (diseqcmode == 3): # diseqc 1.2 @@ -69,6 +73,7 @@ class SecConfigure: sec.setLoDirection(loDirection) sec.setUseInputpower(True) sec.setInputpowerDelta(50) + sec.setRotorTurningSpeed(turningSpeed) for x in self.NimManager.satList: print "Add sat " + str(x[0]) @@ -78,7 +83,7 @@ class SecConfigure: sec.setRotorPosNum(0) # USALS self.satList.append(int(x[0])) - sec.setLNBTunerMask(tunermask) + sec.setLNBSlotMask(tunermask) def setSatposDepends(self, sec, nim1, nim2): print "tuner", nim1, "depends on satpos of", nim2 @@ -100,57 +105,75 @@ class SecConfigure: self.linked = { } self.satposdepends = { } self.equal = { } - for slot in self.NimManager.nimslots: - x = slot.slotid - nim = config.Nims[x] - if slot.nimType == self.NimManager.nimType["DVB-S"]: + + nim_slots = self.NimManager.nim_slots + + for slot in nim_slots: + x = slot.slot + nim = slot.config + if slot.isCompatible("DVB-S"): + # save what nim we link to/are equal to/satposdepends to. + # this is stored in the *value* (not index!) of the config list if nim.configMode.value == "equal": - self.equal[nim.equalTo.index]=x + self.equal[int(nim.equalTo.value)]=x if nim.configMode.value == "loopthrough": - self.linkNIMs(sec, x, nim.linkedTo.index) - self.linked[nim.linkedTo.index]=x + self.linkNIMs(sec, x, int(nim.linkedTo.value)) + self.linked[int(nim.linkedTo.value)]=x elif nim.configMode.value == "satposdepends": - self.setSatposDepends(sec, x, nim.satposDependsTo.index) - self.satposdepends[nim.satposDependsTo.index]=x + self.setSatposDepends(sec, x, int(nim.satposDependsTo.value)) + self.satposdepends[int(nim.satposDependsTo.value)]=x - for slot in self.NimManager.nimslots: - x = slot.slotid - nim = config.Nims[x] - if slot.nimType == self.NimManager.nimType["DVB-S"]: + for slot in nim_slots: + x = slot.slot + nim = slot.config + if slot.isCompatible("DVB-S"): print "slot: " + str(x) + " configmode: " + str(nim.configMode.value) print "diseqcmode: ", nim.configMode.value - if nim.configMode.value in [ "loopthrough", "satposdepends", "equal", "nothing" ]: + if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]: pass - elif nim.configMode.value == "simple": #simple config - if nim.diseqcMode.value == "single": #single - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO) - elif nim.diseqcMode.value == "toneburst_a_b": #Toneburst A/B - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) - elif nim.diseqcMode.value == "diseqc_a_b": #DiSEqC A/B - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) - elif nim.diseqcMode.value == "diseqc_a_b_c_d": #DiSEqC A/B/C/D - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA) - self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB) - elif nim.diseqcMode.value == "positioner": #Positioner - if nim.latitudeOrientation.value == "north": - laValue = rotorParam.NORTH - else: - laValue = rotorParam.SOUTH - if nim.longitudeOrientation.value == "east": - loValue = rotorParam.EAST - else: - loValue = rotorParam.WEST - self.addLNBSimple(sec, slotid = x, diseqcmode = 3, - longitude = nim.longitude.float, - loDirection = loValue, - latitude = nim.latitude.float, - laDirection = laValue) - elif nim.configMode.value == "advanced": #advanced config - self.updateAdvanced(sec, x) + else: + sec.setSlotNotLinked(x) + if nim.configMode.value == "equal": + pass + elif nim.configMode.value == "simple": #simple config + if nim.diseqcMode.value == "single": #single + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO) + elif nim.diseqcMode.value == "toneburst_a_b": #Toneburst A/B + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO) + elif nim.diseqcMode.value == "diseqc_a_b": #DiSEqC A/B + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) + elif nim.diseqcMode.value == "diseqc_a_b_c_d": #DiSEqC A/B/C/D + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA) + self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB) + elif nim.diseqcMode.value == "positioner": #Positioner + if nim.latitudeOrientation.value == "north": + laValue = rotorParam.NORTH + else: + laValue = rotorParam.SOUTH + if nim.longitudeOrientation.value == "east": + loValue = rotorParam.EAST + else: + loValue = rotorParam.WEST + turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW } + if turn_speed_dict.has_key(nim.turningSpeed.value): + turning_speed = turn_speed_dict[nim.turningSpeed.value] + else: + beg_time = localtime(nim.fastTurningBegin.value) + end_time = localtime(nim.fastTurningEnd.value) + turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16 + turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1 + self.addLNBSimple(sec, slotid = x, diseqcmode = 3, + longitude = nim.longitude.float, + loDirection = loValue, + latitude = nim.latitude.float, + laDirection = laValue, + turningSpeed = turning_speed) + elif nim.configMode.value == "advanced": #advanced config + self.updateAdvanced(sec, x) print "sec config completed" def updateAdvanced(self, sec, slotid): @@ -185,18 +208,18 @@ class SecConfigure: sec.setLNBLOFL(currLnb.lofl.value * 1000) sec.setLNBLOFH(currLnb.lofh.value * 1000) sec.setLNBThreshold(currLnb.threshold.value * 1000) - + # if currLnb.output_12v.value == "0V": # pass # nyi in drivers # elif currLnb.output_12v.value == "12V": # pass # nyi in drivers - + if currLnb.increased_voltage.value: sec.setLNBIncreasedVoltage(lnbParam.ON) else: sec.setLNBIncreasedVoltage(lnbParam.OFF) - - dm = currLnb.diseqcMode.value + + dm = currLnb.diseqcMode.value if dm == "none": sec.setDiSEqCMode(diseqcParam.NONE) elif dm == "1_0": @@ -216,10 +239,10 @@ class SecConfigure: sec.setToneburst(diseqcParam.A) elif currLnb.toneburst.value == "B": sec.setToneburst(diseqcParam.B) - + # Committed Diseqc Command cdc = currLnb.commitedDiseqcCommand.value - + c = { "none": diseqcParam.SENDNO, "AA": diseqcParam.AA, "AB": diseqcParam.AB, @@ -232,9 +255,9 @@ class SecConfigure: sec.setCommittedCommand(long(cdc)) sec.setFastDiSEqC(currLnb.fastDiseqc.value) - + sec.setSeqRepeat(currLnb.sequenceRepeat.value) - + if currLnb.diseqcMode.value == "1_0": currCO = currLnb.commandOrder1_0.value else: @@ -249,9 +272,9 @@ class SecConfigure: sec.setRepeats({"none": 0, "one": 1, "two": 2, "three": 3}[currLnb.diseqcRepeats.value]) setCommandOrder = False - - # 0 "committed, toneburst", - # 1 "toneburst, committed", + + # 0 "committed, toneburst", + # 1 "toneburst, committed", # 2 "committed, uncommitted, toneburst", # 3 "toneburst, committed, uncommitted", # 4 "uncommitted, committed, toneburst" @@ -272,14 +295,23 @@ class SecConfigure: sec.setLoDirection(rotorParam.EAST) else: sec.setLoDirection(rotorParam.WEST) - + if currLnb.powerMeasurement.value: sec.setUseInputpower(True) sec.setInputpowerDelta(currLnb.powerThreshold.value) + turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW } + if turn_speed_dict.has_key(currLnb.turningSpeed.value): + turning_speed = turn_speed_dict[currLnb.turningSpeed.value] + else: + beg_time = localtime(currLnb.fastTurningBegin.value) + end_time = localtime(currLnb.fastTurningEnd.value) + turning_speed = ((beg_time.tm_hour + 1) * 60 + beg_time.tm_min + 1) << 16 + turning_speed |= (end_time.tm_hour + 1) * 60 + end_time.tm_min + 1 + sec.setRotorTurningSpeed(turning_speed) else: sec.setUseInputpower(False) - sec.setLNBTunerMask(tunermask) + sec.setLNBSlotMask(tunermask) # finally add the orbital positions for y in lnbSat[x]: @@ -309,11 +341,65 @@ class SecConfigure: self.NimManager = nimmgr self.update() -class nimSlot: - def __init__(self, slotid, nimtype, name): - self.slotid = slotid - self.nimType = nimtype - self.name = name +class NIM(object): + def __init__(self, slot, type, description): + self.slot = slot + + if type not in ["DVB-S", "DVB-C", "DVB-T", "DVB-S2", None]: + print "warning: unknown NIM type %s, not using." % type + type = None + + self.type = type + self.description = description + + def isCompatible(self, what): + compatible = { + None: [None], + "DVB-S": ["DVB-S", None], + "DVB-C": ["DVB-C", None], + "DVB-T": ["DVB-T", None], + "DVB-S2": ["DVB-S", "DVB-S2", None] + } + return what in compatible[self.type] + + def getSlotName(self): + # get a friendly description for a slot name. + # we name them "Tuner A/B/C/...", because that's what's usually written on the back + # of the device. + return _("Tuner ") + chr(ord('A') + self.slot) + + slot_name = property(getSlotName) + + def getSlotID(self): + return chr(ord('A') + self.slot) + + slot_id = property(getSlotID) + + def getFriendlyType(self): + return { + "DVB-S": "DVB-S", + "DVB-T": "DVB-T", + "DVB-S2": "DVB-S2", + "DVB-C": "DVB-C", + None: _("empty") + }[self.type] + + friendly_type = property(getFriendlyType) + + def getFriendlyFullDescription(self): + nim_text = self.slot_name + ": " + + if self.empty: + nim_text += _("(empty)") + else: + nim_text += self.description + " (" + self.friendly_type + ")" + + return nim_text + + friendly_full_description = property(getFriendlyFullDescription) + config_mode = property(lambda self: config.Nims[self.slot].configMode.value) + config = property(lambda self: config.Nims[self.slot]) + empty = property(lambda self: self.type is None) class NimManager: class parseSats(ContentHandler): @@ -351,24 +437,29 @@ class NimManager: def __init__(self, cablesList, transponders): self.isPointsElement, self.isReboundsElement = 0, 0 self.cablesList = cablesList + for x in self.cablesList: + self.cablesList.remove(x) self.transponders = transponders def startElement(self, name, attrs): if (name == "cable"): #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',"")) tname = attrs.get('name',"").encode("UTF-8") - self.cablesList.append(str(tname)) - self.parsedCab = str(tname) + tflags = int(attrs.get('flags',"0")) + self.cablesList.append((tname, tflags)) + self.parsedCab = tname elif (name == "transponder"): freq = int(attrs.get('frequency',"")) - #sr = int(attrs.get('symbol_rate',"")) - #mod = int(attrs.get('modulation',"3")) # QAM64 default - #fec = int(attrs.get('fec_inner',"0")) # AUTO default + while freq > 999999: + freq /= 10 + sr = int(attrs.get('symbol_rate',"0")) + mod = int(attrs.get('modulation',"3")) # QAM64 default + fec = int(attrs.get('fec_inner',"0")) # AUTO default if self.parsedCab in self.transponders: pass else: self.transponders[self.parsedCab] = [ ] - self.transponders[self.parsedCab].append((1, freq)) + self.transponders[self.parsedCab].append((1, freq, sr, mod, fec)) class parseTerrestrials(ContentHandler): def __init__(self, terrestrialsList, transponders): @@ -411,17 +502,20 @@ class NimManager: else: return [] - def getTranspondersCable(self, cable): - return self.transponderscable[cable] + def getTranspondersCable(self, nim): + nimConfig = config.Nims[nim] + if nimConfig.configMode.value != "nothing" and nimConfig.cable.scan_type.value == "provider": + return self.transponderscable[self.cablesList[nimConfig.cable.scan_provider.index][0]] + return [ ] def getTranspondersTerrestrial(self, region): return self.transpondersterrestrial[region] def getCableDescription(self, nim): - return self.cablesList[0] - - def getCableTrustNit(self, nim): - return config.Nims[nim].cabletype.value == "quick" + return self.cablesList[config.Nims[nim].scan_provider.index][0] + + def getCableFlags(self, nim): + return self.cablesList[config.Nims[nim].scan_provider.index][1] def getTerrestrialDescription(self, nim): return self.terrestrialsList[config.Nims[nim].terrestrial.index][0] @@ -436,145 +530,125 @@ class NimManager: return self.satellites[pos] def readSatsfromFile(self): + # read initial networks from file. we only read files which we are interested in, + # which means only these where a compatible tuner exists. self.satellites = { } self.transponders = { } self.transponderscable = { } self.transpondersterrestrial = { } - + parser = make_parser() - if (self.hasNimType(self.nimType["DVB-S"])): + + if self.hasNimType("DVB-S"): print "Reading satellites.xml" satHandler = self.parseSats(self.satList, self.satellites, self.transponders) parser.setContentHandler(satHandler) parser.parse('/etc/tuxbox/satellites.xml') - if (self.hasNimType(self.nimType["DVB-C"])): + + if self.hasNimType("DVB-C"): print "Reading cables.xml" cabHandler = self.parseCables(self.cablesList, self.transponderscable) parser.setContentHandler(cabHandler) parser.parse('/etc/tuxbox/cables.xml') - if (self.hasNimType(self.nimType["DVB-T"])): + if self.hasNimType("DVB-T"): print "Reading terrestrial.xml" terHandler = self.parseTerrestrials(self.terrestrialsList, self.transpondersterrestrial) parser.setContentHandler(terHandler) parser.parse('/etc/tuxbox/terrestrial.xml') + + def enumerateNIMs(self): + # enum available NIMs. This is currently very dreambox-centric and uses the /proc/bus/nim_sockets interface. + # the result will be stored into nim_slots. + # the content of /proc/bus/nim_sockets looks like: + # NIM Socket 0: + # Type: DVB-S + # Name: BCM4501 DVB-S2 NIM (internal) + # NIM Socket 1: + # Type: DVB-S + # Name: BCM4501 DVB-S2 NIM (internal) + # NIM Socket 2: + # Type: DVB-T + # Name: Philips TU1216 + # NIM Socket 3: + # Type: DVB-S + # Name: Alps BSBE1 702A - def parseProc(self): - self.nimTypes = {} - self.nimNames = {} - self.nimSocketCount = 0 + # + # Type will be either "DVB-S", "DVB-S2", "DVB-T", "DVB-C" or None. + nimfile = tryOpen("/proc/bus/nim_sockets") - if nimfile == "": - return self.nimType["empty/unknown"] - - lastsocket = -1 + if nimfile is None: + return - while 1: - line = nimfile.readline() + current_slot = None + + entries = {} + for line in nimfile.readlines(): if line == "": break if line.strip().startswith("NIM Socket"): parts = line.strip().split(" ") - id = int(parts[2][:1]) - lastsocket = int(id) - self.nimSocketCount += 1 + current_slot = int(parts[2][:-1]) + entries[current_slot] = {} elif line.strip().startswith("Type:"): - self.nimTypes[lastsocket] = str(line.strip()[6:]) - #self.nimTypes[lastsocket] = str("DVB-T") + entries[current_slot]["type"] = str(line.strip()[6:]) elif line.strip().startswith("Name:"): - self.nimNames[lastsocket] = str(line.strip()[6:]) + entries[current_slot]["name"] = str(line.strip()[6:]) elif line.strip().startswith("empty"): - self.nimNames[lastsocket] = _("N/A") - self.nimTypes[lastsocket] = "empty/unknown" - + entries[current_slot]["type"] = None + entries[current_slot]["name"] = _("N/A") nimfile.close() - - def getNimType(self, slotID): - if slotID >= self.nimCount: - return self.nimType["empty/unknown"] - else: - return self.nimType[self.nimTypes[slotID]] - - def getNimTypeName(self, slotID): - if slotID >= self.nimCount: - return "empty/unknown" - else: - return self.nimTypes[slotID] - def getNimName(self, slotID): - return self.nimNames[slotID] + # nim_slots is an array which has exactly one entry for each slot, even for empty ones. + self.nim_slots = [ ] + + for id, entry in entries.items(): + if not (entry.has_key("name") and entry.has_key("type")): + entry["name"] = _("N/A") + entry["type"] = None + self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"])) - def getNimSocketCount(self): - return self.nimSocketCount - def hasNimType(self, chktype): - for id, type in self.nimTypes.items(): - if (chktype == self.nimType[str(type)]): + for slot in self.nim_slots: + if slot.isCompatible(chktype): return True return False - + def getNimListOfType(self, type, exception = -1): + # returns a list of indexes for NIMs compatible to the given type, except for 'exception' list = [] - for x in self.nimslots: - if ((x.nimType == type) and (x.slotid != exception)): - list.append(x.slotid) + for x in self.nim_slots: + if x.isCompatible(type) and x.slot != exception: + list.append(x.slot) return list - def getConfigPrefix(self, slotid): - return "config.Nim" + ("A","B","C","D")[slotid] + "." - def __init__(self): - #use as enum - self.nimType = { "empty/unknown": -1, - "DVB-S": 0, - "DVB-C": 1, - "DVB-T": 2} self.satList = [ ] self.cablesList = [] self.terrestrialsList = [] - - self.parseProc() + self.enumerateNIMs() + self.readSatsfromFile() - self.readSatsfromFile() - - self.nimCount = self.getNimSocketCount() - - self.nimslots = [ ] - x = 0 - while x < self.nimCount: - tType = self.getNimType(x) - tName = self.getNimName(x) - tNim = nimSlot(x, tType, tName) - self.nimslots.append(tNim) - x += 1 - InitNimManager(self) #init config stuff + # get a list with the friendly full description def nimList(self): list = [ ] - for slot in self.nimslots: - nimText = _("Socket ") + ("A", "B", "C", "D")[slot.slotid] + ": " - if slot.nimType == -1: - nimText += _("empty/unknown") - else: - nimText += slot.name + " (" - nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")" - list.append((nimText, slot)) + for slot in self.nim_slots: + list.append(slot.friendly_full_description) return list - def getNimConfigMode(self, slotid): - return config.Nims[slotid].configMode.value - def getSatList(self): return self.satList def getSatListForNim(self, slotid): list = [] - if (self.getNimType(slotid) == self.nimType["DVB-S"]): + if self.nim_slots[slotid].isCompatible("DVB-S"): #print "slotid:", slotid - - #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] + + #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.index] #print "diseqcA:", config.Nims[slotid].diseqcA.value configMode = config.Nims[slotid].configMode.value @@ -598,12 +672,12 @@ class NimManager: for x in self.satList: if int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) != 0: list.append(x) - + return list def getRotorSatListForNim(self, slotid): list = [] - if (self.getNimType(slotid) == self.nimType["DVB-S"]): + if self.nim_slots[slotid].isCompatible("DVB-S"): #print "slotid:", slotid #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] @@ -623,111 +697,97 @@ class NimManager: list.append(x) return list - def nimDiseqcModeChanged(self, slotid, mode): - #print "nimDiseqcModeChanged set to " + str(mode) - pass - def nimPortAChanged(self, slotid, val): - #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val) - pass - def nimPortBChanged(self, slotid, val): - #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val) - #print "nimDiseqcB set to " + str(val) - pass - def nimPortCChanged(self, slotid, val): - #print "nimDiseqcC set to " + str(val) - pass - def nimPortDChanged(self, slotid, val): - #print "nimDiseqcD set to " + str(val) - pass - def InitSecParams(): config.sec = ConfigSubsection() - x = ConfigInteger(default=15) + x = ConfigInteger(default=15, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_CONT_TONE, configElement.value)) config.sec.delay_after_continuous_tone_change = x - x = ConfigInteger(default=10) + x = ConfigInteger(default=10, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_FINAL_VOLTAGE_CHANGE, configElement.value)) config.sec.delay_after_final_voltage_change = x - x = ConfigInteger(default=120) + x = ConfigInteger(default=120, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_DISEQC_REPEATS, configElement.value)) config.sec.delay_between_diseqc_repeats = x - x = ConfigInteger(default=50) + x = ConfigInteger(default=50, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_LAST_DISEQC_CMD, configElement.value)) config.sec.delay_after_last_diseqc_command = x - x = ConfigInteger(default=50) + x = ConfigInteger(default=50, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value)) config.sec.delay_after_toneburst = x - x = ConfigInteger(default=120) + x = ConfigInteger(default=200, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, configElement.value)) config.sec.delay_after_enable_voltage_before_switch_command = x - x = ConfigInteger(default=700) + x = ConfigInteger(default=700, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, configElement.value)) config.sec.delay_between_switch_and_motor_command = x - x = ConfigInteger(default=150) + x = ConfigInteger(default=150, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, configElement.value)) config.sec.delay_after_voltage_change_before_measure_idle_inputpower = x - x = ConfigInteger(default=750) + x = ConfigInteger(default=750, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, configElement.value)) config.sec.delay_after_enable_voltage_before_motor_command = x - x = ConfigInteger(default=150) + x = ConfigInteger(default=150, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_MOTOR_STOP_CMD, configElement.value)) config.sec.delay_after_motor_stop_command = x - x = ConfigInteger(default=150) + x = ConfigInteger(default=150, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, configElement.value)) config.sec.delay_after_voltage_change_before_motor_command = x - x = ConfigInteger(default=120) + x = ConfigInteger(default=120, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value)) config.sec.motor_running_timeout = x - x = ConfigInteger(default=2) + x = ConfigInteger(default=1, limits = (0, 5)) x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value)) config.sec.motor_command_retries = x + x = ConfigInteger(default=20, limits = (0, 9999)) + x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, configElement.value)) + config.sec.delay_after_change_voltage_before_switch_command = x + +# TODO add support for satpos depending nims to advanced nim configuration +# so a second/third/fourth cable from a motorized lnb can used behind a +# diseqc 1.0 / diseqc 1.1 / toneburst switch +# the C(++) part should can handle this +# the configElement should be only visible when diseqc 1.2 is disabled def InitNimManager(nimmgr): InitSecParams() config.Nims = ConfigSubList() - for x in range(nimmgr.nimCount): + for x in range(len(nimmgr.nim_slots)): config.Nims.append(ConfigSubsection()) - -# def nimConfigModeChanged(slotid, configElement): -# nimmgr.nimConfigModeChanged(slotid, configElement.value) - def nimDiseqcModeChanged(slotid, configElement): - nimmgr.nimDiseqcModeChanged(slotid, configElement.value) - - def nimPortAChanged(slotid, configElement): - nimmgr.nimPortAChanged(slotid, configElement.value) - def nimPortBChanged(slotid, configElement): - nimmgr.nimPortBChanged(slotid, configElement.value) - def nimPortCChanged(slotid, configElement): - nimmgr.nimPortCChanged(slotid, configElement.value) - def nimPortDChanged(slotid, configElement): - nimmgr.nimPortDChanged(slotid, configElement.value) - - for slot in nimmgr.nimslots: - x = slot.slotid - cname = nimmgr.getConfigPrefix(x) + + used_nim_slots = [ ] + + for slot in nimmgr.nim_slots: + x = slot.slot nim = config.Nims[x] - if slot.nimType == nimmgr.nimType["DVB-S"]: - if slot.slotid == 0: + # HACK: currently, we can only looptrough to socket A + + if slot.type is not None: + used_nim_slots.append((slot.slot, slot.description)) + + if slot.isCompatible("DVB-S"): + if slot.slot == 0: nim.configMode = ConfigSelection( choices = { "simple": _("simple"), - "advanced": _("advanced")}, + "advanced": _("advanced"), + "nothing": _("nothing connected"), + }, default = "simple") else: nim.configMode = ConfigSelection( @@ -741,6 +801,7 @@ def InitNimManager(nimmgr): default = "loopthrough") #important - check if just the 2nd one is LT only and the first one is DVB-S + # CHECKME: is this logic correct for >2 slots? if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]: if x == 0: # first one can never be linked to anything # reset to simple @@ -748,9 +809,9 @@ def InitNimManager(nimmgr): nim.configMode.save() else: #FIXME: make it better - for y in nimmgr.nimslots: - if y.slotid == 0: - if y.nimType != nimmgr.nimType["DVB-S"]: + for y in nimmgr.nim_slots: + if y.slot == 0: + if not y.isCompatible("DVB-S"): # reset to simple nim.configMode.value = "simple" nim.configMode.save() @@ -777,23 +838,24 @@ def InitNimManager(nimmgr): nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east") nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)]) nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north") - satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid) + nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast") + btime = datetime(1970, 1, 1, 7, 0); + nim.fastTurningBegin = ConfigDateTime(default = mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 900) + etime = datetime(1970, 1, 1, 19, 0); + nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900) + # get other frontends of the same type + satNimList = nimmgr.getNimListOfType(slot.type, slot.slot) satNimListNames = {} + for x in satNimList: - satNimListNames["Slot_" + ("A", "B", "C", "D")[x] + "_" + nimmgr.getNimName(x)] = _("Slot ") + ("A", "B", "C", "D")[x] + ": " + nimmgr.getNimName(x) + n = nimmgr.nim_slots[x] + satNimListNames["%d" % n.slot] = n.friendly_full_description + if len(satNimListNames): nim.equalTo = ConfigSelection(choices = satNimListNames) nim.linkedTo = ConfigSelection(choices = satNimListNames) nim.satposDependsTo = ConfigSelection(choices = satNimListNames) - - #perhaps the instance of the slot is more useful? -# nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x)) - nim.diseqcMode.addNotifier(boundFunction(nimDiseqcModeChanged,x)) - nim.diseqcA.addNotifier(boundFunction(nimPortAChanged,int(x))) - nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x)) - nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x)) - nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x)) - + # advanced config: nim.advanced = ConfigSubsection() nim.advanced.sats = getConfigSatlist(192,nimmgr.satList) @@ -813,11 +875,11 @@ def InitNimManager(nimmgr): csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))] for y in range(0, 16): csw.append((str(0xF0|y), "Input " + str(y+1))) - + ucsw = [("0", _("None"))] for y in range(1, 17): ucsw.append((str(y), "Input " + str(y))) - + nim.advanced.lnb = ConfigSubList() nim.advanced.lnb.append(ConfigNothing()) for x in range(1, 33): @@ -835,11 +897,11 @@ def InitNimManager(nimmgr): nim.advanced.lnb[x].sequenceRepeat = ConfigYesNo(default=False) nim.advanced.lnb[x].commandOrder1_0 = ConfigSelection(choices = [("ct", "committed, toneburst"), ("tc", "toneburst, committed")], default = "ct") nim.advanced.lnb[x].commandOrder = ConfigSelection(choices = [ - ("ct", "committed, toneburst"), - ("tc", "toneburst, committed"), - ("cut", "committed, uncommitted, toneburst"), - ("tcu", "toneburst, committed, uncommitted"), - ("uct", "uncommitted, committed, toneburst"), + ("ct", "committed, toneburst"), + ("tc", "toneburst, committed"), + ("cut", "committed, uncommitted, toneburst"), + ("tcu", "toneburst, committed, uncommitted"), + ("uct", "uncommitted, committed, toneburst"), ("tuc", "toneburst, uncommitted, commmitted")], default="ct") nim.advanced.lnb[x].uncommittedDiseqcCommand = ConfigSelection(choices = ucsw) @@ -850,10 +912,58 @@ def InitNimManager(nimmgr): nim.advanced.lnb[x].latitudeOrientation = ConfigSelection(choices = [("north", _("North")), ("south", _("South"))], default = "north") nim.advanced.lnb[x].powerMeasurement = ConfigYesNo(default=True) nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100)) - - elif slot.nimType == nimmgr.nimType["DVB-C"]: - nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))], default = "complete") - elif slot.nimType == nimmgr.nimType["DVB-T"]: + nim.advanced.lnb[x].turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch"))], default = "fast") + btime = datetime(1970, 1, 1, 7, 0); + nim.advanced.lnb[x].fastTurningBegin = ConfigDateTime(default=mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 600) + etime = datetime(1970, 1, 1, 19, 0); + nim.advanced.lnb[x].fastTurningEnd = ConfigDateTime(default=mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 600) + elif slot.isCompatible("DVB-C"): + nim.configMode = ConfigSelection( + choices = { + "enabled": _("enabled"), + "nothing": _("nothing connected"), + }, + default = "enabled") + list = [ ] + n = 0 + for x in nimmgr.cablesList: + list.append((str(n), x[0])) + n += 1 + nim.cable = ConfigSubsection() + possible_scan_types = [("bands", _("Frequency bands")), ("steps", _("Frequency steps"))] + if n: + possible_scan_types.append(("provider", _("Provider"))) + nim.cable.scan_type = ConfigSelection(default = "bands", choices = possible_scan_types) + nim.cable.scan_provider = ConfigSelection(default = "0", choices = list) + nim.cable.scan_band_EU_VHF_I = ConfigYesNo(default = True) + nim.cable.scan_band_EU_MID = ConfigYesNo(default = True) + nim.cable.scan_band_EU_VHF_III = ConfigYesNo(default = True) + nim.cable.scan_band_EU_UHF_IV = ConfigYesNo(default = True) + nim.cable.scan_band_EU_UHF_V = ConfigYesNo(default = True) + nim.cable.scan_band_EU_SUPER = ConfigYesNo(default = True) + nim.cable.scan_band_EU_HYPER = ConfigYesNo(default = True) + nim.cable.scan_band_US_LOW = ConfigYesNo(default = False) + nim.cable.scan_band_US_MID = ConfigYesNo(default = False) + nim.cable.scan_band_US_HIGH = ConfigYesNo(default = False) + nim.cable.scan_band_US_SUPER = ConfigYesNo(default = False) + nim.cable.scan_band_US_HYPER = ConfigYesNo(default = False) + nim.cable.scan_frequency_steps = ConfigInteger(default = 1000, limits = (1000, 10000)) + nim.cable.scan_mod_qam16 = ConfigYesNo(default = False) + nim.cable.scan_mod_qam32 = ConfigYesNo(default = False) + nim.cable.scan_mod_qam64 = ConfigYesNo(default = True) + nim.cable.scan_mod_qam128 = ConfigYesNo(default = False) + nim.cable.scan_mod_qam256 = ConfigYesNo(default = True) + nim.cable.scan_sr_6900 = ConfigYesNo(default = True) + nim.cable.scan_sr_6875 = ConfigYesNo(default = True) + nim.cable.scan_sr_ext1 = ConfigInteger(default = 0, limits = (0, 7230)) + nim.cable.scan_sr_ext2 = ConfigInteger(default = 0, limits = (0, 7230)) + elif slot.isCompatible("DVB-T"): + nim.configMode = ConfigSelection( + choices = { + "enabled": _("enabled"), + "nothing": _("nothing connected"), + }, + default = "enabled") list = [] n = 0 for x in nimmgr.terrestrialsList: @@ -862,10 +972,12 @@ def InitNimManager(nimmgr): nim.terrestrial = ConfigSelection(choices = list) nim.terrestrial_5V = ConfigOnOff() else: + nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing"); print "pls add support for this frontend type!" # assert False - nimmgr.sec = SecConfigure(nimmgr) + eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots) + nimmgr.sec = SecConfigure(nimmgr) nimmanager = NimManager()