dont show (non working) SNR AGC BER in manual scan

[enigma2.git] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 313b082855a35f6f28f29af6eb1a24f99d09312f..6aeaf787a1633b8eaeb0181be8c1120f9a5dedd1 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -83,6 +83,7 @@ def getInitialTransponderList(tlist, pos):
                        #parm.inversion = 1     #eDVBFrontendParametersSatellite.Inversion.Off;
                        parm.inversion = 2              #AUTO
                        parm.orbital_position = pos
+                       parm.system = x[5]  #DVB-S or DVB-S2
                        tlist.append(parm)
 
 def getInitialCableTransponderList(tlist, cable):
@@ -252,18 +253,18 @@ class ScanSetup(Screen):
                        elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
                                self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
 
-               if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \
-                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \
-                       (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"] and currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder"):
-                               self.configElementSNR = getConfigListEntry(_("SNR"), config.scan.snr)
-                               self.list.append(self.configElementSNR)
-                               self.configElementACG = getConfigListEntry(_("AGC"), config.scan.agc)
-                               self.list.append(self.configElementACG)
-                               self.configElementBER = getConfigListEntry(_("BER"), config.scan.ber)
-                               self.list.append(self.configElementBER)
-                               self.statusTimer.start(500, False)
-               else:
-                       self.statusTimer.stop()
+#              if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \
+#                      (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \
+#                      (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"] and currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder"):
+#                              self.configElementSNR = getConfigListEntry(_("SNR"), config.scan.snr)
+#                              self.list.append(self.configElementSNR)
+#                              self.configElementACG = getConfigListEntry(_("AGC"), config.scan.agc)
+#                              self.list.append(self.configElementACG)
+#                              self.configElementBER = getConfigListEntry(_("BER"), config.scan.ber)
+#                              self.list.append(self.configElementBER)
+#                              self.statusTimer.start(500, False)
+#              else:
+#                      self.statusTimer.stop()
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -378,7 +379,7 @@ class ScanSetup(Screen):
                           "3_5": 7,
                           "4_5": 8,
                           "9_10": 9,
-                          "none": 10
+                          "none": 15
                           }
 
        def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system):
@@ -436,8 +437,8 @@ class ScanSetup(Screen):
                                                                                config.scan.sat.polarization.value,
                                                                                fec,
                                                                                config.scan.sat.inversion.value,
-                                                                               config.scan.sat.system.value,
-                                                                               orbpos)
+                                                                               orbpos,
+                                                                               config.scan.sat.system.value)
                        elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
                                sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value]
                                getInitialTransponderList(tlist, int(sat[1]))