small cleanup

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 2d1ded021bfe12b5e6347027221615876e4d7db6..70ce4dbe6b576947e5b9a380bdec198d0d87d17a 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -108,6 +108,8 @@ class SecConfigure:
 
                nim_slots = self.NimManager.nim_slots
 
+               used_nim_slots = [ ]
+
                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config
@@ -116,13 +118,18 @@ class SecConfigure:
                                # this is stored in the *value* (not index!) of the config list
                                if nim.configMode.value == "equal":
                                        self.equal[int(nim.equalTo.value)]=x
-                               if nim.configMode.value == "loopthrough":
+                               elif nim.configMode.value == "loopthrough":
                                        self.linkNIMs(sec, x, int(nim.linkedTo.value))
                                        self.linked[int(nim.linkedTo.value)]=x
                                elif nim.configMode.value == "satposdepends":
                                        self.setSatposDepends(sec, x, int(nim.satposDependsTo.value))
                                        self.satposdepends[int(nim.satposDependsTo.value)]=x
 
+                       if slot.type is not None:
+                               used_nim_slots.append((slot.slot, slot.description, nim.configMode.value != "nothing" and True or False))
+
+               eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
+
                for slot in nim_slots:
                        x = slot.slot
                        nim = slot.config
@@ -724,7 +731,7 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, configElement.value))
        config.sec.delay_after_enable_voltage_before_switch_command = x
 
-       x = ConfigInteger(default=200, limits = (0, 9999))
+       x = ConfigInteger(default=700, limits = (0, 9999))
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, configElement.value))
        config.sec.delay_between_switch_and_motor_command = x
 
@@ -732,7 +739,7 @@ def InitSecParams():
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, configElement.value))
        config.sec.delay_after_voltage_change_before_measure_idle_inputpower = x
 
-       x = ConfigInteger(default=200, limits = (0, 9999))
+       x = ConfigInteger(default=750, limits = (0, 9999))
        x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, configElement.value))
        config.sec.delay_after_enable_voltage_before_motor_command = x
 
@@ -769,17 +776,12 @@ def InitNimManager(nimmgr):
        for x in range(len(nimmgr.nim_slots)):
                config.Nims.append(ConfigSubsection())
 
-       used_nim_slots = [ ]
-
        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]
                
                # HACK: currently, we can only looptrough to socket A
 
-               if slot.type is not None:
-                       used_nim_slots.append((slot.slot, slot.description))
-
                if slot.isCompatible("DVB-S"):
                        if slot.slot == 0:
                                nim.configMode = ConfigSelection(
@@ -844,7 +846,8 @@ def InitNimManager(nimmgr):
                        etime = datetime(1970, 1, 1, 19, 0);
                        nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900)
                        # get other frontends of the same type
-                       satNimList = nimmgr.getNimListOfType(slot.type, slot.slot)
+
+                       satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)
                        satNimListNames = {}
 
                        for x in satNimList:
@@ -976,8 +979,6 @@ def InitNimManager(nimmgr):
                        print "pls add support for this frontend type!"         
 #                      assert False
 
-       eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
-
        nimmgr.sec = SecConfigure(nimmgr)
 
 nimmanager = NimManager()