X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/da51ddf9784483ff34fc51fcf33971018b8794d2..92456d9542585d58e011fa4f0b501de3ef9c1819:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 7677a502..9a970fd3 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,4 @@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff
 
 from enigma import eDVBSatelliteEquipmentControl, \
 	eDVBSatelliteLNBParameters as lnbParam, \
@@ -16,6 +16,14 @@ from xml.sax.handler import ContentHandler
 
 from Tools.BoundFunction import boundFunction
 
+def getConfigSatlist(orbpos, satlist):
+	default_orbpos = None
+	for x in satlist:
+		if x[0] == orbpos:
+			default_orbpos = orbpos
+			break
+	return ConfigSatlist(satlist, default_orbpos)
+
 def tryOpen(filename):
 	try:
 		procFile = open(filename)
@@ -32,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)
@@ -56,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)
@@ -72,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)
@@ -97,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
@@ -416,10 +424,10 @@ class NimManager:
 		return (config.Nims[nim].cabletype.value == "quick")
 
 	def getTerrestrialDescription(self, nim):
-		return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
+		return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
 
 	def getTerrestrialFlags(self, nim):
-		return self.terrestrialsList[config.Nims[nim].terrestrial.value][1]
+		return self.terrestrialsList[config.Nims[nim].terrestrial.index][1]
 
 	def getConfiguredSats(self):
 		return self.sec.getSatList()
@@ -664,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"]:
@@ -698,8 +705,9 @@ def InitNimManager(nimmgr):
 					("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")),
 					("positioner", _("Positioner"))],
 				default = "diseqc_a_b")
-			nim.diseqcA = ConfigSatlist(default = 192, list = nimmgr.satList)
-			nim.diseqcB = ConfigSatlist(default = 130, list = nimmgr.satList)
+
+			nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
+			nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
 			nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
 			nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
 			nim.positionerMode = ConfigSelection(
@@ -730,7 +738,7 @@ def InitNimManager(nimmgr):
 			
 			# advanced config:
 			nim.advanced = ConfigSubsection()
-			nim.advanced.sats = ConfigSatlist(default = 192, list = nimmgr.satList)
+			nim.advanced.sats = getConfigSatlist(192,nimmgr.satList)
 			nim.advanced.sat = ConfigSubDict()
 			lnbs = [("0", "not available")]
 			for y in range(1, 33):
@@ -789,8 +797,10 @@ def InitNimManager(nimmgr):
 			nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))])
 		elif slot.nimType == nimmgr.nimType["DVB-T"]:
 			list = []
+			n = 0
 			for x in nimmgr.terrestrialsList:
-				list.append(x[0])
+				list.append((str(n), x[0]))
+				n += 1
 			nim.terrestrial = ConfigSelection(choices = list)
 			nim.terrestrial_5V = ConfigOnOff()
 		else: