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)
sec.setVoltageMode(0)
sec.setToneMode(0)
sec.setRotorPosNum(0) # USALS
-
+
sec.setLNBSlotMask(tunermask)
def setSatposDepends(self, sec, nim1, nim2):
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()
# 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.connectedTo.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))
- self.linked[int(nim.connectedTo.value)]=x
+ 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.connectedTo.value))
- self.satposdepends[int(nim.connectedTo.value)]=x
+ 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:
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)
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 hasOutputs(self, slotid):
return self.nim_slots[slotid].hasOutputs()
- def connectableTo(self, slotid):
+ def canConnectTo(self, slotid):
slots = []
if self.nim_slots[slotid].internallyConnectableTo() is not None:
slots.append(self.nim_slots[slotid].internallyConnectableTo())
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]
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
x = slot.slot
nim = config.Nims[x]
- # HACK: currently, we can only looptrough to socket A
-
if slot.isCompatible("DVB-S"):
choices = { "nothing": _("nothing connected"),
"simple": _("simple"),
if len(nimmgr.getNimListOfType(slot.type, exception = x)) > 0:
choices["equal"] = _("equal to")
choices["satposdepends"] = _("second cable of motorized LNB")
- if len(nimmgr.connectableTo(x)) > 0:
+ if len(nimmgr.canConnectTo(x)) > 0:
choices["loopthrough"] = _("loopthrough to")
- nim.configMode = ConfigSelection(choices = choices, default = "simple")
+ 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 = [
choices = []
for id in nimmgr.getNimListOfType("DVB-S"):
if id != x:
- choices.append((str(id), str(chr(65 + id))))
+ choices.append((str(id), nimmgr.getNimDescription(id)))
nim.connectedTo = ConfigSelection(choices = choices)
nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
git.cweiske.de / enigma2.git / blobdiff