From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 3 Mar 2006 16:12:03 +0000 (+0000)
Subject: make inversion human readable
X-Git-Tag: 2.6.0~3916
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d812a4bbfa77b845fe9cfe7d5d1124d302c155e1

make inversion human readable
---

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 42ac01aa..dcdc53b5 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -536,13 +536,13 @@ void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, e
 {
 	int freq_offset=0;
 	int csw=0;
+	const char *fec=0;
 	fe->getData(0, csw);
 	fe->getData(9, freq_offset);
 	int frequency = parm.frequency + freq_offset;
 	PutToDict(dict, "frequency", frequency);
-	PutToDict(dict, "inversion", parm.inversion);
 	PutToDict(dict, "symbol_rate", parm.u.qpsk.symbol_rate);
-	const char *fec=0;
+
 	switch(parm.u.qpsk.fec_inner)
 	{
 		case FEC_1_2:
@@ -570,6 +570,7 @@ void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, e
 
 void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 {
+	PutToDict(dict, "frequency", parm.frequency/1000);
 /*
 #define parm.frequency parm.Frequency
 #define parm.inversion parm.Inversion
@@ -581,6 +582,7 @@ void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 
 void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 {
+	PutToDict(dict, "frequency", parm.frequency);
 /*
 #define parm.frequency parm.Frequency
 #define parm.inversion parm.Inversion
@@ -659,6 +661,21 @@ PyObject *eDVBFrontend::readTransponderData(bool original)
 				eDebug("FE_GET_FRONTEND (%m)");
 			else
 			{
+				tmp = "INVERSION_AUTO";
+				switch(parm.inversion)
+				{
+					case INVERSION_ON:
+						tmp = "INVERSION_ON";
+						break;
+					case INVERSION_OFF:
+						tmp = "INVERSION_OFF";
+						break;
+					default:
+						break;
+				}
+				if (tmp)
+					PutToDict(ret, "inversion", tmp);
+
 				switch(m_type)
 				{
 					case feSatellite:
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index e76d3dd0..b063a8a7 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -70,10 +70,12 @@ class ServiceInfo(Screen):
 		service = session.nav.getCurrentService()
 		if service is not None:
 			self.info = service.info()
+			self.feinfo = service.frontendStatusInfo()
+			if self.feinfo:
+				print self.feinfo.getFrontendData(False)
 		else:
 			self.info = None
 
-	
 		self["red"] = Label("Serviceinfo")
 		self["green"] = Label("PIDs")
 		self["yellow"] = Label("Transponder")