X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/494697a00628cf277bd00b85967efbbe61f4fcee..c1311444ea249a45d0eceefa15d77fce410a54da:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index aef62f6e..648e6e7f 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -162,13 +162,13 @@ class ScanSetup(Screen):
 			nimList = [ ]
 			for nim in nimmanager.nimList():
 				nimList.append(nim[0])
-			nimList.append("all")
+			#nimList.append("all")
 			config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList)
 
 			# sat
 			config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000)))
 			config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (_("on"), _("off"), _("Auto")))
-			config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 9999)))
+			config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 99999)))
 			config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, (_("horizontal"), _("vertical"),  _("circular left"), _("circular right")))
 			config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto"))
 
@@ -177,7 +177,7 @@ class ScanSetup(Screen):
 			config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 2, (_("off"), _("on"), _("Auto")))
 			config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 2, ("16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM", _("Auto")))
 			config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 9, (_("None"), "1/2", "2/3", "3/4", "4/5", "5/6", "6/7", "7/8", "8/9", _("Auto")))
-			config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000)))
+			config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 9999)))
 
 			# terrestial
 			config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000)))
@@ -301,9 +301,11 @@ class ScanSetup(Screen):
 
 		feid = config.scan.nims.value
 		# flags |= eComponentScan.scanSearchBAT
-		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, flags)
+		self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, flags)
 
 		#self.close()
+	def doNothing(self):
+		pass
 
 	def keyCancel(self):
 		for x in self["config"].list:
@@ -312,7 +314,7 @@ class ScanSetup(Screen):
 
 class ScanSimple(Screen):
 
-	def keyOK(self):
+	def run(self):
 		print "start scan for sats:"
 		tlist = [ ]
 		for x in self.list:
@@ -321,8 +323,23 @@ class ScanSimple(Screen):
 				getInitialTransponderList(tlist, x[1].parent.configPath)
 
 		feid = 0 # FIXME
-		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
+		self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
+		
 
+	def keyGo(self):
+		print "start scan for sats:"
+		tlist = [ ]
+		for x in self.list:
+			if x[1].parent.value == 0:
+				print "   " + str(x[1].parent.configPath)
+				getInitialTransponderList(tlist, x[1].parent.configPath)
+
+		feid = 0 # FIXME
+		self.session.openWithCallback(self.doNothing, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
+
+	def doNothing(self):
+		pass
+	
 	def keyCancel(self):
 		self.close()
 
@@ -343,7 +360,7 @@ class ScanSimple(Screen):
 
 		self["actions"] = ActionMap(["SetupActions"],
 		{
-			"ok": self.keyOK,
+			"ok": self.keyGo,
 			"cancel": self.keyCancel,
 			"left": self.keyLeft,
 			"right": self.keyRight,