From 0980594e3037839b361eae71646ccf960aaa2659 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 11 Mar 2008 22:45:54 +0000 Subject: signal quality is SNR, signal power is AGC --- lib/python/Components/Sources/FrontendStatus.py | 6 +++--- lib/python/Components/TunerInfo.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index 8e29030a..3e469e0d 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -20,9 +20,9 @@ class FrontendStatus(Source): if not status: self.invalidate() else: - self.snr = status.get("tuner_signal_power") - self.snr_db = status.get("tuner_signal_power_db") - self.agc = status.get("tuner_signal_quality") + self.snr = status.get("tuner_signal_quality") + self.snr_db = status.get("tuner_signal_quality_db") + self.agc = status.get("tuner_signal_power") self.ber = status.get("tuner_bit_error_rate") self.lock = status.get("tuner_locked") self.changed((self.CHANGED_ALL, )) diff --git a/lib/python/Components/TunerInfo.py b/lib/python/Components/TunerInfo.py index 24950221..d8b4d064 100644 --- 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: - return self.statusDict.get("tuner_signal_power", 0) - elif what == self.AGC: 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: @@ -86,9 +86,9 @@ class TunerInfo(GUIComponent): 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) + elif what == self.AGC: + return feinfo.getFrontendInfo(iFrontendInformation.signalPower) 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: - return frontend.readFrontendData(iFrontendInformation.signalPower) - elif what == self.AGC: 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: -- cgit v1.2.3