From b98e12c19a6dd2ecdc5e9ae7441bd443f74e271a Mon Sep 17 00:00:00 2001 From: Florian Heilmann Date: Tue, 30 Oct 2018 23:08:12 +0100 Subject: [PATCH] sx1509: Relax restrictions on SX1509 pins (#836) This allows SX1509 pins to be used as temperature fans and heater fans. Heaters are still disallowed. Signed-off-by: Florian Heilmann --- klippy/extras/sx1509.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/klippy/extras/sx1509.py b/klippy/extras/sx1509.py index 8fb7c507..0fe44ce0 100644 --- a/klippy/extras/sx1509.py +++ b/klippy/extras/sx1509.py @@ -126,11 +126,11 @@ class SX1509_digital_out(object): def setup_max_duration(self, max_duration): self._max_duration = max_duration def setup_start_value(self, start_value, shutdown_value, is_static=False): - if is_static or shutdown_value: - raise pins.error("SX1509 Pins should not be declared static or have a shutdown value") + if is_static and start_value != shutdown_value: + raise pins.error("Static pin can not have shutdown value") self._start_value = (not not start_value) ^ self._invert self._shutdown_value = self._invert - self._is_static = False + self._is_static = is_static # We need to set the start value here so the register is # updated before the SX1509 class writes it. if self._start_value: @@ -190,14 +190,14 @@ class SX1509_pwm(object): self._cycle_time = cycle_time self._hardware_pwm = hardware_pwm def setup_start_value(self, start_value, shutdown_value, is_static=False): - if is_static or shutdown_value: - raise pins.error("SX1509 Pins should not be declared static or have a shutdown value") + if is_static and start_value != shutdown_value: + raise pins.error("Static pin can not have shutdown value") if self._invert: start_value = 1. - start_value shutdown_value = 1. - shutdown_value self._start_value = max(0., min(1., start_value)) self._shutdown_value = max(0., min(1., shutdown_value)) - self._is_static = False + self._is_static = is_static def set_pwm(self, print_time, value): self._sx1509.set_register(self._i_on_reg, ~int(255 * value) if not self._invert