removing deleted module from __init__.py (EventInfo)

[vuplus_dvbapp] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 783288e..5b3b853 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,4 @@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigDummy, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff
 
 from enigma import eDVBSatelliteEquipmentControl, \
        eDVBSatelliteLNBParameters as lnbParam, \
@@ -212,14 +212,13 @@ class SecConfigure:
                                        # 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))
@@ -354,14 +353,14 @@ class NimManager:
                                self.parsedCab = str(tname)
                        elif (name == "transponder"):
                                freq = int(attrs.get('frequency',""))
-                               sr = int(attrs.get('symbol_rate',""))
-                               mod = int(attrs.get('modulation',"3")) # QAM64 default
-                               fec = int(attrs.get('fec_inner',"0")) # AUTO default
+                               #sr = int(attrs.get('symbol_rate',""))
+                               #mod = int(attrs.get('modulation',"3")) # QAM64 default
+                               #fec = int(attrs.get('fec_inner',"0")) # AUTO default
                                if self.parsedCab in self.transponders:
                                        pass
                                else:
                                        self.transponders[self.parsedCab] = [ ]
-                               self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
+                               self.transponders[self.parsedCab].append((1, freq))
 
        class parseTerrestrials(ContentHandler):
                def __init__(self, terrestrialsList, transponders):
@@ -411,13 +410,16 @@ class NimManager:
                return self.transpondersterrestrial[region]
        
        def getCableDescription(self, nim):
-               return self.cablesList[config.Nims[nim].cable.value]
+               return self.cablesList[0]
+       
+       def getCableTrustNit(self, nim):
+               return (config.Nims[nim].cabletype.value == "quick")
 
        def getTerrestrialDescription(self, nim):
-               return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
+               return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
 
        def getTerrestrialFlags(self, nim):
-               return self.terrestrialsList[config.Nims[nim].terrestrial.value][1]
+               return self.terrestrialsList[config.Nims[nim].terrestrial.index][1]
 
        def getConfiguredSats(self):
                return self.sec.getSatList()
@@ -609,7 +611,7 @@ class NimManager:
                                        lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
                                        if lnbnum != 0:
                                                lnb = nim.advanced.lnb[lnbnum]
-                                               if lnb.diseqcMode.value == "diseqc_a_b_c_d":
+                                               if lnb.diseqcMode.value == "1_2":
                                                        list.append(x)
                return list
 
@@ -745,13 +747,13 @@ 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)))
-
+                       
                        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())
+                       nim.advanced.lnb.append(ConfigNothing())
                        for x in range(1, 33):
                                nim.advanced.lnb.append(ConfigSubsection())
                                nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
@@ -784,11 +786,13 @@ def InitNimManager(nimmgr):
                                nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
 
                elif slot.nimType == nimmgr.nimType["DVB-C"]:
-                       nim.cable = ConfigSelection(choices = nimmgr.cablesList)
+                       nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))])
                elif slot.nimType == nimmgr.nimType["DVB-T"]:
                        list = []
+                       n = 0
                        for x in nimmgr.terrestrialsList:
-                               list.append(x[0])
+                               list.append((str(n), x[0]))
+                               n += 1
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else: