[RC] fixed incorrect setting of rcused value.

[vuplus_dvbapp] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 1f26dd6..9cc6dea 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -101,13 +101,16 @@ cable_bands = {
 cable_autoscan_nimtype = {
 'SSH108' : 'ssh108',
 'TT3L10' : 'tt3l10',
-'TURBO' : 'vuplus_turbo_c'
+'TURBO' : 'vuplus_turbo_c',
+'TT2L08' : 'tt2l08',
+'BCM3148' : 'bcm3148'
 }
 
 terrestrial_autoscan_nimtype = {
 'SSH108' : 'ssh108_t2_scan',
 'TT3L10' : 'tt3l10_t2_scan',
-'TURBO' : 'vuplus_turbo_t'
+'TURBO' : 'vuplus_turbo_t',
+'TT2L08' : 'tt2l08_t2_scan'
 }
 
 def GetDeviceId(filter, nim_idx):
@@ -126,6 +129,10 @@ def GetDeviceId(filter, nim_idx):
                socket_id += 1
        return device_id
 
+def GetTerrestrial5VEnable(nim_idx):
+       nim = nimmanager.nim_slots[nim_idx]
+       return int(nim.config.terrestrial_5V.value)
+
 class CableTransponderSearchSupport:
 #      def setCableTransponderSearchResult(self, tlist):
 #              pass
@@ -207,7 +214,7 @@ class CableTransponderSearchSupport:
                                nim_name = nimmanager.getNimName(nim_idx)
                                if nim_name is not None and nim_name != "":
                                        device_id = ""
-                                       nim_name = nim_name.split(' ')[-1][4:-1]
+                                       nim_name = nim_name.strip(':VTUNER').split(' ')[-1][4:-1]
                                        if nim_name == 'TT3L10':
                                                try:
                                                        device_id = GetDeviceId('TT3L10', nim_idx)
@@ -438,7 +445,7 @@ class TerrestrialTransponderSearchSupport:
                        nim_name = nimmanager.getNimName(nim_idx)
                        if nim_name is not None and nim_name != "":
                                device_id = ""
-                               nim_name = nim_name.split(' ')[-1][4:-1]
+                               nim_name = nim_name.strip(':VTUNER').split(' ')[-1][4:-1]
                                if nim_name == 'TT3L10':
                                        try:
                                                device_id = GetDeviceId('TT3L10', nim_idx)
@@ -475,6 +482,9 @@ class TerrestrialTransponderSearchSupport:
 #                      print "ERROR: could not get I2C device for nim", nim_idx, "for terrestrial transponder search"
                        self.terrestrial_search_bus = 2
 
+               self.terrestrial_search_feid = nim_idx
+               self.terrestrial_search_enable_5v = GetTerrestrial5VEnable(nim_idx)
+
                self.terrestrial_search_list = []
                self.terrestrialTransponderInitSearchList(self.terrestrial_search_list ,region)
                (freq, bandWidth) = self.terrestrialTransponderGetOpt()
@@ -486,7 +496,9 @@ class TerrestrialTransponderSearchSupport:
 
        def terrestrialTransponderSearch(self, freq, bandWidth):
                self.terrestrial_search_data = ""
-               cmd = "%s --freq %d --bw %d --bus %d --ds 2" % (self.terrestrial_search_binName, freq, bandWidth, self.terrestrial_search_bus)  
+               cmd = "%s --freq %d --bw %d --bus %d --ds 2" % (self.terrestrial_search_binName, freq, bandWidth, self.terrestrial_search_bus)
+               if self.terrestrial_search_enable_5v:
+                       cmd += " --feid %d --5v %d" % (self.terrestrial_search_feid, self.terrestrial_search_enable_5v)
                print "SCAN CMD : ",cmd
                self.terrestrial_search_container.execute(cmd)
 
@@ -1135,7 +1147,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport, Terrest
                        elif self.scan_typeterrestrial.value == "complete":
                                skip_t2 = True
                                if nim.isCompatible("DVB-T2"):
-                                       scan_util = len(self.terrestrialTransponderGetCmd(self.feid)) and True or False
+                                       scan_util = len(self.terrestrialTransponderGetCmd(nim.slot)) and True or False
                                        if scan_util:
                                                action = SEARCH_TERRESTRIAL2_TRANSPONDERS
                                        else: