From 2205f0ce601ffaf54c65a5e530d1562afdc4f572 Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 2 Oct 2013 23:01:10 +0900 Subject: [PATCH] fix ServiceInfo for plpid, and revert unnecessary fixes. --- lib/python/Components/NimManager.py | 16 +--------------- lib/python/Screens/Satconfig.py | 4 ++-- lib/python/Screens/ServiceInfo.py | 2 +- lib/python/Tools/Transponder.py | 10 +++++----- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 4b7ef8e..be28293 100755 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -913,7 +913,7 @@ class NimManager: nim = config.Nims[slotid] configMode = nim.configMode.value - if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C") or self.nim_slots[slotid].isCompatible("DVB-T2"): + if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C"): return not (configMode == "nothing") def getSatListForNim(self, slotid): @@ -1514,20 +1514,6 @@ def InitNimManager(nimmgr): n += 1 nim.terrestrial = ConfigSelection(choices = list) nim.terrestrial_5V = ConfigOnOff() - elif slot.isCompatible("DVB-T2"): - nim.configMode = ConfigSelection( - choices = { - "enabled": _("enabled"), - "nothing": _("nothing connected"), - }, - default = "enabled") - list = [] - n = 0 - for x in nimmgr.terrestrialsList: - list.append((str(n), x[0])) - n += 1 - nim.terrestrial = ConfigSelection(choices = list) - nim.terrestrial_5V = ConfigOnOff() else: empty_slots += 1 nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing"); diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 0bc2303..bce6525 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -190,7 +190,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen): self.list.append(getConfigListEntry(_("Scan additional SR"), self.nimConfig.cable.scan_sr_ext1)) self.list.append(getConfigListEntry(_("Scan additional SR"), self.nimConfig.cable.scan_sr_ext2)) self.have_advanced = False - elif self.nim.isCompatible("DVB-T") or self.nim.isCompatible("DVB-T2"): + elif self.nim.isCompatible("DVB-T"): self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode) self.list.append(self.configMode) self.have_advanced = False @@ -574,7 +574,7 @@ class NimSelection(Screen): text = _("simple") elif nimConfig.configMode.value == "advanced": text = _("advanced") - elif x.isCompatible("DVB-T") or x.isCompatible("DVB-T2") or x.isCompatible("DVB-C"): + elif x.isCompatible("DVB-T") or x.isCompatible("DVB-C"): if nimConfig.configMode.value == "nothing": text = _("nothing connected") elif nimConfig.configMode.value == "enabled": diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index 6694849..bc0968e 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -203,7 +203,7 @@ class ServiceInfo(Screen): (_("Inversion"), frontendData["inversion"], TYPE_TEXT), (_("FEC"), frontendData["fec_inner"], TYPE_TEXT)) elif frontendDataOrg["tuner_type"] == "DVB-T": - return ((_("NIM"), ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H')[frontendData["tuner_number"]], TYPE_TEXT), + data = ((_("NIM"), ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H')[frontendData["tuner_number"]], TYPE_TEXT), (_("Type"), frontendData["tuner_type"], TYPE_TEXT), (_("System"), frontendData["system"], TYPE_TEXT), (_("Frequency"), frontendData["frequency"], TYPE_VALUE_DEC), diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py index e34d10e..a882981 100644 --- a/lib/python/Tools/Transponder.py +++ b/lib/python/Tools/Transponder.py @@ -86,7 +86,7 @@ def ConvertToHumanReadable(tp, type = None): eDVBFrontendParametersTerrestrial.FEC_5_6 : "5/6", eDVBFrontendParametersTerrestrial.FEC_6_7 : "6/7", eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8", - eDVBFrontendParametersTerrestrial.FEC_8_9 : "8/9"}.get(tp.get("code_rate_lp")) + eDVBFrontendParametersTerrestrial.FEC_8_9 : "8/9"}[tp["code_rate_lp"]] ret["code_rate_hp"] = { eDVBFrontendParametersTerrestrial.FEC_Auto : _("Auto"), eDVBFrontendParametersTerrestrial.FEC_1_2 : "1/2", @@ -95,13 +95,13 @@ def ConvertToHumanReadable(tp, type = None): eDVBFrontendParametersTerrestrial.FEC_5_6 : "5/6", eDVBFrontendParametersTerrestrial.FEC_6_7 : "6/7", eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8", - eDVBFrontendParametersTerrestrial.FEC_8_9 : "8/9"}.get(tp.get("code_rate_hp")) + eDVBFrontendParametersTerrestrial.FEC_8_9 : "8/9"}[tp["code_rate_hp"]] ret["constellation"] = { eDVBFrontendParametersTerrestrial.Modulation_Auto : _("Auto"), eDVBFrontendParametersTerrestrial.Modulation_QPSK : "QPSK", eDVBFrontendParametersTerrestrial.Modulation_QAM16 : "QAM16", eDVBFrontendParametersTerrestrial.Modulation_QAM64 : "QAM64", - eDVBFrontendParametersTerrestrial.Modulation_QAM256 : "QAM256"}.get(tp.get("constellation")) + eDVBFrontendParametersTerrestrial.Modulation_QAM256 : "QAM256"}[tp["constellation"]] ret["transmission_mode"] = { eDVBFrontendParametersTerrestrial.TransmissionMode_Auto : _("Auto"), eDVBFrontendParametersTerrestrial.TransmissionMode_1k : "1k", @@ -109,7 +109,7 @@ def ConvertToHumanReadable(tp, type = None): eDVBFrontendParametersTerrestrial.TransmissionMode_4k : "4k", eDVBFrontendParametersTerrestrial.TransmissionMode_8k : "8k", eDVBFrontendParametersTerrestrial.TransmissionMode_16k : "16k", - eDVBFrontendParametersTerrestrial.TransmissionMode_32k : "32k"}.get(tp.get("transmission_mode")) + eDVBFrontendParametersTerrestrial.TransmissionMode_32k : "32k"}[tp["transmission_mode"]] ret["guard_interval"] = { eDVBFrontendParametersTerrestrial.GuardInterval_Auto : _("Auto"), eDVBFrontendParametersTerrestrial.GuardInterval_19_256 : "19/256", @@ -131,7 +131,7 @@ def ConvertToHumanReadable(tp, type = None): eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]] ret["system"] = { eDVBFrontendParametersTerrestrial.System_DVB_T : "DVB-T", - eDVBFrontendParametersTerrestrial.System_DVB_T2 : "DVB-T2"}[tp.get("system")] + eDVBFrontendParametersTerrestrial.System_DVB_T2 : "DVB-T2"}[tp["system"]] else: print "ConvertToHumanReadable: no or unknown type in tpdata dict!" for x in tp.keys(): -- 2.7.4