X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=960b7f10176601a67ea12657e60a229b1370a70a;hb=4d7f4836f07bb037bc1c840983e5ef1c99606005;hp=bea087244b81dcc001667d418cd25f7e7d708c2b;hpb=ae74d5cc79dc30b8b496b2645b836e0dd9c98267;p=vuplus_dvbapp

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index bea0872..960b7f1 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -138,7 +138,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,7 +176,11 @@ 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)
@@ -524,6 +529,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