From 4d3d25b1f799e98e5c8a86b0a24e8507ecfb918e Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 1 Mar 2021 14:57:40 -0500 Subject: fan: Minor updates to tachometer handling Add new fields to Command_Templates.md. Remove unused self.rpm variable. Use an explicit get_frequency() method in keeping with Klipper's convention of not "peeking into member variables". Signed-off-by: Kevin O'Connor --- klippy/extras/fan.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'klippy/extras/fan.py') diff --git a/klippy/extras/fan.py b/klippy/extras/fan.py index 13d9bcd7..83df80fe 100644 --- a/klippy/extras/fan.py +++ b/klippy/extras/fan.py @@ -12,7 +12,6 @@ class Fan: self.printer = config.get_printer() self.last_fan_value = 0. self.last_fan_time = 0. - self.rpm = None # Read config self.max_power = config.getfloat('max_power', 1., above=0., maxval=1.) self.kick_start_time = config.getfloat('kick_start_time', 0.1, @@ -84,8 +83,8 @@ class FanTachometer: printer, pin, sample_time, poll_time) def get_status(self, eventtime): - if self._freq_counter: - rpm = self._freq_counter.frequency * 30. / self.ppr + if self._freq_counter is not None: + rpm = self._freq_counter.get_frequency() * 30. / self.ppr else: rpm = None return {'rpm': rpm} -- cgit v1.2.3-70-g09d2