signal quality is SNR, signal power is AGC

[enigma2.git] / lib / python / Components / TunerInfo.py

diff --git a/lib/python/Components/TunerInfo.py b/lib/python/Components/TunerInfo.py
index 24950221ef217cbe19e31fdb341840ed1d78de81..d8b4d064f6c210c247af54535df2f08ab626a68d 100644 (file)
--- a/lib/python/Components/TunerInfo.py
+++ b/lib/python/Components/TunerInfo.py
@@ -73,9 +73,9 @@ class TunerInfo(GUIComponent):
        def getValue(self, what):
                if self.statusDict:
                        if what == self.SNR:
        def getValue(self, what):
                if self.statusDict:
                        if what == self.SNR:

-                               return self.statusDict.get("tuner_signal_power", 0)
-                       elif what == self.AGC:

                                return self.statusDict.get("tuner_signal_quality", 0)
                                return self.statusDict.get("tuner_signal_quality", 0)

+                       elif what == self.AGC:
+                               return self.statusDict.get("tuner_signal_power", 0)

                        elif what == self.BER:
                                return self.statusDict.get("tuner_bit_error_rate", 0)
                        elif what == self.LOCK:
                        elif what == self.BER:
                                return self.statusDict.get("tuner_bit_error_rate", 0)
                        elif what == self.LOCK:


@@ -86,9 +86,9 @@ class TunerInfo(GUIComponent):
                                feinfo = service.frontendInfo()
                                if feinfo is not None:
                                        if what == self.SNR:
                                feinfo = service.frontendInfo()
                                if feinfo is not None:
                                        if what == self.SNR:

-                                               return feinfo.getFrontendInfo(iFrontendInformation.signalPower)
-                                       elif what == self.AGC:

                                                return feinfo.getFrontendInfo(iFrontendInformation.signalQuality)
                                                return feinfo.getFrontendInfo(iFrontendInformation.signalQuality)

+                                       elif what == self.AGC:
+                                               return feinfo.getFrontendInfo(iFrontendInformation.signalPower)

                                        elif what == self.BER:
                                                return feinfo.getFrontendInfo(iFrontendInformation.bitErrorRate)
                                        elif what == self.LOCK:
                                        elif what == self.BER:
                                                return feinfo.getFrontendInfo(iFrontendInformation.bitErrorRate)
                                        elif what == self.LOCK:


@@ -97,9 +97,9 @@ class TunerInfo(GUIComponent):
                        frontend = self.frontendfkt()
                        if frontend:
                                if what == self.SNR:
                        frontend = self.frontendfkt()
                        if frontend:
                                if what == self.SNR:

-                                       return frontend.readFrontendData(iFrontendInformation.signalPower)
-                               elif what == self.AGC:

                                        return frontend.readFrontendData(iFrontendInformation.signalQuality)
                                        return frontend.readFrontendData(iFrontendInformation.signalQuality)

+                               elif what == self.AGC:
+                                       return frontend.readFrontendData(iFrontendInformation.signalPower)

                                elif what == self.BER:
                                        return frontend.readFrontendData(iFrontendInformation.bitErrorRate)
                                elif what == self.LOCK:
                                elif what == self.BER:
                                        return frontend.readFrontendData(iFrontendInformation.bitErrorRate)
                                elif what == self.LOCK: