X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a2483900a9356c65bbd525e19aa40016f3b29aca..56bcacbaa12fba624475fcdae3d9384091d2e1a6:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 4eb05976..97e9dbec 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -7,7 +7,24 @@ from Components.config import config
 from Components.config import getConfigListEntry
 from Components.NimManager import nimmanager
 from Components.Label import Label
+from enigma import eDVBFrontendParametersSatellite
 
+def getInitialTransponderList(tlist, pos):
+	list = nimmanager.getTransponders(pos)
+	
+	for x in list:
+		if x[0] == 0:		#SAT
+			parm = eDVBFrontendParametersSatellite()
+			parm.frequency = x[1]
+			parm.symbol_rate = x[2]
+			parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti      
+			#parm.fec = x[4]			# eDVBFrontendParametersSatellite.FEC.f3_4;
+			parm.fec = 6					# AUTO
+			#parm.inversion = 1 	#eDVBFrontendParametersSatellite.Inversion.Off;
+			parm.inversion = 2 		#AUTO
+			parm.orbital_position = pos
+			tlist.append(parm)
+		
 class ScanSetup(Screen):
     def __init__(self, session):
         Screen.__init__(self, session)
@@ -86,12 +103,29 @@ class ScanSetup(Screen):
         
         # multi sat scan
         if (config.scan.type.value == 2):
-            for sat in nimmanager.satList:
-                self.list.append(getConfigListEntry(sat[0], config.scan.scansat[sat[1]]))                
+            # if (norotor)
+            tlist = []
+            SatList = nimmanager.getSatListForNim(config.scan.nims.value)
+
+            for x in SatList:
+                if self.Satexists(tlist, x[1]) == 0:
+                    tlist.append(x[1])
+                    sat = configElement_nonSave(x[1], configSelection, 0, ("Enable", "Disable"))
+                    self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat))
+            
+            # if (rotor):
+           # for sat in nimmanager.satList:
+            #    self.list.append(getConfigListEntry(sat[0], config.scan.scansat[sat[1]]))                
                 
         self["config"].list = self.list
         self["config"].l.setList(self.list)
         
+    def Satexists(self, tlist, pos):
+        for x in tlist:
+            if x == pos:
+                return 1
+        return 0    
+    
     def newConfig(self):
         print self["config"].getCurrent()
         if self["config"].getCurrent()[0] == "Type of scan":
@@ -163,7 +197,8 @@ class ScanSetup(Screen):
     def keyGo(self):
         for x in self["config"].list:
             x[1].save()
-        self.session.openWithCallback(self.keyCancel, ServiceScan)        
+				#tlist = [ ]		
+        self.session.openWithCallback(self.keyCancel, ServiceScan, [ ])        
 
         #self.close()
 
@@ -176,9 +211,13 @@ class ScanSimple(Screen):
 
 	def keyOK(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)
+				
+		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist)        
 		
 	def keyCancel(self):
 		self.close()
@@ -189,6 +228,12 @@ class ScanSimple(Screen):
 	def keyRight(self):
 		self["config"].handleKey(config.key["nextElement"])
 
+	def Satexists(self, tlist, pos):
+		for x in tlist:
+			if x == pos:
+				return 1
+		return 0
+
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
@@ -201,12 +246,15 @@ class ScanSimple(Screen):
 		}, -1)
                 
 		self.list = []
+		tlist = []
 		
 		SatList = nimmanager.getConfiguredSats()
 
 		for x in SatList:
-			sat = configElement_nonSave(x, configSelection, 0, ("Enable", "Disable"))
-			self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat))
+			if self.Satexists(tlist, x) == 0:
+				tlist.append(x)
+				sat = configElement_nonSave(x, configSelection, 0, ("Enable", "Disable"))
+				self.list.append(getConfigListEntry(nimmanager.getSatDescription(x), sat))
 
 		self["config"] = ConfigList(self.list)
 		self["header"] = Label("Automatic Scan")