X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6695541c26a0c963c9abfc404031fc69effdba37..79da420aa414522f8b5477053f0b46e6311f1cc1:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 3f82089a..aae7dabc 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -123,7 +123,7 @@ class SecConfigure:
 
 		for slot in nim_slots:
 			if slot.type is not None:
-				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False))
+				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2")))
 		eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
 		for slot in nim_slots:
@@ -364,8 +364,11 @@ class SecConfigure:
 				# finally add the orbital positions
 				for y in lnbSat[x]:
 					self.addSatellite(sec, y)
-					currSat = config.Nims[slotid].advanced.sat[y]
-
+					if x > 32:
+						satpos = x > 32 and (3604-(36 - x)) or y
+					else:
+						satpos = y
+					currSat = config.Nims[slotid].advanced.sat[satpos]
 					if currSat.voltage.value == "polarization":
 						sec.setVoltageMode(switchParam.HV)
 					elif currSat.voltage.value == "13V":
@@ -670,7 +673,14 @@ class NimManager:
 		positionerList = []
 		for nim in nimList[:]:
 			mode = self.getNimConfig(nim)
-			if mode.configMode.value == "simple" and mode.diseqcMode.value == "positioner":
+			nimHaveRotor = mode.configMode.value == "simple" and mode.diseqcMode.value == "positioner"
+			if not nimHaveRotor and mode.configMode.value == "advanced":
+				for x in range(3601, 3605):
+					lnb = int(mode.advanced.sat[x].lnb.value)
+					if lnb != 0:
+						nimHaveRotor = True
+						break
+			if nimHaveRotor:
 				alreadyConnected = False
 				for testnim in nimList:
 					testmode = self.getNimConfig(testnim)
@@ -848,12 +858,12 @@ def InitNimManager(nimmgr):
 				choices["loopthrough"] = _("loopthrough to")
 			nim.configMode = ConfigSelection(choices = choices, default = "nothing")
 
-			for y in nimmgr.nim_slots:
-				if y.slot == 0:
-					if not y.isCompatible("DVB-S"):
-						# reset to simple
-						nim.configMode.value = "simple"
-						nim.configMode.save()
+#			for y in nimmgr.nim_slots:
+#				if y.slot == 0:
+#					if not y.isCompatible("DVB-S"):
+#						# reset to simple
+#						nim.configMode.value = "simple"
+#						nim.configMode.save()
 
 			nim.diseqcMode = ConfigSelection(
 				choices = [
@@ -892,7 +902,7 @@ def InitNimManager(nimmgr):
 
 			# advanced config:
 			nim.advanced = ConfigSubsection()
-			tmp = [(3601, _('All Satellites 1'), 1), (3602, _('All Satellites 2'), 1), (3603, _('All Satellites 3'), 1), (3604, _('All Satellites 4'), 1)]
+			tmp = [(3601, _('All Satellites')+' 1', 1), (3602, _('All Satellites')+' 2', 1), (3603, _('All Satellites')+' 3', 1), (3604, _('All Satellites')+' 4', 1)]
 			nim.advanced.sats = getConfigSatlist(192,nimmgr.satList+tmp)
 			nim.advanced.sat = ConfigSubDict()
 			lnbs = [("0", "not available")]