X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/da51ddf9784483ff34fc51fcf33971018b8794d2..0e3e7773e5d8e7ff159316db3de7fcfad57bb9e8:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index ea8d0b0a..1e164d43 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -3,7 +3,7 @@ from ServiceScan import *
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigSatlist, ConfigEnableDisable
 from Components.ActionMap import NumberActionMap
 from Components.ConfigList import ConfigList, ConfigListScreen
-from Components.NimManager import nimmanager
+from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, eDVBFrontendParametersCable
@@ -140,7 +140,6 @@ class ScanSetup(ConfigListScreen, Screen):
 		del self.feinfo
 		del self.service
 
-
 		self["actions"] = NumberActionMap(["SetupActions"],
 		{
 			"ok": self.keyGo,
@@ -328,9 +327,9 @@ class ScanSetup(ConfigListScreen, Screen):
 				elif frontendData["tuner_type"] == "DVB-C":
 					defaultCab["frequency"] = int(frontendData["frequency"] / 1000)
 					defaultCab["symbolrate"] = int(frontendData["symbol_rate"] / 1000)
-					defaultSat["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]]
-					defaultSat["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]]
-					defaultSat["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]]
+					defaultCab["inversion"] = {"INVERSION_OFF": "off", "INVERSION_ON": "on", "INVERSION_AUTO": "auto"}[frontendData["inversion"]]
+					defaultCab["fec"] = {"FEC_AUTO": "auto", "FEC_1_2": "1_2", "FEC_2_3": "2_3", "FEC_3_4": "3_4", "FEC_5_6": "5_6", "FEC_7_8": "7_8", "FEC_8_9": "8_9", "FEC_NONE": "none"}[frontendData["fec_inner"]]
+					defaultCab["modulation"] = {"QAM_AUTO": "auto", "QAM_16": "16qam", "QAM_32": "32qam", "QAM_64": "64qam", "QAM_128": "128qam", "QAM_256": "256qam"}[frontendData["modulation"]]
 
 			self.scan_sat = ConfigSubsection()
 			self.scan_cab = ConfigSubsection()
@@ -397,7 +396,7 @@ class ScanSetup(ConfigListScreen, Screen):
 			for slot in nimmanager.nimslots:
 				if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
 					print str(slot.slotid) + " : " + str(self.satList)
-					self.scan_satselection.append(ConfigSatlist(default = defaultSat["orbpos"], list = self.satList[slot.slotid]))
+					self.scan_satselection.append(getConfigSatlist(defaultSat["orbpos"],self.satList[slot.slotid]))
 				else:
 					self.scan_satselection.append(None)
 
@@ -590,6 +589,8 @@ class ScanSimple(ConfigListScreen, Screen):
 			nim.nim_index = 0
 			if nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)):
 				scan_possible=False
+			if nimtype == nimmanager.nimType["empty/unknown"]:
+				scan_possible = False
 			if scan_possible:
 				self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim))
 
@@ -680,6 +681,8 @@ class ScanSimple(ConfigListScreen, Screen):
 		return 0
 
 	def ScanNimTwoNeeded(self):
+		if nimmanager.getNimType(1) == nimmanager.nimType["empty/unknown"]:
+			return False
 		if nimmanager.getNimType(0) != nimmanager.getNimType(1):
 			return True
 		if nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"]: #two dvb-s nims