add option to search the network information table in manual cable scan

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

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 3e6c41b5f7580fd121cf0fd7d1e96e41f4a71636..15955abf32c8de23de54338167953436a36ba005 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -37,8 +37,8 @@ def getInitialCableTransponderList(tlist, cable):
                        parm.frequency = x[1]
                        parm.symbol_rate = x[2]
                        parm.modulation = x[3] # AUTO
-                       parm.fec_inner = 6 # AUTO
-                       parm.inversion = x[4] # AUTO
+                       parm.fec_inner = x[4] # AUTO
+                       parm.inversion = 2 # AUTO
                        tlist.append(parm)
 
 class ScanSetup(Screen):
@@ -138,6 +138,7 @@ class ScanSetup(Screen):
                                self.list.append(getConfigListEntry(_("Symbol Rate"), config.scan.cab.symbolrate))
                                self.list.append(getConfigListEntry(_("Modulation"), config.scan.cab.modulation))
                                self.list.append(getConfigListEntry(_("FEC"), config.scan.cab.fec))
+                               self.list.append(getConfigListEntry(_("Search NIT"), config.scan.cab.searchNIT))
                        elif currentConfigSelectionElement(config.scan.typecable) == "complete":
                                pass
                                
@@ -200,6 +201,7 @@ class ScanSetup(Screen):
                        config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, (("auto", _("Auto")), ("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM")))
                        config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("none", _("None"))))
                        config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 9999)))
+                       config.scan.cab.searchNIT = configElement_nonSave("config.scan.cab.searchNIT", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
 
                        # terrestial
                        config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (100, 900)))
@@ -311,6 +313,8 @@ class ScanSetup(Screen):
                                                                                          config.scan.cab.modulation.value,
                                                                                          config.scan.cab.fec.value,
                                                                                          config.scan.cab.inversion.value)
+                               if  currentConfigSelectionElement(config.scan.cab.searchNIT) == "yes":
+                                       flags |= eComponentScan.scanNetworkSearch
                        elif currentConfigSelectionElement(config.scan.typecable) == "complete":
                                getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value))
                                flags |= eComponentScan.scanNetworkSearch