git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_245_record_playback_fixes'
[enigma2.git]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 8d6cff165b9cd4182800040499d51b220612c038..7d148f3c0eddd1a32ba805767d8a3b2f4151a341 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-554,6
+554,13
@@
class NimManager:
def getSatDescription(self, pos):
return self.satellites[pos]
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.
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.
@@
-565,7
+572,7
@@
class NimManager:
if self.hasNimType("DVB-S"):
print "Reading satellites.xml"
db.readSatellites(self.satList, self.satellites, self.transponders)
if self.hasNimType("DVB-S"):
print "Reading satellites.xml"
db.readSatellites(self.satList, self.satellites, self.transponders)
- self.satList.sort(key =
lambda x: x[0]
) # sort by orbpos
+ self.satList.sort(key =
self.sortFunc
) # sort by orbpos
#print "SATLIST", self.satList
#print "SATS", self.satellites
#print "TRANSPONDERS", self.transponders
#print "SATLIST", self.satList
#print "SATS", self.satellites
#print "TRANSPONDERS", self.transponders
@@
-892,7
+899,7
@@
def InitSecParams():
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.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=
75
0, limits = (0, 9999))
+ x = ConfigInteger(default=
90
0, 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
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