X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8604b54bfb259e40773677bc0c6632182526fc3f..04473f49c99472ab8be68d645293c556f02fd8a5:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 0f4744da..1ee2f5a6 100644
--- 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(_("Network scan"), config.scan.cab.networkScan))
 			elif currentConfigSelectionElement(config.scan.typecable) == "complete":
 				pass
 				
@@ -197,9 +198,10 @@ class ScanSetup(Screen):
 			# cable
 			config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 999)))
 			config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 2, (("off", _("off")), ("on", _("on")), ("auto", _("Auto"))))
-			config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 2, (("auto", _("Auto")), ("16qam", "16-QAM"), ("32qam", "32-QAM"), ("64qam", "64-QAM"), ("128qam", "128-QAM"), ("256qam", "256-QAM")))
+			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.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
 
 			# terrestial
 			config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (100, 900)))
@@ -254,11 +256,11 @@ class ScanSetup(Screen):
 
 	# FIXME use correct parameters
 	def addCabTransponder(self, tlist, frequency, symbol_rate, modulation, fec, inversion):
-		print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(modulation) + " fec: " + str(fec) + " inversion: " + str(inversion)
+		print "Add Cab: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(modulation) + " fec: " + str(fec) + " inversion: " + str(inversion)
 		parm = eDVBFrontendParametersCable()
 		parm.frequency = frequency * 1000
 		parm.symbol_rate = symbol_rate * 1000
-		parm.modulation = modulation # eDVBFrontendParametersSatellite.Polarisation.Verti	
+		parm.modulation = modulation # modulation # eDVBFrontendParametersSatellite.Polarisation.Verti	
 		parm.fec = fec			# eDVBFrontendParametersSatellite.FEC.f3_4;
 		#parm.fec = 6					# AUTO
 		parm.inversion = inversion 	#eDVBFrontendParametersSatellite.Inversion.Off;
@@ -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.networkScan) == "yes":
+					flags |= eComponentScan.scanNetworkSearch
 			elif currentConfigSelectionElement(config.scan.typecable) == "complete":
 				getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value))
 				flags |= eComponentScan.scanNetworkSearch