fix satconfig
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sat, 7 Oct 2006 18:54:53 +0000 (18:54 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sat, 7 Oct 2006 18:54:53 +0000 (18:54 +0000)
lib/python/Components/NimManager.py
lib/python/Screens/Satconfig.py

index 783288e..7878b67 100644 (file)
@@ -212,14 +212,13 @@ class SecConfigure:
                                        # Committed Diseqc Command
                                        cdc = currLnb.commitedDiseqcCommand.value
                                        
                                        # Committed Diseqc Command
                                        cdc = currLnb.commitedDiseqcCommand.value
                                        
-                                       c = [
-                                               ("none", diseqcParam.SENDNO),
-                                               ("AA", diseqcParam.AA),
-                                               ("AB", diseqcParam.AB),
-                                               ("BA", diseqcParam.BA),
-                                               ("BB", diseqcParam.BB)]
-                                               
-                                       if cdc in c:
+                                       c = { "none": diseqcParam.SENDNO,
+                                               "AA": diseqcParam.AA,
+                                               "AB": diseqcParam.AB,
+                                               "BA": diseqcParam.BA,
+                                               "BB": diseqcParam.BB }
+
+                                       if c.has_key(cdc):
                                                sec.setCommittedCommand(c[cdc])
                                        else:
                                                sec.setCommittedCommand(long(cdc))
                                                sec.setCommittedCommand(c[cdc])
                                        else:
                                                sec.setCommittedCommand(long(cdc))
@@ -745,11 +744,11 @@ def InitNimManager(nimmgr):
                        csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
                        for y in range(0, 16):
                                csw.append((str(0xF0|y), "Input " + str(y+1)))
                        csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
                        for y in range(0, 16):
                                csw.append((str(0xF0|y), "Input " + str(y+1)))
-
+                       
                        ucsw = [("0", _("None"))]
                        for y in range(1, 17):
                                ucsw.append((str(y), "Input " + str(y)))
                        ucsw = [("0", _("None"))]
                        for y in range(1, 17):
                                ucsw.append((str(y), "Input " + str(y)))
-
+                       
                        nim.advanced.lnb = ConfigSubList()
                        nim.advanced.lnb.append(ConfigDummy())
                        for x in range(1, 33):
                        nim.advanced.lnb = ConfigSubList()
                        nim.advanced.lnb.append(ConfigDummy())
                        for x in range(1, 33):
index 3930aaa..b6e4911 100644 (file)
@@ -169,7 +169,7 @@ class NimSetup(Screen, ConfigListScreen):
                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
-               }, -1)
+               }, -2)
 
                self.nim = nimmanager.nimList()[slotid][1]
                self.nimConfig = config.Nims[self.nim.slotid]
 
                self.nim = nimmanager.nimList()[slotid][1]
                self.nimConfig = config.Nims[self.nim.slotid]