X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3b898971c9e352bec83dfcab5b9d6ae3534df719..9b4f2ccafd195174ea0c9846f4a8bafaf69c2b4c:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index a63a9c83..5e66b6a6 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -44,9 +44,11 @@ class SecConfigure: 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) @@ -69,7 +71,8 @@ class SecConfigure: 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) @@ -84,7 +87,7 @@ class SecConfigure: sec.setVoltageMode(0) sec.setToneMode(0) sec.setRotorPosNum(0) # USALS - + sec.setLNBSlotMask(tunermask) def setSatposDepends(self, sec, nim1, nim2): @@ -94,6 +97,15 @@ class SecConfigure: def linkNIMs(self, sec, nim1, nim2): print "link tuner", nim1, "to tuner", nim2 sec.setTunerLinked(nim1, nim2) + + 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() @@ -121,20 +133,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: @@ -206,9 +228,11 @@ class SecConfigure: 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) @@ -357,7 +381,7 @@ class SecConfigure: self.update() class NIM(object): - def __init__(self, slot, type, description, has_outputs = True): + 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]: @@ -367,6 +391,7 @@ class NIM(object): self.type = type self.description = description self.has_outputs = has_outputs + self.internally_connectable = internally_connectable def isCompatible(self, what): compatible = { @@ -377,6 +402,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. @@ -391,6 +425,9 @@ class NIM(object): def hasOutputs(self): return self.has_outputs + + def internallyConnectableTo(self): + return self.internally_connectable slot_id = property(getSlotID) @@ -524,8 +561,11 @@ class NimManager: elif line.strip().startswith("Name:"): entries[current_slot]["name"] = str(line.strip()[6:]) elif line.strip().startswith("Has_Outputs:"): - input = str(line.strip()[6:]) - entries[current_slot]["has_outputs"] = (input == "yes") + 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") @@ -537,13 +577,21 @@ class NimManager: entry["type"] = None if not (entry.has_key("has_outputs")): entry["has_outputs"] = True - self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"])) + 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' @@ -568,11 +616,69 @@ class NimManager: 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 @@ -580,40 +686,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 @@ -654,6 +764,10 @@ def InitSecParams(): x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value)) config.sec.delay_after_toneburst = 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 + 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 @@ -662,7 +776,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 @@ -670,15 +784,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 @@ -686,10 +800,6 @@ def InitSecParams(): 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 @@ -707,43 +817,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 = [ @@ -754,6 +853,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) @@ -774,19 +878,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()