X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ae566d06a9a24dd549f78c5522d5a90b71341352..cb52eb273bed4c28716b501fbbf128d2c7046d57:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 6cceeca9..18c90f13 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -52,7 +52,7 @@ class SecConfigure:
 
 	def linkNIMs(self, nim1, nim2):
 		eDVBSatelliteEquipmentControl.getInstance().setTunerLinked(nim1, nim2)
-
+		
 	def getSatList(self):
 		return self.satList
 
@@ -69,7 +69,7 @@ class SecConfigure:
 				if nim.configMode.value == 1:
 					self.linkNIMs(x, nim.linkedTo.value)
 					nim = config.Nims[nim.linkedTo.value]
-				if nim.configMode.value == 0 or nim.configMode.value == 1:		#simple config
+				if nim.configMode.value == 0:		#simple config
 					if nim.diseqcMode.value == 0:			#single
 						self.addLNBSimple(x, int(nim.diseqcA.vals[nim.diseqcA.value][1]), 0, 0, 4)
 					elif nim.diseqcMode.value == 1:		#Toneburst A/B
@@ -332,8 +332,10 @@ class NimManager:
 			print "Unlinking slot " + str(slotid)
 			# TODO call c++ to unlink nim in slot slotid
 		if (mode == 1): # linked
-			if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
-				print "Linking slot " + str(slotid) + " to " + str(nimmgr.getConfigPrefix(slotid).value)
+			pass
+			#FIXME!!!
+			#if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
+			#	print "Linking slot " + str(slotid) + " to " + str(nimmgr.getConfigPrefix(slotid).value)
 			# TODO call c++ to link nim in slot slotid with nim in slot nimmgr.getConfigPrefix(slotid).value
 	def nimLinkedToChanged(self, slotid, val):
 		print "Linking slot " + str(slotid) + " to " + str(val)
@@ -382,7 +384,21 @@ def InitNimManager(nimmgr):
 		nim = config.Nims[x]
 		
 		if slot.nimType == nimmgr.nimType["DVB-S"]:
-			nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # "Advanced"));
+			nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Loopthrough to Socket A"))) # "Advanced"));
+			
+			#important - check if just the 2nd one is LT only and the first one is DVB-S
+			if nim.configMode.value == 1: #linked
+				if x == 0:										#first one can never be linked to anything
+					nim.configMode.value = 0		#reset to simple
+					nim.configMode.save()
+				else:
+					#FIXME: make it better
+					for y in nimmgr.nimslots:
+						if y.slotid == 0:
+							if y.nimType != nimmgr.nimType["DVB-S"]:
+								nim.configMode.value = 0		#reset to simple
+								nim.configMode.save()
+
 			nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner")));
 			nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList);
 			nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList);