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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 5a18a454..18c90f13 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -50,11 +50,15 @@ class SecConfigure:
 		sec.addSatellite(orbpos)
 		self.satList.append(orbpos)
 
+	def linkNIMs(self, nim1, nim2):
+		eDVBSatelliteEquipmentControl.getInstance().setTunerLinked(nim1, nim2)
+		
 	def getSatList(self):
 		return self.satList
 
 	def update(self):
 		eDVBSatelliteEquipmentControl.getInstance().clear()
+		
 		self.satList = []
 
 		for slot in self.NimManager.nimslots:
@@ -62,6 +66,9 @@ class SecConfigure:
 			nim = config.Nims[x]
 			if slot.nimType == self.NimManager.nimType["DVB-S"]:
 				print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
+				if nim.configMode.value == 1:
+					self.linkNIMs(x, nim.linkedTo.value)
+					nim = config.Nims[nim.linkedTo.value]
 				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)
@@ -325,12 +332,14 @@ 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)
-		# TODO call c++ to link nim in slot slotid with nim in slot val
+
 	def nimDiseqcModeChanged(self, slotid, mode):
 		#print "nimDiseqcModeChanged set to " + str(mode)
 		pass
@@ -375,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);