diff options
| author | Pascal P <Cirromulus@users.noreply.github.com> | 2021-01-22 19:41:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 13:41:34 -0500 |
| commit | 1e2eb9a4de8aad5da801466e74b085acb80a4ea5 (patch) | |
| tree | cc2862829c6007817c8e3c9f77585c333865ebfe | |
| parent | 8cc1d841805250323bcdcc147dc50c90c15c7198 (diff) | |
| download | kutter-1e2eb9a4de8aad5da801466e74b085acb80a4ea5.tar.gz kutter-1e2eb9a4de8aad5da801466e74b085acb80a4ea5.tar.xz kutter-1e2eb9a4de8aad5da801466e74b085acb80a4ea5.zip | |
hall_filament_width_sensor: Fix race condition (#3790)
Fix race condition of filament width sensor
Added fix to similar code of TSL1401CL filament width sensor
Signed-off-by: Pascal Pieper <accounts@pascalpieper.de>
| -rw-r--r-- | klippy/extras/hall_filament_width_sensor.py | 6 | ||||
| -rw-r--r-- | klippy/extras/tsl1401cl_filament_width_sensor.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/klippy/extras/hall_filament_width_sensor.py b/klippy/extras/hall_filament_width_sensor.py index 213eba74..9b244e13 100644 --- a/klippy/extras/hall_filament_width_sensor.py +++ b/klippy/extras/hall_filament_width_sensor.py @@ -152,7 +152,11 @@ class HallFilamentWidthSensor: else: self.gcode.run_script("M221 S100") self.filament_array = [] - return eventtime + 1 + + if self.is_active: + return eventtime + 1 + else: + return self.reactor.NEVER def cmd_M407(self, gcmd): response = "" diff --git a/klippy/extras/tsl1401cl_filament_width_sensor.py b/klippy/extras/tsl1401cl_filament_width_sensor.py index fc624440..fb2d9713 100644 --- a/klippy/extras/tsl1401cl_filament_width_sensor.py +++ b/klippy/extras/tsl1401cl_filament_width_sensor.py @@ -101,7 +101,11 @@ class FilamentWidthSensor: else: self.gcode.run_script("M221 S100") self.filament_array = [] - return eventtime + 1 + + if self.is_active: + return eventtime + 1 + else: + return self.reactor.NEVER def cmd_M407(self, gcmd): response = "" |