if self.equal.has_key(slotid):
for slot in self.equal[slotid]:
tunermask |= (1 << slot)
- elif self.linked.has_key(slotid):
+ if self.linked.has_key(slotid):
for slot in self.linked[slotid]:
tunermask |= (1 << slot)
sec.setLNBSatCR(-1)
if self.equal.has_key(slotid):
for slot in self.equal[slotid]:
tunermask |= (1 << slot)
- elif self.linked.has_key(slotid):
+ if self.linked.has_key(slotid):
for slot in self.linked[slotid]:
tunermask |= (1 << slot)
elif dm == "1_2":
sec.setDiSEqCMode(diseqcParam.V1_2)
- if self.satposdepends.has_key(slotid):
- for slot in self.satposdepends[slotid]:
- tunermask |= (1 << slot)
+ if self.satposdepends.has_key(slotid):
+ for slot in self.satposdepends[slotid]:
+ tunermask |= (1 << slot)
if dm != "none":
if currLnb.toneburst.value == "none":
def getSatDescription(self, pos):
return self.satellites[pos]
+ def sortFunc(self, x):
+ orbpos = x[0]
+ if orbpos > 1800:
+ return orbpos - 3600
+ else:
+ return orbpos + 1800
+
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.
if self.hasNimType("DVB-S"):
print "Reading satellites.xml"
db.readSatellites(self.satList, self.satellites, self.transponders)
-# print "SATLIST", self.satList
-# print "SATS", self.satellites
-# print "TRANSPONDERS", self.transponders
+ self.satList.sort(key = self.sortFunc) # sort by orbpos
+ #print "SATLIST", self.satList
+ #print "SATS", self.satellites
+ #print "TRANSPONDERS", self.transponders
if self.hasNimType("DVB-C"):
print "Reading cables.xml"
def getSatList(self):
return self.satList
+
+ # returns True if something is configured to be connected to this nim
+ # if slotid == -1, returns if something is connected to ANY nim
+ def somethingConnected(self, slotid = -1):
+ if (slotid == -1):
+ connected = False
+ for id in range(self.getSlotCount()):
+ if self.somethingConnected(id):
+ connected = True
+ return connected
+ else:
+ nim = config.Nims[slotid]
+ configMode = nim.configMode.value
+
+ if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C"):
+ return not (configMode == "nothing")
def getSatListForNim(self, slotid):
list = []
config.sec.delay_after_last_diseqc_command = x
x = ConfigInteger(default=50, limits = (0, 9999))
- x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_TONEBURST, configElement.value), initial_call = False)
+ 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_MEASURE_IDLE_INPUTPOWER, configElement.value))
config.sec.delay_after_voltage_change_before_measure_idle_inputpower = x
- x = ConfigInteger(default=750, limits = (0, 9999))
+ x = ConfigInteger(default=900, limits = (0, 9999))
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
lnb_choices = {
"universal_lnb": _("Universal LNB"),
- "unicable": _("Unicable"),
+# "unicable": _("Unicable"),
"c_band": _("C-Band"),
"user_defined": _("User defined")}