X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba69f834f64b37f64efe58b872b5e1a9df4e9e88..811adc0b841cadc54fd8f07f6d0925a558684178:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 2f0f088a..31c09446 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -18,6 +18,8 @@ from Tools import XMLTools from xml.sax import make_parser from xml.sax.handler import ContentHandler +from Tools.BoundFunction import boundFunction + def tryOpen(filename): try: procFile = open(filename) @@ -84,13 +86,6 @@ class SecConfigure: self.NimManager = nimmgr self.update() -class boundFunction: - def __init__(self, fnc, *args): - self.fnc = fnc - self.args = args - def __call__(self, *args): - self.fnc(*self.args + args) - class nimSlot: def __init__(self, slotid, nimtype, name): self.slotid = slotid @@ -125,6 +120,61 @@ class NimManager: self.transponders[self.parsedSat].append((0, freq, sr, pol, fec)) + class parseCables(ContentHandler): + def __init__(self, cablesList, transponders): + self.isPointsElement, self.isReboundsElement = 0, 0 + self.cablesList = cablesList + 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',"") + self.cablesList.append(str(tname)) + self.parsedCab = str(tname) + elif (name == "transponder"): + freq = int(attrs.get('frequency',"")) + sr = int(attrs.get('symbol_rate',"")) + mod = int(attrs.get('modulation',"")) + fec = int(attrs.get('fec_inner',"")) + if self.parsedCab in self.transponders: + pass + else: + self.transponders[self.parsedCab] = [ ] + + self.transponders[self.parsedCab].append((0, 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',"") + tflags = attrs.get('flags',"") + 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',"")) + const = int(attrs.get('constellation',"")) + crh = int(attrs.get('code_rate_hp',"")) + crl = int(attrs.get('code_rate_lp',"")) + guard = int(attrs.get('guard_interval',"")) + transm = int(attrs.get('transmission_mode',"")) + hierarchy = int(attrs.get('hierarchy_information',"")) + inv = int(attrs.get('inversion',"")) + if self.parsedTer in self.transponders: + pass + else: + self.transponders[self.parsedTer] = [ ] + + self.transponders[self.parsedTer].append((0, freq, bw, const, crh, crl, guard, transm, hierarchy, inv)) + def getTransponders(self, pos): return self.transponders[pos] @@ -137,16 +187,31 @@ class NimManager: def readSatsfromFile(self): self.satellites = { } self.transponders = { } - - print "Reading satellites.xml" + self.transponderscable = { } + self.transpondersterrestrial = { } + parser = make_parser() - satHandler = self.parseSats(self.satList, self.satellites, self.transponders) - parser.setContentHandler(satHandler) - parser.parse('/etc/tuxbox/satellites.xml') + if (self.hasNimType(self.nimType["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"])): + 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"])): + print "Reading terrestrial.xml" + terHandler = self.parseTerrestrials(self.terrestrialsList, self.transpondersterrestrial) + parser.setContentHandler(terHandler) + parser.parse('/etc/tuxbox/terrestrial.xml') def parseProc(self): self.nimTypes = {} self.nimNames = {} + self.nimSocketCount = 0 nimfile = tryOpen("/proc/bus/nim_sockets") if nimfile == "": @@ -162,6 +227,7 @@ class NimManager: parts = line.strip().split(" ") id = int(parts[2][:1]) lastsocket = int(id) + self.nimSocketCount += 1 elif line.strip().startswith("Type:"): self.nimTypes[lastsocket] = str(line.strip()[6:]) elif line.strip().startswith("Name:"): @@ -180,8 +246,20 @@ class NimManager: return self.nimNames[slotID] def getNimSocketCount(self): - #FIXME get it from /proc - return 2 + return self.nimSocketCount + + def hasNimType(self, chktype): + for id, type in self.nimTypes.items(): + if (chktype == self.nimType[str(type)]): + return True + return False + + def getNimListOfType(self, type, exception = -1): + list = [] + for x in self.nimslots: + if ((x.nimType == type) and (x.slotid != exception)): + list.append(x.slotid) + return list def getConfigPrefix(self, slotid): return "config.Nim" + ("A","B","C","D")[slotid] + "." @@ -192,14 +270,16 @@ class NimManager: "DVB-S": 0, "DVB-C": 1, "DVB-T": 2} - self.satList = [ ] + self.satList = [ ] + self.cablesList = [] + self.terrestrialsList = [] - self.readSatsfromFile() + self.parseProc() + + self.readSatsfromFile() self.nimCount = self.getNimSocketCount() - self.parseProc() - self.nimslots = [ ] x = 0 while x < self.nimCount: @@ -241,8 +321,16 @@ class NimManager: #callbacks for c++ config def nimConfigModeChanged(self, slotid, mode): - #print "nimConfigModeChanged set to " + str(mode) - pass + if (mode != 1): # not linked + print "Unlinking slot " + str(slotid) + # TODO call c++ to unlink nim in slot slotid + if (mode == 1): # linked + if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0): + print "Linking slot " + str(slotid) + " to " + str(nimmgr.getConfigPrefix(slotid).value) + # TODO call c++ to link nim in slot slotid with nim in slot nimmgr.getConfigPrefix(slotid).value + def nimLinkedToChanged(self, slotid, val): + print "Linking slot " + str(slotid) + " to " + str(val) + # TODO call c++ to link nim in slot slotid with nim in slot val def nimDiseqcModeChanged(self, slotid, mode): #print "nimDiseqcModeChanged set to " + str(mode) pass @@ -260,7 +348,6 @@ class NimManager: #print "nimDiseqcD set to " + str(val) pass - def InitNimManager(nimmgr): config.Nims = [] for x in range(nimmgr.nimCount): @@ -268,6 +355,8 @@ def InitNimManager(nimmgr): def nimConfigModeChanged(slotid, configElement): nimmgr.nimConfigModeChanged(slotid, configElement.value) + def nimLinkedToChanged(slotid, configElement): + nimmgr.nimLinkedToChanged(slotid, configElement.value) def nimDiseqcModeChanged(slotid, configElement): nimmgr.nimDiseqcModeChanged(slotid, configElement.value) @@ -286,14 +375,20 @@ def InitNimManager(nimmgr): nim = config.Nims[x] if slot.nimType == nimmgr.nimType["DVB-S"]: - nim.configMode = configElement(cname + "configMode",configSelection, 0, (_("Simple"), _("Advanced"))); - nim.diseqcMode = configElement(cname + "diseqcMode",configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner"))); - nim.diseqcA = configElement(cname + "diseqcA",configSatlist, 192, nimmgr.satList); - nim.diseqcB = configElement(cname + "diseqcB",configSatlist, 130, nimmgr.satList); - nim.diseqcC = configElement(cname + "diseqcC",configSatlist, 0, nimmgr.satList); - nim.diseqcD = configElement(cname + "diseqcD",configSatlist, 0, nimmgr.satList); - nim.longitude = configElement(cname + "longitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); - nim.latitude = configElement(cname + "latitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); + nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # _("Advanced"))); + nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner"))); + nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList); + nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList); + nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList); + nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList); + nim.longitude = configElement(cname + "longitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); + nim.latitude = configElement(cname + "latitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); + + satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid) + satNimListNames = [] + for x in satNimList: + satNimListNames.append(_("Slot ") + ("A", "B", "C", "D")[x] + ": " + nimmgr.getNimName(x)) + nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames); #perhaps the instance of the slot is more useful? nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x)) @@ -302,6 +397,11 @@ def InitNimManager(nimmgr): nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x)) nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x)) nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x)) + nim.linkedTo.addNotifier(boundFunction(nimLinkedToChanged,x)) + elif slot.nimType == nimmgr.nimType["DVB-C"]: + nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList); + elif slot.nimType == nimmgr.nimType["DVB-T"]: + nim.cable = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList); else: print "pls add support for this frontend type!"