diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-24 03:31:00 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-24 03:31:00 +0000 |
| commit | cb35afaf63ad817ec47410ff6019722cf8f5fdc8 (patch) | |
| tree | 46033e38209925ed3354c36ba7c905b31302544c /lib/python | |
| parent | c83aa4e2cdbf3702e02d030bfc655761ebbec9f4 (diff) | |
| download | enigma2-cb35afaf63ad817ec47410ff6019722cf8f5fdc8.tar.gz enigma2-cb35afaf63ad817ec47410ff6019722cf8f5fdc8.zip | |
cable scan works now
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 12 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 19 |
2 files changed, 28 insertions, 3 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 550ce846..dfc5aec6 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -381,7 +381,6 @@ class NimManager: pass else: self.transponders[self.parsedCab] = [ ] - self.transponders[self.parsedCab].append((1, freq, sr, mod, fec)) class parseTerrestrials(ContentHandler): @@ -416,7 +415,16 @@ class NimManager: self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv)) def getTransponders(self, pos): - return self.transponders[pos] + if self.transponders.has_key(pos): + return self.transponders[pos] + else: + return [] + + def getTranspondersCable(self, cable): + return self.transponderscable[cable] + + def getCableDescription(self, nim): + return self.cablesList[config.Nims[nim].cable.value] def getConfiguredSats(self): return self.sec.getSatList() diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index aed39fb0..c86502e9 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -26,6 +26,23 @@ def getInitialTransponderList(tlist, pos): parm.orbital_position = pos tlist.append(parm) +def getInitialCableTransponderList(tlist, cable): + print "cable", cable + list = nimmanager.getTranspondersCable(cable) + + for x in list: + if x[0] == 1: #CABLE + print "[ScanSetup] cable-transponder to add:", x + parm = eDVBFrontendParametersCable() + parm.frequency = x[1] + parm.symbol_rate = x[2] + parm.modulation = 2 # x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.fec = 6# x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; + #parm.fec = 6 # AUTO + parm.inversion = 2 # AUTO + #parm.inversion = 2 #AUTO + tlist.append(parm) + class ScanSetup(Screen): def __init__(self, session): Screen.__init__(self, session) @@ -297,7 +314,7 @@ class ScanSetup(Screen): config.scan.cab.fec.value, config.scan.cab.inversion.value) elif currentConfigSelectionElement(config.scan.typecable) == "complete": - pass + getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value)) elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder": |