X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8e33fafaf71b55b71fb6762baddfc0c7a38225..1e9d8bf4069337885f178c148a4069ba3e12b8b4:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index d0af8f7e..869bec3c 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -8,6 +8,7 @@ from Components.ConfigList import ConfigListScreen
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
 from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITION
+from Tools.HardwareInfo import HardwareInfo
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, \
 	eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, \
@@ -138,7 +139,8 @@ class CableTransponderSearchSupport:
 					"QAM128" : parm.Modulation_QAM128,
 					"QAM256" : parm.Modulation_QAM256 }
 				inv = { "INVERSION_OFF" : parm.Inversion_Off,
-					"INVERSION_ON" : parm.Inversion_On }
+					"INVERSION_ON" : parm.Inversion_On,
+					"INVERSION_AUTO" : parm.Inversion_Unknown }
 				fec = { "FEC_AUTO" : parm.FEC_Auto,
 					"FEC_1_2" : parm.FEC_1_2,
 					"FEC_2_3" : parm.FEC_2_3,
@@ -175,10 +177,17 @@ class CableTransponderSearchSupport:
 		self.cable_search_container.appClosed.append(self.cableTransponderSearchClosed)
 		self.cable_search_container.dataAvail.append(self.getCableTransponderData)
 		cableConfig = config.Nims[nim_idx].cable
-		cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus "
+		tunername = nimmanager.getNimName(nim_idx)
+		if tunername == "CXD1981":
+			cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus "
+		else:
+			cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus "
 		#FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
 		if nim_idx < 2:
-			cmd += str(nim_idx)
+			if HardwareInfo().get_device_name() == "dm500hd":
+				cmd += "2"
+			else:
+				cmd += str(nim_idx)
 		else:
 			if nim_idx == 2:
 				cmd += "2" # first nim socket on DM8000 use /dev/i2c/2
@@ -295,9 +304,11 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list)
-		self.createSetup()
-
-		self["introduction"] = Label(_("Press OK to start the scan"))
+		if not self.scan_nims.value == "":
+			self.createSetup()
+			self["introduction"] = Label(_("Press OK to start the scan"))
+		else:
+			self["introduction"] = Label(_("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."))
 
 	def runAsync(self, finished_cb):
 		self.finished_cb = finished_cb
@@ -522,6 +533,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 			for n in nimmanager.nim_slots:
 				if n.config_mode == "nothing":
 					continue
+				if n.config_mode == "advanced" and len(nimmanager.getSatListForNim(n.slot)) < 1:
+					continue
 				if n.config_mode in ("loopthrough", "satposdepends"):
 					root_id = nimmanager.sec.getRoot(n.slot_id, int(n.config.connectedTo.value))
 					if n.type == nimmanager.nim_slots[root_id].type: # check if connected from a DVB-S to DVB-S2 Nim or vice versa
@@ -709,6 +722,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		tlist.append(buildTerTransponder(*args, **kwargs))
 
 	def keyGo(self):
+		if self.scan_nims.value == "":
+			return
 		tlist = []
 		flags = None
 		startScan = True