Wizard shouldn't be a subclass of HelpableScreen since there is no help

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1d8e354ce43cd2e29d2f66dbb0a4195dcbe5a7a6..aae7dabc2dd12664e3446ab9f4e399698a785ac1 100644 (file)
--- 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 = [