X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cf34bb57372b60d8e66cf5c21e9f73b8d0bc23b8..8735bf9681ee930d09b9f7a0a19024ca29ad4e4e:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index cf0365d7..ccb776ea 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -62,8 +62,8 @@ class NimSetup(Screen, ConfigListScreen):
 				choices["satposdepends"] = _("second cable of motorized LNB")
 			if len(nimmanager.canConnectTo(self.slotid)) > 0:
 				choices["loopthrough"] = _("loopthrough to")
-			self.nimConfig.configMode.setChoices(choices)
-							
+			self.nimConfig.configMode.setChoices(choices, default = "nothing")
+
 	def createSetup(self):
 		print "Creating setup"
 		self.list = [ ]
@@ -205,7 +205,8 @@ class NimSetup(Screen, ConfigListScreen):
 		self.saveAll()
 
 	def fillListWithAdvancedSatEntrys(self, Sat):
-		currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
+		lnbnum = int(Sat.lnb.value)
+		currLnb = self.nimConfig.advanced.lnb[lnbnum]
 		
 		if isinstance(currLnb, ConfigNothing):
 			currLnb = None
@@ -213,17 +214,19 @@ class NimSetup(Screen, ConfigListScreen):
 		self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
 		self.list.append(getConfigListEntry(_("Tone mode"), Sat.tonemode))
 		if currLnb and currLnb.diseqcMode.value == "1_2":
-			self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals)
-			self.list.append(self.advancedUsalsEntry)
-			if not Sat.usals.value:
-				self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition))
+			if lnbnum < 33:
+				self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals)
+				self.list.append(self.advancedUsalsEntry)
+				if not Sat.usals.value:
+					self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition))
 
 		# LNBs
 		self.advancedLnbsEntry = getConfigListEntry(_("LNB"), Sat.lnb)
 		self.list.append(self.advancedLnbsEntry)
 		if currLnb:
-			self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode)
-			self.list.append(self.advancedDiseqcMode)
+			if lnbnum < 33:
+				self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode)
+				self.list.append(self.advancedDiseqcMode)
 			if currLnb.diseqcMode.value != "none":
 				self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
 				self.list.append(getConfigListEntry(_("Committed DiSEqC command"), currLnb.commitedDiseqcCommand))
@@ -282,8 +285,8 @@ class NimSetup(Screen, ConfigListScreen):
 		self.list.append(self.configMode)
 		self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats)
 		self.list.append(self.advancedSatsEntry)
-		for x in nimmanager.satList:
-			Sat = self.nimConfig.advanced.sat[x[0]]
+		for x in self.nimConfig.advanced.sat.keys():
+			Sat = self.nimConfig.advanced.sat[x]
 			self.fillListWithAdvancedSatEntrys(Sat)
 		self["config"].list = self.list
 
@@ -399,7 +402,7 @@ class NimSelection(Screen):
 					text = { "loopthrough": _("loopthrough to"),
 							 "equal": _("equal to"),
 							 "satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
-					text += + " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
+					text += " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
 				elif nimConfig.configMode.value == "nothing":
 					text = _("nothing connected")
 				elif nimConfig.configMode.value == "simple":