X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FTools%2FTransponder.py;h=0b8b96add3cfc07151eb741b4beafb0aeac07ac2;hb=bebd975124d229da970d05a3ca20acda3060fb1d;hp=049f42114bb7e9d6e18e40756bd83983832746a7;hpb=3de2ba79b56e3b227f72244631111e1847b49772;p=vuplus_dvbapp

diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py
index 049f421..0b8b96a 100644
--- a/lib/python/Tools/Transponder.py
+++ b/lib/python/Tools/Transponder.py
@@ -1,8 +1,10 @@
 from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
+from Components.NimManager import nimmanager
 
-def ConvertToHumanReadable(tp):
+def ConvertToHumanReadable(tp, type = None):
 	ret = { }
-	type = tp.get("tuner_type", "None")
+	if type is None:
+		type = tp.get("tuner_type", "None")
 	if type == "DVB-S":
 		ret["tuner_type"] = _("Satellite")
 		ret["inversion"] = {
@@ -26,6 +28,7 @@ def ConvertToHumanReadable(tp):
 			eDVBFrontendParametersSatellite.Modulation_QPSK : "QPSK",
 			eDVBFrontendParametersSatellite.Modulation_QAM16 : "QAM16",
 			eDVBFrontendParametersSatellite.Modulation_8PSK : "8PSK"}[tp["modulation"]]
+		ret["orbital_position"] = nimmanager.getSatName(int(tp["orbital_position"]))
 		ret["polarization"] = {
 			eDVBFrontendParametersSatellite.Polarisation_Horizontal : _("Horizontal"),
 			eDVBFrontendParametersSatellite.Polarisation_Vertical : _("Vertical"),
@@ -85,7 +88,7 @@ def ConvertToHumanReadable(tp):
 			eDVBFrontendParametersTerrestrial.FEC_2_3 : "2/3",
 			eDVBFrontendParametersTerrestrial.FEC_3_4 : "3/4",
 			eDVBFrontendParametersTerrestrial.FEC_5_6 : "5/6",
-			eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8"}[tp["code_rate_lp"]]
+			eDVBFrontendParametersTerrestrial.FEC_7_8 : "7/8"}[tp["code_rate_hp"]]
 		ret["constellation"] = {
 			eDVBFrontendParametersTerrestrial.Modulation_Auto : _("Auto"),
 			eDVBFrontendParametersTerrestrial.Modulation_QPSK : "QPSK",
@@ -111,6 +114,8 @@ def ConvertToHumanReadable(tp):
 			eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"),
 			eDVBFrontendParametersTerrestrial.Inversion_On : _("On"),
 			eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]]
+	else:
+		print "ConvertToHumanReadable: no or unknown type in tpdata dict!"
 	for x in tp.keys():
 		if not ret.has_key(x):
 			ret[x] = tp[x]