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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 2ac7b8de..e5de83e0 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -40,7 +40,6 @@ class SecConfigure:
 			tunermask |= (1 << self.equal[slotid])
 		elif self.linked.has_key(slotid):
 			tunermask |= (1 << self.linked[slotid])
-		sec.setLNBTunerMask(tunermask)
 		sec.setLNBLOFL(9750000)
 		sec.setLNBLOFH(10600000)
 		sec.setLNBThreshold(11700000)
@@ -64,7 +63,6 @@ class SecConfigure:
 		elif (diseqcmode == 3): # diseqc 1.2
 			if self.satposdepends.has_key(slotid):
 				tunermask |= (1 << self.satposdepends[slotid])
-				sec.setLNBTunerMask(tunermask)
 			sec.setLatitude(latitude)
 			sec.setLaDirection(laDirection)
 			sec.setLongitude(longitude)
@@ -80,6 +78,8 @@ class SecConfigure:
 				sec.setRotorPosNum(0) # USALS
 				self.satList.append(int(x[0]))
 
+		sec.setLNBTunerMask(tunermask)
+
 	def setSatposDepends(self, sec, nim1, nim2):
 		print "tuner", nim1, "depends on satpos of", nim2
 		sec.setTunerDepends(nim1, nim2)
@@ -105,13 +105,13 @@ class SecConfigure:
 			nim = config.Nims[x]
 			if slot.nimType == self.NimManager.nimType["DVB-S"]:
 				if nim.configMode.value == "equal":
-					self.equal[nim.equalTo.value]=x
+					self.equal[nim.equalTo.index]=x
 				if nim.configMode.value == "loopthrough":
-					self.linkNIMs(sec, x, nim.linkedTo.value)
-					self.linked[nim.linkedTo.value]=x
+					self.linkNIMs(sec, x, nim.linkedTo.index)
+					self.linked[nim.linkedTo.index]=x
 				elif nim.configMode.value == "satposdepends":
 					self.setSatposDepends(sec, x, nim.satposDependsTo.index)
-					self.satposdepends[nim.satposDependsTo.value]=x
+					self.satposdepends[nim.satposDependsTo.index]=x
 
 		for slot in self.NimManager.nimslots:
 			x = slot.slotid
@@ -186,10 +186,10 @@ class SecConfigure:
 					sec.setLNBLOFH(currLnb.lofh.value * 1000)
 					sec.setLNBThreshold(currLnb.threshold.value * 1000)
 					
-				if currLnb.output_12v.value == "0V":
-					pass # nyi in drivers
-				elif currLnb.output_12v.value == "12V":
-					pass # nyi in drivers
+#				if currLnb.output_12v.value == "0V":
+#					pass # nyi in drivers
+#				elif currLnb.output_12v.value == "12V":
+#					pass # nyi in drivers
 					
 				if currLnb.increased_voltage.value:
 					sec.setLNBIncreasedVoltage(lnbParam.ON)
@@ -421,7 +421,7 @@ class NimManager:
 		return self.cablesList[0]
 	
 	def getCableTrustNit(self, nim):
-		return (config.Nims[nim].cabletype.value == "quick")
+		return config.Nims[nim].cabletype.value == "quick"
 
 	def getTerrestrialDescription(self, nim):
 		return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
@@ -584,9 +584,9 @@ class NimManager:
 
 			if configMode == "simple":
 				dm = config.Nims[slotid].diseqcMode.value
-				if dm in ["single", "toneburst", "diseqc_a_b", "diseqc_a_b_c_d"]:
+				if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
 					list.append(self.satList[config.Nims[slotid].diseqcA.index])
-				if dm in ["toneburst", "diseqc_a_b", "diseqc_a_b_c_d"]:
+				if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
 					list.append(self.satList[config.Nims[slotid].diseqcB.index])
 				if dm == "diseqc_a_b_c_d":
 					list.append(self.satList[config.Nims[slotid].diseqcC.index])
@@ -672,16 +672,15 @@ def InitNimManager(nimmgr):
 						"advanced": _("advanced")},
 					default = "simple")
 			else:
-
 				nim.configMode = ConfigSelection(
 					choices = {
 						"equal": _("equal to Socket A"),
-						"looptrough": _("loopthrough to socket A"),
+						"loopthrough": _("loopthrough to socket A"),
 						"nothing": _("nothing connected"),
 						"satposdepends": _("second cable of motorized LNB"),
 						"simple": _("simple"),
 						"advanced": _("advanced")},
-					default = "looptrough")
+					default = "loopthrough")
 
 			#important - check if just the 2nd one is LT only and the first one is DVB-S
 			if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
@@ -769,7 +768,7 @@ def InitNimManager(nimmgr):
 				nim.advanced.lnb[x].lofl = ConfigInteger(default=9750, limits = (0, 99999))
 				nim.advanced.lnb[x].lofh = ConfigInteger(default=10600, limits = (0, 99999))
 				nim.advanced.lnb[x].threshold = ConfigInteger(default=11700, limits = (0, 99999))
-				nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
+#				nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
 				nim.advanced.lnb[x].increased_voltage = ConfigYesNo(default=False)
 				nim.advanced.lnb[x].toneburst = ConfigSelection(choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))], default = "none")
 				nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none")
@@ -795,7 +794,7 @@ def InitNimManager(nimmgr):
 				nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
 
 		elif slot.nimType == nimmgr.nimType["DVB-C"]:
-			nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))])
+			nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))], default = "complete")
 		elif slot.nimType == nimmgr.nimType["DVB-T"]:
 			list = []
 			n = 0