From 21df21b7af2759aa577eb8d39d8215471956c25c Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 29 Jan 2018 12:54:06 -0500 Subject: fan: Clarify hardware_pwm and allow cycle_time to be set on software pwm Specify hardware pwm cycle times using the same method as software pwm (in seconds, not clock ticks). Allow the fan code to be configured with an explicit cycle time even when using software pwm. Signed-off-by: Kevin O'Connor --- klippy/chipmisc.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'klippy/chipmisc.py') diff --git a/klippy/chipmisc.py b/klippy/chipmisc.py index 611823ec..575f0664 100644 --- a/klippy/chipmisc.py +++ b/klippy/chipmisc.py @@ -25,12 +25,9 @@ class PrinterPin: self.is_pwm = 'pwm' in config.get_name().split()[0] if self.is_pwm: self.mcu_pin = pins.setup_pin(printer, 'pwm', config.get('pin')) - hard_pwm = config.getint('hard_pwm', None, minval=1) - if hard_pwm is None: - self.mcu_pin.setup_cycle_time(config.getfloat( - 'cycle_time', 0.100, above=0.)) - else: - self.mcu_pin.setup_hard_pwm(hard_pwm) + cycle_time = config.getfloat('cycle_time', 0.100, above=0.) + hardware_pwm = config.getboolean('hardware_pwm', False) + self.mcu_pin.setup_cycle_time(cycle_time, hardware_pwm) self.scale = config.getfloat('scale', 1., above=0.) else: self.mcu_pin = pins.setup_pin( -- cgit v1.2.3-70-g09d2