diff options
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/fan.py | 35 | ||||
| -rw-r--r-- | klippy/extras/pulse_counter.py | 79 |
2 files changed, 113 insertions, 1 deletions
diff --git a/klippy/extras/fan.py b/klippy/extras/fan.py index 664c1b31..13d9bcd7 100644 --- a/klippy/extras/fan.py +++ b/klippy/extras/fan.py @@ -3,6 +3,7 @@ # Copyright (C) 2016-2020 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. +import pulse_counter FAN_MIN_TIME = 0.100 @@ -11,6 +12,7 @@ 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, @@ -28,9 +30,14 @@ class Fan: self.mcu_fan.setup_cycle_time(cycle_time, hardware_pwm) shutdown_power = max(0., min(self.max_power, shutdown_speed)) self.mcu_fan.setup_start_value(0., shutdown_power) + + # Setup tachometer + self.tachometer = FanTachometer(config) + # Register callbacks self.printer.register_event_handler("gcode:request_restart", self._handle_request_restart) + def get_mcu(self): return self.mcu_fan.get_mcu() def set_speed(self, print_time, value): @@ -54,8 +61,34 @@ class Fan: self.set_speed(pt, value))) def _handle_request_restart(self, print_time): self.set_speed(print_time, 0.) + + def get_status(self, eventtime): + tachometer_status = self.tachometer.get_status(eventtime) + return { + 'speed': self.last_fan_value, + 'rpm': tachometer_status['rpm'], + } + +class FanTachometer: + def __init__(self, config): + printer = config.get_printer() + self._freq_counter = None + + pin = config.get('tachometer_pin', None) + if pin is not None: + self.ppr = config.getint('tachometer_ppr', 2, minval=1) + poll_time = config.getfloat('tachometer_poll_interval', + 0.0015, above=0.) + sample_time = 1. + self._freq_counter = pulse_counter.FrequencyCounter( + printer, pin, sample_time, poll_time) + def get_status(self, eventtime): - return {'speed': self.last_fan_value} + if self._freq_counter: + rpm = self._freq_counter.frequency * 30. / self.ppr + else: + rpm = None + return {'rpm': rpm} class PrinterFan: def __init__(self, config): diff --git a/klippy/extras/pulse_counter.py b/klippy/extras/pulse_counter.py new file mode 100644 index 00000000..00038f01 --- /dev/null +++ b/klippy/extras/pulse_counter.py @@ -0,0 +1,79 @@ +# Support for GPIO input edge counters +# +# Copyright (C) 2021 Adrian Keet <arkeet@gmail.com> +# +# This file may be distributed under the terms of the GNU GPLv3 license. + +class MCU_counter: + def __init__(self, printer, pin, sample_time, poll_time): + ppins = printer.lookup_object('pins') + pin_params = ppins.lookup_pin(pin, can_pullup=True) + self._mcu = pin_params['chip'] + self._oid = self._mcu.create_oid() + self._pin = pin_params['pin'] + self._pullup = pin_params['pullup'] + self._poll_time = poll_time + self._sample_time = sample_time + self._callback = None + self._last_count = 0 + self._mcu.register_config_callback(self.build_config) + + def build_config(self): + self._mcu.add_config_cmd("config_counter oid=%d pin=%s pull_up=%d" + % (self._oid, self._pin, self._pullup)) + clock = self._mcu.get_query_slot(self._oid) + poll_ticks = self._mcu.seconds_to_clock(self._poll_time) + sample_ticks = self._mcu.seconds_to_clock(self._sample_time) + self._mcu.add_config_cmd( + "query_counter oid=%d clock=%d poll_ticks=%d sample_ticks=%d" + % (self._oid, clock, poll_ticks, sample_ticks), is_init=True) + self._mcu.register_response(self._handle_counter_state, + "counter_state", self._oid) + + # Callback is called periodically every sample_time + def setup_callback(self, cb): + self._callback = cb + + def _handle_counter_state(self, params): + clock = self._mcu.clock32_to_clock64(params['time']) + time = self._mcu.clock_to_print_time(clock) + + count_clock = self._mcu.clock32_to_clock64(params['count_time']) + count_time = self._mcu.clock_to_print_time(count_clock) + + # handle 32-bit counter overflow + last_count = self._last_count + delta_count = (params['count'] - last_count) & 0xffffffff + count = last_count + delta_count + self._last_count = count + + if self._callback is not None: + self._callback(time, count, count_time) + +class FrequencyCounter: + def __init__(self, printer, pin, sample_time, poll_time): + self._callback = None + self._last_time = self._last_count = None + self._freq = 0. + self._counter = MCU_counter(printer, pin, sample_time, poll_time) + self._counter.setup_callback(self._counter_callback) + + def _counter_callback(self, time, count, count_time): + if self._last_time is None: # First sample + self._last_time = time + else: + delta_time = count_time - self._last_time + if delta_time > 0: + self._last_time = count_time + delta_count = count - self._last_count + self._freq = delta_count / delta_time + else: # No counts since last sample + self._last_time = time + self._freq = 0. + if self._callback is not None: + self._callback(time, self._freq) + self._last_count = count + + @property + def frequency(self): + return self._freq |