getInfoObject sTransponderData now also returns transponder data values (not strings...

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

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 00adc74..d233c98 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -14,7 +14,7 @@ TYPE_VALUE_DEC = 2
 TYPE_VALUE_HEX_DEC = 3
 TYPE_SLIDER = 4
 
-def to_unsinged(x):
+def to_unsigned(x):
        return x & 0xFFFFFFFF
 
 def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
@@ -132,25 +132,26 @@ class ServiceInfo(Screen):
                else:
                        if self.transponder_info:
                                conv = { "type"                         : _("Transponder Type"),
-                                                "frequency"            : _("Frequency"),
-                                                "symbolrate"           : _("Symbolrate"),
-                                                "orbital position" : _("Orbital Position"),
-                                                "inversion"            : _("Inversion"),
-                                                "fec inner"            : _("FEC"),
-                                                "modulation"           : _("Modulation"),
-                                                "polarization"         : _("Polarization"),
-                                                "roll off"                     : _("Rolloff"),
                                                 "system"                       : _("System"),
+                                                "modulation"           : _("Modulation"),
+                                                "orbital_position" : _("Orbital Position"),
+                                                "frequency"            : _("Frequency"),
+                                                "symbol_rate"          : _("Symbolrate"),
                                                 "bandwidth"            : _("Bandwidth"),
-                                                "code rate lp"         : _("Coderate LP"),
-                                                "code rate hp"         : _("Coderate HP"),
+                                                "polarization"         : _("Polarization"),
+                                                "inversion"            : _("Inversion"),
+                                                "pilot"                        : _("Pilot"),
+                                                "rolloff"                      : _("Rolloff"),
+                                                "fec_inner"            : _("FEC"),
+                                                "code_rate_lp"         : _("Coderate LP"),
+                                                "code_rate_hp"         : _("Coderate HP"),
                                                 "constellation"        : _("Constellation"),
-                                                "transmission mode": _("Transmission Mode"),
-                                                "guard interval"       : _("Guard Interval"),
-                                                "hierarchy"            : _("Hierarchy Information") }
+                                                "transmission_mode": _("Transmission Mode"),
+                                                "guard_interval"       : _("Guard Interval"),
+                                                "hierarchy_information": _("Hierarchy Information") }
                                Labels = [ ]
                                for i in self.transponder_info.keys():
-                                       Labels.append( (conv[i], self.transponder_info[i], TYPE_TEXT) )
+                                       Labels.append( (conv[i], self.transponder_info[i], TYPE_VALUE_DEC) )
                                self.fillList(Labels)
 
        def pids(self):
@@ -190,7 +191,9 @@ class ServiceInfo(Screen):
                                                        ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
                                                        ("Polarization", frontendData["polarization"], TYPE_TEXT),
                                                        ("Inversion", frontendData["inversion"], TYPE_TEXT),
-                                                       ("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
+                                                       ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
+                                                       ("Pilot", frontendData.get("pilot", None), TYPE_TEXT),
+                                                       ("Rolloff", frontendData.get("rolloff", None), TYPE_TEXT))
                        elif frontendData["tuner_type"] == "DVB-C":
                                return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
                                                ("Type", frontendData["tuner_type"], TYPE_TEXT),
@@ -217,6 +220,8 @@ class ServiceInfo(Screen):
                tlist = [ ]
 
                for item in Labels:
+                       if item[1] is None:
+                               continue;
                        value = item[1]
                        if len(item) < 4:
                                tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))