fix more ConfigSatlist defaults

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 7878b67be24ffd7321aa71ef13b315035c8d4a73..2ac7b8deda84de85e0b3cf8af46ae2ea4d3f2025 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, \
@@ -16,6 +16,14 @@ from xml.sax.handler import ContentHandler
 
 from Tools.BoundFunction import boundFunction
 
+def getConfigSatlist(orbpos, satlist):
+       default_orbpos = None
+       for x in satlist:
+               if x[0] == orbpos:
+                       default_orbpos = orbpos
+                       break
+       return ConfigSatlist(satlist, default_orbpos)
+
 def tryOpen(filename):
        try:
                procFile = open(filename)
@@ -353,14 +361,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):
@@ -410,13 +418,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()
@@ -608,7 +619,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
 
@@ -695,8 +706,9 @@ def InitNimManager(nimmgr):
                                        ("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")),
                                        ("positioner", _("Positioner"))],
                                default = "diseqc_a_b")
-                       nim.diseqcA = ConfigSatlist(default = 192, list = nimmgr.satList)
-                       nim.diseqcB = ConfigSatlist(default = 130, list = nimmgr.satList)
+
+                       nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
+                       nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
                        nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
                        nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
                        nim.positionerMode = ConfigSelection(
@@ -727,7 +739,7 @@ def InitNimManager(nimmgr):
                        
                        # advanced config:
                        nim.advanced = ConfigSubsection()
-                       nim.advanced.sats = ConfigSatlist(default = 192, list = nimmgr.satList)
+                       nim.advanced.sats = getConfigSatlist(192,nimmgr.satList)
                        nim.advanced.sat = ConfigSubDict()
                        lnbs = [("0", "not available")]
                        for y in range(1, 33):
@@ -750,7 +762,7 @@ def InitNimManager(nimmgr):
                                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")
@@ -783,11 +795,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: