3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-10 00:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fan: Minor updates to tachometer handling

Browse source 
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 <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-03-01 14:57:40 -05:00
parent 16d85d1a78
commit 4d3d25b1f7
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
klippy/extras/fan.py
View file

@ -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}