X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77c42c1c1069a5b6526fa515512825b15de77b79..9063d6049a81d8945126c66e0a12ce8b5a64b4a1:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index bfe8f36b..650223d9 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -1,4 +1,6 @@ -from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff, ConfigDateTime +from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \ + ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \ + ConfigSubDict, ConfigOnOff, ConfigDateTime from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteLNBParameters as lnbParam, \ @@ -7,12 +9,11 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteRotorParameters as rotorParam, \ eDVBResourceManager, eDVBDB -#from xml.sax import make_parser -#from xml.sax.handler import ContentHandler - from time import localtime, mktime from datetime import datetime +from sets import Set + def getConfigSatlist(orbpos, satlist): default_orbpos = None for x in satlist: @@ -29,14 +30,25 @@ def tryOpen(filename): return procFile class SecConfigure: + def getConfiguredSats(self): + return self.configuredSatellites + + def addSatellite(self, sec, orbpos): + sec.addSatellite(orbpos) + self.configuredSatellites.add(orbpos) + 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, useInputPower=True, inputPowerDelta=50): + if orbpos is None: + return #simple defaults sec.addLNB() tunermask = 1 << slotid if self.equal.has_key(slotid): - tunermask |= (1 << self.equal[slotid]) + for slot in self.equal[slotid]: + tunermask |= (1 << slot) elif self.linked.has_key(slotid): - tunermask |= (1 << self.linked[slotid]) + for slot in self.linked[slotid]: + tunermask |= (1 << slot) sec.setLNBLOFL(9750000) sec.setLNBLOFH(10600000) sec.setLNBThreshold(11700000) @@ -56,8 +68,7 @@ class SecConfigure: #print "set orbpos to:" + str(orbpos) if 0 <= diseqcmode < 3: - sec.addSatellite(orbpos) - self.satList.append(orbpos) + self.addSatellite(sec, orbpos) elif (diseqcmode == 3): # diseqc 1.2 if self.satposdepends.has_key(slotid): tunermask |= (1 << self.satposdepends[slotid]) @@ -71,12 +82,11 @@ class SecConfigure: for x in self.NimManager.satList: print "Add sat " + str(x[0]) - sec.addSatellite(int(x[0])) + self.addSatellite(sec, int(x[0])) sec.setVoltageMode(0) sec.setToneMode(0) sec.setRotorPosNum(0) # USALS - self.satList.append(int(x[0])) - + sec.setLNBSlotMask(tunermask) def setSatposDepends(self, sec, nim1, nim2): @@ -86,15 +96,21 @@ class SecConfigure: def linkNIMs(self, sec, nim1, nim2): print "link tuner", nim1, "to tuner", nim2 sec.setTunerLinked(nim1, nim2) - - def getSatList(self): - return self.satList + + def getRoot(self, slotid, connto): + visited = [] + while (self.NimManager.getNimConfig(connto).configMode.value in ["satposdepends", "equal", "loopthrough"]): + connto = int(self.NimManager.getNimConfig(connto).connectedTo.value) + if connto in visited: # prevent endless loop + return slotid + visited.append(connto) + return connto def update(self): sec = secClass.getInstance() + self.configuredSatellites = Set() sec.clear() ## this do unlinking NIMs too !! print "sec config cleared" - self.satList = [] self.linked = { } self.satposdepends = { } @@ -116,20 +132,30 @@ class SecConfigure: # 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[int(nim.equalTo.value)]=x + connto = self.getRoot(x, int(nim.connectedTo.value)) + if not self.equal.has_key(connto): + self.equal[connto] = [] + self.equal[connto].append(x) elif nim.configMode.value == "loopthrough": - self.linkNIMs(sec, x, int(nim.linkedTo.value)) - self.linked[int(nim.linkedTo.value)]=x + self.linkNIMs(sec, x, int(nim.connectedTo.value)) + connto = self.getRoot(x, int(nim.connectedTo.value)) + if not self.linked.has_key(connto): + self.linked[connto] = [] + self.linked[connto].append(x) elif nim.configMode.value == "satposdepends": - self.setSatposDepends(sec, x, int(nim.satposDependsTo.value)) - self.satposdepends[int(nim.satposDependsTo.value)]=x + self.setSatposDepends(sec, x, int(nim.connectedTo.value)) + connto = self.getRoot(x, int(nim.connectedTo.value)) + if not self.satposdepends.has_key(connto): + self.satposdepends[connto] = [] + self.satposdepends[connto].append(x) + 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 + print "diseqcmode: ", nim.diseqcMode.value if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]: pass else: @@ -324,7 +350,7 @@ class SecConfigure: # finally add the orbital positions for y in lnbSat[x]: - sec.addSatellite(y) + self.addSatellite(sec, y) currSat = config.Nims[slotid].advanced.sat[y] if currSat.voltage.value == "polarization": @@ -348,10 +374,11 @@ class SecConfigure: def __init__(self, nimmgr): self.NimManager = nimmgr + self.configuredSatellites = Set() self.update() class NIM(object): - def __init__(self, slot, type, description): + def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None): self.slot = slot if type not in ["DVB-S", "DVB-C", "DVB-T", "DVB-S2", None]: @@ -360,6 +387,8 @@ class NIM(object): self.type = type self.description = description + self.has_outputs = has_outputs + self.internally_connectable = internally_connectable def isCompatible(self, what): compatible = { @@ -370,6 +399,15 @@ class NIM(object): "DVB-S2": ["DVB-S", "DVB-S2", None] } return what in compatible[self.type] + + def connectableTo(self): + connectable = { + "DVB-S": ["DVB-S", "DVB-S2"], + "DVB-C": ["DVB-C"], + "DVB-T": ["DVB-T"], + "DVB-S2": ["DVB-S", "DVB-S2"] + } + return connectable[self.type] def getSlotName(self): # get a friendly description for a slot name. @@ -381,6 +419,12 @@ class NIM(object): def getSlotID(self): return chr(ord('A') + self.slot) + + def hasOutputs(self): + return self.has_outputs + + def internallyConnectableTo(self): + return self.internally_connectable slot_id = property(getSlotID) @@ -411,100 +455,8 @@ class NIM(object): empty = property(lambda self: self.type is None) class NimManager: -# class parseSats(ContentHandler): -# def __init__(self, satList, satellites, transponders): -# self.isPointsElement, self.isReboundsElement = 0, 0 -# self.satList = satList -# self.satellites = satellites -# self.transponders = transponders -# -# def startElement(self, name, attrs): -# if (name == "sat"): -# #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',"")) -# tpos = int(attrs.get('position',"")) -# if tpos < 0: -# tpos = 3600 + tpos -# tname = attrs.get('name',"").encode("UTF-8") -# tflags = int(attrs.get('flags', '0')) -# self.satellites[tpos] = tname -# self.satList.append( (tpos, tname, tflags) ) -# self.parsedSat = int(tpos) -# elif (name == "transponder"): -# modulation = int(attrs.get('modulation',"1")) # QPSK default -# system = int(attrs.get('system',"0")) # DVB-S default -# freq = int(attrs.get('frequency',"")) -# sr = int(attrs.get('symbol_rate',"")) -# pol = int(attrs.get('polarization',"")) -# fec = int(attrs.get('fec_inner',"0")) # AUTO default -# if self.parsedSat in self.transponders: -# pass -# else: -# self.transponders[self.parsedSat] = [ ] -# -# self.transponders[self.parsedSat].append((0, freq, sr, pol, fec, system, modulation)) - -# class parseCables(ContentHandler): -# 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") -# tflags = int(attrs.get('flags', '0')) -# self.cablesList.append((tname, tflags)) -# self.parsedCab = tname -# elif (name == "transponder"): -# freq = int(attrs.get('frequency',"")) -# 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, sr, mod, fec)) -# -# class parseTerrestrials(ContentHandler): -# def __init__(self, terrestrialsList, transponders): -# self.isPointsElement, self.isReboundsElement = 0, 0 -# self.terrestrialsList = terrestrialsList -# self.transponders = transponders -# -# def startElement(self, name, attrs): -# if (name == "terrestrial"): -# #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',"")) -# tname = attrs.get('name',"").encode("UTF-8") -# tflags = int(attrs.get('flags', '0')) -# self.terrestrialsList.append((tname, tflags)) -# self.parsedTer = str(tname) -# elif (name == "transponder"): -# # TODO finish this! -# freq = int(attrs.get('centre_frequency',"")) -# bw = int(attrs.get('bandwidth',"3")) # AUTO -# const = int(attrs.get('constellation',"1")) # AUTO -# crh = int(attrs.get('code_rate_hp',"5")) # AUTO -# if crh > 5: # our terrestrial.xml is buggy... 6 for AUTO -# crh = 5 -# crl = int(attrs.get('code_rate_lp',"5")) # AUTO -# if crl > 5: # our terrestrial.xml is buggy... 6 for AUTO -# crl = 5 -# guard = int(attrs.get('guard_interval',"4")) # AUTO -# transm = int(attrs.get('transmission_mode',"2")) # AUTO -# hierarchy = int(attrs.get('hierarchy_information',"4")) # AUTO -# inv = int(attrs.get('inversion',"2")) # AUTO -# if self.parsedTer in self.transponders: -# pass -# else: -# self.transponders[self.parsedTer] = [ ] -# -# self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv)) + def getConfiguredSats(self): + return self.sec.getConfiguredSats() def getTransponders(self, pos): if self.transponders.has_key(pos): @@ -533,9 +485,6 @@ class NimManager: def getTerrestrialFlags(self, nim): return self.terrestrialsList[config.Nims[nim].terrestrial.index][1] - def getConfiguredSats(self): - return self.sec.getSatList() - def getSatDescription(self, pos): return self.satellites[pos] @@ -547,13 +496,8 @@ class NimManager: self.transponderscable = { } self.transpondersterrestrial = { } db = eDVBDB.getInstance() - -# parser = make_parser() 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') db.readSatellites(self.satList, self.satellites, self.transponders) # print "SATLIST", self.satList # print "SATS", self.satellites @@ -561,18 +505,12 @@ class NimManager: 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') db.readCables(self.cablesList, self.transponderscable) # print "CABLIST", self.cablesList # print "TRANSPONDERS", self.transponders 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') db.readTerrestrials(self.terrestrialsList, self.transpondersterrestrial) # print "TERLIST", self.terrestrialsList # print "TRANSPONDERS", self.transpondersterrestrial @@ -619,6 +557,12 @@ class NimManager: entries[current_slot]["type"] = str(line.strip()[6:]) elif line.strip().startswith("Name:"): entries[current_slot]["name"] = str(line.strip()[6:]) + elif line.strip().startswith("Has_Outputs:"): + input = str(line.strip()[len("Has_Outputs:") + 1:]) + entries[current_slot]["has_outputs"] = (input == "yes") + elif line.strip().startswith("Internally_Connectable:"): + input = int(line.strip()[len("Internally_Connectable:") + 1:]) + entries[current_slot]["internally_connectable"] = input elif line.strip().startswith("empty"): entries[current_slot]["type"] = None entries[current_slot]["name"] = _("N/A") @@ -628,13 +572,23 @@ class NimManager: 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"])) + if not (entry.has_key("has_outputs")): + entry["has_outputs"] = True + if not (entry.has_key("internally_connectable")): + entry["internally_connectable"] = None + self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"])) def hasNimType(self, chktype): for slot in self.nim_slots: if slot.isCompatible(chktype): return True return False + + def getNimType(self, slotid): + return self.nim_slots[slotid].type + + def getNimDescription(self, slotid): + return self.nim_slots[slotid].friendly_full_description def getNimListOfType(self, type, exception = -1): # returns a list of indexes for NIMs compatible to the given type, except for 'exception' @@ -658,6 +612,59 @@ class NimManager: for slot in self.nim_slots: list.append(slot.friendly_full_description) return list + + def getSlotCount(self): + return len(self.nim_slots) + + def hasOutputs(self, slotid): + return self.nim_slots[slotid].hasOutputs() + + def canConnectTo(self, slotid): + slots = [] + if self.nim_slots[slotid].internallyConnectableTo() is not None: + slots.append(self.nim_slots[slotid].internallyConnectableTo()) + for type in self.nim_slots[slotid].connectableTo(): + for slot in self.getNimListOfType(type, exception = slotid): + # FIXME we restrict loopthrough from dvb-s2 to dvb-s, because the c++ part can't handle it + if not (type == "DVB-S" and self.getNimType(slot)): + if self.hasOutputs(slot): + slots.append(slot) + slots.sort() + + return slots + + def canEqualTo(self, slotid): + type = self.getNimType(slotid) + if self.getNimConfig(slotid) == "DVB-S2": + type = "DVB-S" + nimList = self.getNimListOfType(type, slotid) + for nim in nimList[:]: + mode = self.getNimConfig(nim) + if mode.configMode.value == "loopthrough" or mode.configMode.value == "satposdepends": + nimList.remove(nim) + return nimList + + def canDependOn(self, slotid): + type = self.getNimType(slotid) + if self.getNimConfig(slotid) == "DVB-S2": + type = "DVB-S" + nimList = self.getNimListOfType(type, slotid) + positionerList = [] + for nim in nimList[:]: + mode = self.getNimConfig(nim) + if mode.configMode.value == "simple" and mode.diseqcMode.value == "positioner": + alreadyConnected = False + for testnim in nimList: + testmode = self.getNimConfig(testnim) + if testmode.configMode.value == "satposdepends" and int(testmode.connectedTo.value) == int(nim): + alreadyConnected = True + break + if not alreadyConnected: + positionerList.append(nim) + return positionerList + + def getNimConfig(self, slotid): + return config.Nims[slotid] def getSatList(self): return self.satList @@ -763,7 +770,7 @@ def InitSecParams(): 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, limits = (0, 9999)) + x = ConfigInteger(default=360, limits = (0, 9999)) x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_RUNNING_TIMEOUT, configElement.value)) config.sec.motor_running_timeout = x @@ -792,43 +799,32 @@ def InitNimManager(nimmgr): x = slot.slot nim = config.Nims[x] - # HACK: currently, we can only looptrough to socket A - if slot.isCompatible("DVB-S"): - if slot.slot == 0: - nim.configMode = ConfigSelection( - choices = { - "simple": _("simple"), - "advanced": _("advanced"), - "nothing": _("nothing connected"), - }, - default = "simple") - else: - nim.configMode = ConfigSelection( - choices = { - "equal": _("equal to Socket A"), - "loopthrough": _("loopthrough to socket A"), - "nothing": _("nothing connected"), - "satposdepends": _("second cable of motorized LNB"), - "simple": _("simple"), - "advanced": _("advanced")}, - default = "loopthrough") + choices = { "nothing": _("nothing connected"), + "simple": _("simple"), + "advanced": _("advanced")} + if len(nimmgr.getNimListOfType(slot.type, exception = x)) > 0: + choices["equal"] = _("equal to") + choices["satposdepends"] = _("second cable of motorized LNB") + if len(nimmgr.canConnectTo(x)) > 0: + choices["loopthrough"] = _("loopthrough to") + nim.configMode = ConfigSelection(choices = choices, default = "nothing") #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 - nim.configMode.value = "simple" - nim.configMode.save() - else: +# if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]: +# if x == 0: # first one can never be linked to anything +# # reset to simple +# nim.configMode.value = "simple" +# nim.configMode.save() +# else: #FIXME: make it better - 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() + 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() nim.diseqcMode = ConfigSelection( choices = [ @@ -839,6 +835,11 @@ def InitNimManager(nimmgr): ("positioner", _("Positioner"))], default = "diseqc_a_b") + choices = [] + for id in nimmgr.getNimListOfType("DVB-S"): + if id != x: + choices.append((str(id), nimmgr.getNimDescription(id))) + nim.connectedTo = ConfigSelection(choices = choices) nim.diseqcA = getConfigSatlist(192, nimmgr.satList) nim.diseqcB = getConfigSatlist(130, nimmgr.satList) nim.diseqcC = ConfigSatlist(list = nimmgr.satList) @@ -859,19 +860,6 @@ def InitNimManager(nimmgr): 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("DVB-S", slot.slot) - satNimListNames = {} - - for x in satNimList: - 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) # advanced config: nim.advanced = ConfigSubsection() @@ -950,8 +938,8 @@ def InitNimManager(nimmgr): possible_scan_types = [("bands", _("Frequency bands")), ("steps", _("Frequency steps"))] if n: possible_scan_types.append(("provider", _("Provider"))) + nim.cable.scan_provider = ConfigSelection(default = "0", choices = list) 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)