some work on DVB-T

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index a3e648204af8105c9d7bd60a583317e8c2a633c1..9dafaf40cd792306e43ea0e7a16d569c31ce9200 100644 (file)
--- 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 e0b5cd600dac019337735939cc3a7b322e9a8b8d..1743e61f527b291eb503a23440871c33c38cf9e6 100644 (file)
--- 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()