make inversion human readable

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 42ac01aa7e29647d9a96aefc096add6db948093b..dcdc53b5583f9c5bdd16d27597bc55005ce8e6ae 100644 (file)
--- 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;
 {
        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);
        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);
        PutToDict(dict, "symbol_rate", parm.u.qpsk.symbol_rate);

-       const char *fec=0;
+

        switch(parm.u.qpsk.fec_inner)
        {
                case FEC_1_2:
        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)
 {
 
 void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 {

+       PutToDict(dict, "frequency", parm.frequency/1000);

 /*
 #define parm.frequency parm.Frequency
 #define parm.inversion parm.Inversion
 /*
 #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)
 {
 
 void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
 {

+       PutToDict(dict, "frequency", parm.frequency);

 /*
 #define parm.frequency parm.Frequency
 #define parm.inversion parm.Inversion
 /*
 #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
                        {
                                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:
                                switch(m_type)
                                {
                                        case feSatellite:

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index e76d3dd080b764c4004f7983594a30b0f80b71b4..b063a8a78fe59207f88666264518babc89eed602 100644 (file)
--- 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()
                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
 
                else:
                        self.info = None
 

-       

                self["red"] = Label("Serviceinfo")
                self["green"] = Label("PIDs")
                self["yellow"] = Label("Transponder")
                self["red"] = Label("Serviceinfo")
                self["green"] = Label("PIDs")
                self["yellow"] = Label("Transponder")