X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a8fd8e5e6c8a56c2e8dcdfbf7927b7e31221fd9a..b209ca0ac28a2e1ddc1f27642b0dec0f376b0ad2:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 5154e2b0..7d148f3c 100644
--- 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 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.
@@ -565,9 +572,10 @@ class NimManager:
 		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"
@@ -891,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 = 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