X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5f822e0c76f2b475589ee3fe3e4fa2194374477f..e6c11dc8aed12ed11dcdcba98a14071308e33e0d:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index d54ebb37..f8dab123 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -1,20 +1,18 @@ -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, eDVBDB -import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag -from Tools import XMLTools +from time import localtime, mktime +from datetime import datetime -from xml.sax import make_parser -from xml.sax.handler import ContentHandler - -from Tools.BoundFunction import boundFunction +from sets import Set def getConfigSatlist(orbpos, satlist): default_orbpos = None @@ -32,14 +30,25 @@ def tryOpen(filename): 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 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) @@ -55,30 +64,31 @@ 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: - 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]) + for slot in self.satposdepends[slotid]: + tunermask |= (1 << slot) sec.setLatitude(latitude) sec.setLaDirection(laDirection) sec.setLongitude(longitude) sec.setLoDirection(loDirection) - sec.setUseInputpower(True) - sec.setInputpowerDelta(50) + sec.setUseInputpower(useInputPower) + sec.setInputpowerDelta(inputPowerDelta) + sec.setRotorTurningSpeed(turningSpeed) 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.setLNBTunerMask(tunermask) + + sec.setLNBSlotMask(tunermask) def setSatposDepends(self, sec, nim1, nim2): print "tuner", nim1, "depends on satpos of", nim2 @@ -87,22 +97,35 @@ 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 = { } self.equal = { } - + nim_slots = self.NimManager.nim_slots - + + used_nim_slots = [ ] + + for slot in nim_slots: + if slot.type is not None: + used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False)) + eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots) + for slot in nim_slots: x = slot.slot nim = slot.config @@ -110,73 +133,115 @@ 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 - if nim.configMode.value == "loopthrough": - self.linkNIMs(sec, x, int(nim.linkedTo.value)) - self.linked[int(nim.linkedTo.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.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 - if nim.configMode.value in [ "loopthrough", "satposdepends", "equal", "nothing" ]: + print "diseqcmode: ", nim.diseqcMode.value + 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 + inputPowerDelta=50 + useInputPower=False + turning_speed=0 + if nim.powerMeasurement.value: + useInputPower=True + inputPowerDelta=nim.powerThreshold.value + 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, + useInputPower = useInputPower, + inputPowerDelta = inputPowerDelta) + elif nim.configMode.value == "advanced": #advanced config + self.updateAdvanced(sec, x) print "sec config completed" def updateAdvanced(self, sec, slotid): lnbSat = {} - for x in range(1,33): + for x in range(1,129): lnbSat[x] = [] + + #wildcard for all satellites ( for rotor ) + for x in range(3601, 3605): + lnb = int(config.Nims[slotid].advanced.sat[x].lnb.value) + if lnb != 0: + for x in self.NimManager.satList: + print "add", x[0], "to", lnb + lnbSat[lnb].append(x[0]) + for x in self.NimManager.satList: lnb = int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) if lnb != 0: print "add", x[0], "to", lnb lnbSat[lnb].append(x[0]) - for x in range(1,33): + + for x in range(1,129): if len(lnbSat[x]) > 0: currLnb = config.Nims[slotid].advanced.lnb[x] 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) if currLnb.lof.value == "universal_lnb": sec.setLNBLOFL(9750000) @@ -190,18 +255,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": @@ -221,10 +286,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, @@ -237,9 +302,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: @@ -254,9 +319,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" @@ -277,18 +342,27 @@ 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]: - sec.addSatellite(y) + self.addSatellite(sec, y) currSat = config.Nims[slotid].advanced.sat[y] if currSat.voltage.value == "polarization": @@ -305,17 +379,18 @@ class SecConfigure: elif currSat.tonemode == "off": sec.setToneMode(switchParam.OFF) - if not currSat.usals.value: + if not currSat.usals.value and x < 125: sec.setRotorPosNum(currSat.rotorposition.value) else: sec.setRotorPosNum(0) #USALS 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]: @@ -324,6 +399,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 = { @@ -334,6 +411,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. @@ -345,6 +431,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) @@ -372,100 +464,11 @@ class NIM(object): 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) - - cable_trust_nit = property(lambda self: self.config.cabletype.value == "quick") 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") - self.satellites[tpos] = tname - self.satList.append( (tpos, tname) ) - 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 - 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) - 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 - if self.parsedCab in self.transponders: - pass - else: - self.transponders[self.parsedCab] = [ ] - self.transponders[self.parsedCab].append((1, freq)) - - 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 = 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',"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): @@ -473,54 +476,56 @@ 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] - + 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] 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] - def readSatsfromFile(self): + def readTransponders(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() - + self.transpondersterrestrial = { } + db = eDVBDB.getInstance() 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 +# print "TRANSPONDERS", self.transponders 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 def enumerateNIMs(self): # enum available NIMs. This is currently very dreambox-centric and uses the /proc/bus/nim_sockets interface. @@ -542,6 +547,9 @@ class NimManager: # # Type will be either "DVB-S", "DVB-S2", "DVB-T", "DVB-C" or None. + # nim_slots is an array which has exactly one entry for each slot, even for empty ones. + self.nim_slots = [ ] + nimfile = tryOpen("/proc/bus/nim_sockets") if nimfile is None: @@ -561,25 +569,38 @@ 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") nimfile.close() - # 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"])) + 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' @@ -594,8 +615,7 @@ class NimManager: self.cablesList = [] self.terrestrialsList = [] self.enumerateNIMs() - self.readSatsfromFile() - + self.readTransponders() InitNimManager(self) #init config stuff # get a list with the friendly full description @@ -604,6 +624,70 @@ 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): + if self.hasOutputs(slot): + slots.append(slot) + # remove nims, that have a conntectedTo reference on + for testnim in slots[:]: + for nim in self.getNimListOfType("DVB-S", slotid): + nimConfig = self.getNimConfig(nim) + if nimConfig.content.items.has_key("configMode") and nimConfig.configMode.value == "loopthrough" and int(nimConfig.connectedTo.value) == testnim: + slots.remove(testnim) + break + 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 getSatName(self, pos): + for sat in self.satList: + if sat[0] == pos: + return sat[1] + return _("N/A") def getSatList(self): return self.satList @@ -611,40 +695,44 @@ class NimManager: def getSatListForNim(self, slotid): list = [] if self.nim_slots[slotid].isCompatible("DVB-S"): + nim = config.Nims[slotid] #print "slotid:", slotid #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.index] #print "diseqcA:", config.Nims[slotid].diseqcA.value - configMode = config.Nims[slotid].configMode.value + configMode = nim.configMode.value if configMode == "equal": - slotid=0 #FIXME add handling for more than two tuners !!! - configMode = config.Nims[slotid].configMode.value + slotid = int(nim.connectedTo.value) + nim = config.Nims[slotid] + configMode = nim.configMode.value + elif configMode == "loopthrough": + slotid = self.sec.getRoot(slotid, int(nim.connectedTo.value)) + nim = config.Nims[slotid] + configMode = nim.configMode.value if configMode == "simple": - dm = config.Nims[slotid].diseqcMode.value + dm = nim.diseqcMode.value if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - list.append(self.satList[config.Nims[slotid].diseqcA.index]) + list.append(self.satList[nim.diseqcA.index]) if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]: - list.append(self.satList[config.Nims[slotid].diseqcB.index]) + list.append(self.satList[nim.diseqcB.index]) if dm == "diseqc_a_b_c_d": - list.append(self.satList[config.Nims[slotid].diseqcC.index]) - list.append(self.satList[config.Nims[slotid].diseqcD.index]) + list.append(self.satList[nim.diseqcC.index]) + list.append(self.satList[nim.diseqcD.index]) if dm == "positioner": for x in self.satList: list.append(x) elif configMode == "advanced": for x in self.satList: - if int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) != 0: + if int(nim.advanced.sat[x[0]].lnb.value) != 0: list.append(x) - return list def getRotorSatListForNim(self, slotid): list = [] if self.nim_slots[slotid].isCompatible("DVB-S"): #print "slotid:", slotid - #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] #print "diseqcA:", config.Nims[slotid].diseqcA.value configMode = config.Nims[slotid].configMode.value @@ -685,7 +773,11 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value)) config.sec.delay_after_toneburst = x - x = ConfigInteger(default=750, limits = (0, 9999)) + 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 + + 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 @@ -693,7 +785,7 @@ def InitSecParams(): 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, limits = (0, 9999)) + x = ConfigInteger(default=500, 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 @@ -701,15 +793,15 @@ def InitSecParams(): 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, limits = (0, 9999)) + x = ConfigInteger(default=500, 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, limits = (0, 9999)) + x = ConfigInteger(default=500, 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, 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 @@ -717,6 +809,11 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.MOTOR_COMMAND_RETRIES, configElement.value)) config.sec.motor_command_retries = 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() @@ -729,43 +826,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 = [ @@ -776,6 +862,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) @@ -789,26 +880,21 @@ 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") - - # get other frontends of the same type - satNimList = nimmgr.getNimListOfType(slot.type, 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) + nim.powerMeasurement = ConfigYesNo(default=True) + nim.powerThreshold = ConfigInteger(default=50, limits=(0, 100)) + 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) # advanced config: nim.advanced = ConfigSubsection() - nim.advanced.sats = getConfigSatlist(192,nimmgr.satList) + tmp = [(3601, _('All Satellites 1'), 1), (3602, _('All Satellites 2'), 1), (3603, _('All Satellites 3'), 1), (3604, _('All Satellites 4'), 1)] + nim.advanced.sats = getConfigSatlist(192,nimmgr.satList+tmp) nim.advanced.sat = ConfigSubDict() lnbs = [("0", "not available")] - for y in range(1, 33): + for y in range(1, 125): lnbs.append((str(y), "LNB " + str(y))) for x in nimmgr.satList: @@ -819,6 +905,15 @@ def InitNimManager(nimmgr): nim.advanced.sat[x[0]].rotorposition = ConfigInteger(default=1, limits=(1, 255)) nim.advanced.sat[x[0]].lnb = ConfigSelection(choices = lnbs) + for x in range(3601, 3605): + nim.advanced.sat[x] = ConfigSubsection() + nim.advanced.sat[x].voltage = ConfigSelection(choices={"polarization": _("Polarization"), "13V": _("13 V"), "18V": _("18 V")}, default = "polarization") + nim.advanced.sat[x].tonemode = ConfigSelection(choices={"band": _("Band"), "on": _("On"), "off": _("Off")}, default = "band") + nim.advanced.sat[x].usals = ConfigYesNo(default=True) + nim.advanced.sat[x].rotorposition = ConfigInteger(default=1, limits=(1, 255)) + lnbnum = 125+x-3601 + nim.advanced.sat[x].lnb = ConfigSelection(choices = [("0", "not available"), (str(lnbnum), "LNB %d"%(lnbnum))], default="0") + 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))) @@ -829,7 +924,7 @@ def InitNimManager(nimmgr): nim.advanced.lnb = ConfigSubList() nim.advanced.lnb.append(ConfigNothing()) - for x in range(1, 33): + for x in range(1, 129): nim.advanced.lnb.append(ConfigSubsection()) nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb") nim.advanced.lnb[x].lofl = ConfigInteger(default=9750, limits = (0, 99999)) @@ -838,7 +933,10 @@ def InitNimManager(nimmgr): # nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V") nim.advanced.lnb[x].increased_voltage = ConfigYesNo(default=False) nim.advanced.lnb[x].toneburst = ConfigSelection(choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))], default = "none") - nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none") + if x > 124: + nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("1_2", _("1.2"))], default = "1_2") + else: + nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none") nim.advanced.lnb[x].commitedDiseqcCommand = ConfigSelection(choices = csw) nim.advanced.lnb[x].fastDiseqc = ConfigYesNo(default=False) nim.advanced.lnb[x].sequenceRepeat = ConfigYesNo(default=False) @@ -859,15 +957,51 @@ 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)) - + 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.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))], default = "complete") 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_provider = ConfigSelection(default = "0", choices = list) + nim.cable.scan_type = ConfigSelection(default = "bands", choices = possible_scan_types) + 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 = { @@ -883,6 +1017,7 @@ 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