From 159a405b6c4eebe49e69b595310657ceda406c1c Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 7 Apr 2006 16:38:11 +0000 Subject: [PATCH] some work on DVB-T --- lib/python/Components/NimManager.py | 10 ++++++++++ lib/python/Screens/ScanSetup.py | 23 ++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index a3e64820..9dafaf40 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -422,9 +422,19 @@ class NimManager: def getTranspondersCable(self, cable): return self.transponderscable[cable] + def getTranspondersTerrestrial(self, region): + return self.transpondersterrestrial[region] + def getCableDescription(self, nim): return self.cablesList[config.Nims[nim].cable.value] + def getTerrestrialDescription(self, nim): + return self.terrestrialsList[config.Nims[nim].terrestrial.value][0] + + def getTerrestrialFlags(self, nim): + return self.terrestrialsList[config.Nims[nim].terrestrial.value][1] + + def getConfiguredSats(self): return self.sec.getSatList() diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index e0b5cd60..1743e61f 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -5,7 +5,7 @@ from Components.ActionMap import NumberActionMap from Components.ConfigList import ConfigList from Components.NimManager import nimmanager from Components.Label import Label -from enigma import eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl +from enigma import eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial def getInitialTransponderList(tlist, pos): list = nimmanager.getTransponders(pos) @@ -36,6 +36,22 @@ def getInitialCableTransponderList(tlist, cable): parm.inversion = 2 # AUTO tlist.append(parm) +def getInitialTerrestrialTransponderList(tlist, region): + list = nimmanager.getTranspondersTerrestrial(region) + + for x in list: +#self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv)) + if x[0] == 2: #TERRESTRIAL + parm = eDVBFrontendParametersTerrestrial() +# FIXME change into terrestrial + parm.frequency = x[1] + parm.symbol_rate = x[2] + parm.modulation = x[3] # AUTO + parm.fec_inner = x[4] # AUTO + parm.inversion = 2 # AUTO + tlist.append(parm) + + class ScanSetup(Screen): def __init__(self, session): Screen.__init__(self, session) @@ -407,8 +423,9 @@ class ScanSetup(Screen): hierarchy = config.scan.ter.hierarchy.value) if currentConfigSelectionElement(config.scan.ter.networkScan) == "yes": flags |= eComponentScan.scanNetworkSearch - if currentConfigSelectionElement(config.scan.typeterrestrial) == "complete": - pass + elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete": + getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(config.scan.nims.value)) + flags |= eComponentScan.scanNetworkSearch for x in self["config"].list: x[1].save() -- 2.30.2