From d372386fe2bcf77769f40c3067b8ca804ba69b71 Mon Sep 17 00:00:00 2001 From: Veljko Djurkovic <107362235+veljkoDjurkovic@users.noreply.github.com> Date: Thu, 28 Jul 2022 14:15:36 +0200 Subject: [PATCH] Revert "Issue #4 - standard misunderstood" This reverts commit c56bc9efcd334ac8a8545ab0dc34d0b6e138313c. --- synchrophasor/frame.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synchrophasor/frame.py b/synchrophasor/frame.py index fc51271..bff1ed9 100644 --- a/synchrophasor/frame.py +++ b/synchrophasor/frame.py @@ -2357,7 +2357,7 @@ def get_measurements(self): "phasors": self.get_phasors()[i], "analog": self.get_analog()[i], "digital": self.get_digital()[i], - "frequency": (self.get_freq()[i] / 1000) if (self.cfg.get_data_format()[i])[3] else self.cfg.get_fnom()[i] + self.get_freq()[i] / 1000, + "frequency": self.cfg.get_fnom()[i] + self.get_freq()[i] / 1000, "rocof": self.get_dfreq()[i]} measurements.append(measurement) @@ -2368,7 +2368,7 @@ def get_measurements(self): "phasors": self.get_phasors(), "analog": self.get_analog(), "digital": self.get_digital(), - "frequency": (self.get_freq() / 1000) if (self.cfg.get_data_format())[3] else self.cfg.get_fnom() + self.get_freq() / 1000, + "frequency": self.cfg.get_fnom() + self.get_freq() / 1000, "rocof": self.get_dfreq() })