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"
dm = nim.diseqcMode.value
if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
if nim.diseqcA.orbital_position != 3601:
- list.append(nim.diseqcA.getSat())
+ list.append(self.satList[nim.diseqcA.index-1])
if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
if nim.diseqcB.orbital_position != 3601:
- list.append(nim.diseqcB.getSat())
+ list.append(self.satList[nim.diseqcB.index-1])
if dm == "diseqc_a_b_c_d":
if nim.diseqcC.orbital_position != 3601:
- list.append(nim.diseqcC.getSat())
+ list.append(self.satList[nim.diseqcC.index-1])
if nim.diseqcD.orbital_position != 3601:
- list.append(nim.diseqcD.getSat())
+ list.append(self.satList[nim.diseqcD.index-1])
if dm == "positioner":
for x in self.satList:
list.append(x)
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