X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c16d405383c4be419e4a88db6d02894b7cfbf74d..2f71009743e6a1a516b82ac06c4a89ee4d6ea703:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index a94645b1..cc11aa71 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -130,11 +130,14 @@ class ScanSetup(Screen):
 
 		self.updateSatList()
 		self.service = session.nav.getCurrentService()
+		self.feinfo = None
 		frontendData = None
 		if self.service is not None:
 			self.feinfo = self.service.frontendInfo()
 			frontendData = self.feinfo and self.feinfo.getFrontendData(True)
 		self.createConfig(frontendData)
+		del self.feinfo
+		del self.service
 
 
 		self["actions"] = NumberActionMap(["SetupActions"],
@@ -323,7 +326,7 @@ class ScanSetup(Screen):
 					   #("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
 					   #("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
 			defaultSat = { "orbpos": 192, "system": 0, "frequency": [11836], "inversion": 2, "symbolrate": [27500], "polarization": 0, "fec": 0, "fec_s2": 8, "modulation": 0 }
-			defaultCab = {"frequency": [466], "inversion": 2, "modulation": 0, "fec": 0, "symbolrate": [6900]}
+			defaultCab = {"frequency": [466], "inversion": 2, "modulation": 2, "fec": 0, "symbolrate": [6900]}
 			if frontendData is not None:
 				if frontendData["tuner_type"] == "DVB-S":
 					defaultSat["system"] = {"DVB-S": 0, "DVB-S2": 1}[frontendData["system"]]
@@ -378,7 +381,7 @@ class ScanSetup(Screen):
 			# cable
 			config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, defaultCab["frequency"], configsequencearg.get("INTEGER", (50, 999)))
 			config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, defaultCab["inversion"], (("off", _("off")), ("on", _("on")), ("auto", _("Auto"))))
-			config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, defaultCab["modulation"], (("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, defaultCab["modulation"], (("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, defaultCab["fec"], (("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, defaultCab["symbolrate"], configsequencearg.get("INTEGER", (1, 9999)))
 			config.scan.cab.networkScan = configElement_nonSave("config.scan.cab.networkScan", configSelection, 0, (("no", _("no")), ("yes", _("yes"))))
@@ -440,7 +443,7 @@ class ScanSetup(Screen):
 			   }
 
 	def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system, modulation):
-		print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion)
+		print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(self.fecmap[fec]) + " inversion: " + str(inversion) + " modulation: " + str(modulation) + " system: " + str(system)
 		print "orbpos: " + str(orbital_position)
 		parm = eDVBFrontendParametersSatellite()
 		if modulation == 1:
@@ -499,7 +502,7 @@ class ScanSetup(Screen):
 										config.scan.sat.inversion.value,
 										orbpos,
 										config.scan.sat.system.value,
-										config.scan.sat.modulation)
+										config.scan.sat.modulation.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]))
@@ -528,7 +531,7 @@ class ScanSetup(Screen):
 			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.modulation.value + 1,
 											  config.scan.cab.fec.value,
 											  config.scan.cab.inversion.value)
 				if currentConfigSelectionElement(config.scan.cab.networkScan) == "yes":