add multisat scan setup for the case of using a dish positioner

diff --git a/lib/python/Components/ScanSetup.py b/lib/python/Components/ScanSetup.py
index 7aa0fcb81571971e9a46a5fa4ab913409170c0ee..ed3a70f9cd6a6ed35d27f5f770a36805d6c5f6e5 100644 (file)
--- a/lib/python/Components/ScanSetup.py
+++ b/lib/python/Components/ScanSetup.py
@@ -40,4 +40,9 @@ def InitScanSetup():
     config.scan.ter.modulation = configElement("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM"))
     config.scan.ter.transmission = configElement("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K"))
     config.scan.ter.guard = configElement("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32"))
     config.scan.ter.modulation = configElement("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM"))
     config.scan.ter.transmission = configElement("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K"))
     config.scan.ter.guard = configElement("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32"))

-    config.scan.ter.hierarchy = configElement("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4"))
\ No newline at end of file
+    config.scan.ter.hierarchy = configElement("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4"))
+    
+    config.scan.scansat = {}
+    for sat in nimmanager.satList:
+        #print sat[1]
+        config.scan.scansat[sat[1]] = configElement("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no"))
\ No newline at end of file

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 660440bc8d43cfa3bee02849769e026711ead5a7..e93f0212f5145506ed1013052944a1d342ec6dcf 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -58,7 +58,8 @@ class ScanSetup(Screen):
         
         # multi sat scan
         if (config.scan.type.value == 2):
         
         # multi sat scan
         if (config.scan.type.value == 2):

-            pass
+            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)
                 
         self["config"].list = self.list
         self["config"].l.setList(self.list)