fix dvb-t scan, config

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index f9b9ff6d55956c3c8152ea54adc20dbcb43946c6..5b3b853fb7ffdcd32003383a7cf03a5b291af309 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, ConfigNothing, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict, ConfigOnOff
 
 from enigma import eDVBSatelliteEquipmentControl, \
        eDVBSatelliteLNBParameters as lnbParam, \
@@ -353,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):
@@ -410,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()
@@ -608,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
 
@@ -783,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: