X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8c55e4314e8e24ef8372bd96a0dca6d5a22bb219..d030fb234d74f1375bd318379ec5d2f643344839:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 60553c62..cd9a8f94 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -26,6 +26,23 @@ def getInitialTransponderList(tlist, pos):
 			parm.orbital_position = pos
 			tlist.append(parm)
 
+def getInitialCableTransponderList(tlist, cable):
+	print "cable", cable
+	list = nimmanager.getTranspondersCable(cable)
+
+	for x in list:
+		if x[0] == 1:		#CABLE
+			print "[ScanSetup] cable-transponder to add:", x
+			parm = eDVBFrontendParametersCable()
+			parm.frequency = x[1]
+			parm.symbol_rate = x[2]
+			parm.modulation = 2 # x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti	
+			parm.fec = 6# x[4]			# eDVBFrontendParametersSatellite.FEC.f3_4;
+			#parm.fec = 6					# AUTO
+			parm.inversion = 2 # AUTO
+			#parm.inversion = 2 		#AUTO
+			tlist.append(parm)
+
 class ScanSetup(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
@@ -267,36 +284,47 @@ class ScanSetup(Screen):
 	def keyGo(self):
 		tlist = []
 		flags = 0
-		if currentConfigSelectionElement(config.scan.type) == "single_transponder":
-			if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]):
+		if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]):
+			if currentConfigSelectionElement(config.scan.type) == "single_transponder":
+
 				self.addSatTransponder(tlist, config.scan.sat.frequency.value[0],
 											  config.scan.sat.symbolrate.value[0],
 											  config.scan.sat.polarization.value,
 											  config.scan.sat.fec.value,
 											  config.scan.sat.inversion.value,
 											  self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1])
-			elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]):
+			elif currentConfigSelectionElement(config.scan.type) == "single_satellite":
+				getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]))
+				flags |= eComponentScan.scanNetworkSearch
+	
+			elif currentConfigSelectionElement(config.scan.type) == "multisat":
+				SatList = nimmanager.getSatListForNim(config.scan.nims.value)
+	
+				for x in self.multiscanlist:
+					if x[1].parent.value == 0:
+						print "   " + str(x[1].parent.configPath)
+						getInitialTransponderList(tlist, x[1].parent.configPath)
+				flags |= eComponentScan.scanNetworkSearch
+
+		elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]):
+			if currentConfigSelectionElement(config.scan.typecable) == "single_transponder":
 				self.addCabTransponder(tlist, config.scan.cab.frequency.value[0],
 											  config.scan.cab.symbolrate.value[0],
 											  config.scan.cab.modulation.value,
 											  config.scan.cab.fec.value,
 											  config.scan.cab.inversion.value)
-			elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
-				self.addTerTransponder(tlist, 
-											  config.scan.ter.frequency.value[0])
+			elif currentConfigSelectionElement(config.scan.typecable) == "complete":
+				getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value))
+				flags |= eComponentScan.scanNetworkSearch
 
-		elif currentConfigSelectionElement(config.scan.type) == single_satellite:
-			getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]))
-			flags |= eComponentScan.scanNetworkSearch
+		elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]):
+			if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder":
+				self.addTerTransponder(tlist, 
+										  config.scan.ter.frequency.value[0])
+			if currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
+				pass
 
-		elif currentConfigSelectionElement(config.scan.type) == "multisat":
-			SatList = nimmanager.getSatListForNim(config.scan.nims.value)
 
-			for x in self.multiscanlist:
-				if x[1].parent.value == 0:
-					print "   " + str(x[1].parent.configPath)
-					getInitialTransponderList(tlist, x[1].parent.configPath)
-			flags |= eComponentScan.scanNetworkSearch
 
 		for x in self["config"].list:
 			x[1].save()