3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filament_switch_sensor: Collapse event disable flags 

Introduce min_event_systime and rework the previous start_time,
last_event_time, and event_running flags into this one state tracking
variable.

This also makes a minor change to the behavior of the event_delay - it
is now calculated from the time the command completes execution
(instead of from when the event is first detected).  This may make a
difference if there is a long running g-code command occurring during
the detection event.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-02-17 16:57:27 -05:00
parent 6716007420
commit b6368173cf
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
klippy/extras/filament_switch_sensor.py
View File

@ -24,13 +24,11 @@ class RunoutHelper:
config, 'insert_gcode') config, 'insert_gcode')
self.pause_delay = config.getfloat('pause_delay', .5, above=.0) self.pause_delay = config.getfloat('pause_delay', .5, above=.0)
self.event_delay = config.getfloat('event_delay', 3., above=0.) self.event_delay = config.getfloat('event_delay', 3., above=0.)
self.start_time = self.reactor.NEVER self.min_event_systime = self.reactor.NEVER
self.last_event_time = 0.
self.filament_present = False self.filament_present = False
self.runout_enabled = False self.runout_enabled = False
self.insert_enabled = self.insert_gcode is not None self.insert_enabled = self.insert_gcode is not None
self.sensor_enabled = True self.sensor_enabled = True
self.event_running = False
self.print_status = "idle" self.print_status = "idle"
self.printer.register_event_handler("klippy:ready", self._handle_ready) self.printer.register_event_handler("klippy:ready", self._handle_ready)
self.printer.register_event_handler( self.printer.register_event_handler(
@ -51,7 +49,7 @@ class RunoutHelper:
self.cmd_SET_FILAMENT_SENSOR, self.cmd_SET_FILAMENT_SENSOR,
desc=self.cmd_SET_FILAMENT_SENSOR_help) desc=self.cmd_SET_FILAMENT_SENSOR_help)
def _handle_ready(self): def _handle_ready(self):
self.start_time = self.reactor.monotonic() + 2. self.min_event_systime = self.reactor.monotonic() + 2.
def _update_print_status(self, eventtime, status): def _update_print_status(self, eventtime, status):
if status == "printing": if status == "printing":
runout_en = self.runout_gcode is not None runout_en = self.runout_gcode is not None
@ -76,7 +74,7 @@ class RunoutHelper:
self.gcode.run_script(prefix + template.render() + "\nM400") self.gcode.run_script(prefix + template.render() + "\nM400")
except Exception: except Exception:
logging.exception("Script running error") logging.exception("Script running error")
self.event_running = False self.min_event_systime = self.reactor.monotonic() + self.event_delay
def set_enable(self, runout, insert): def set_enable(self, runout, insert):
if runout and insert: if runout and insert:
# both cannot be enabled # both cannot be enabled
@ -88,9 +86,7 @@ class RunoutHelper:
return return
self.filament_present = is_filament_present self.filament_present = is_filament_present
eventtime = self.reactor.monotonic() eventtime = self.reactor.monotonic()
if (eventtime < self.start_time if eventtime < self.min_event_systime or not self.sensor_enabled:
or (eventtime - self.last_event_time) < self.event_delay
or not self.sensor_enabled or self.event_running):
# do not process during the initialization time, duplicates, # do not process during the initialization time, duplicates,
# during the event delay time, while an event is running, or # during the event delay time, while an event is running, or
# when the sensor is disabled # when the sensor is disabled
@ -98,16 +94,14 @@ class RunoutHelper:
if is_filament_present: if is_filament_present:
if self.insert_enabled: if self.insert_enabled:
# insert detected # insert detected
self.event_running = True self.min_event_systime = self.reactor.NEVER
self.last_event_time = eventtime
logging.info( logging.info(
"Filament Sensor %s: insert event detected, Time %.2f" % "Filament Sensor %s: insert event detected, Time %.2f" %
(self.name, eventtime)) (self.name, eventtime))
self.reactor.register_callback(self._insert_event_handler) self.reactor.register_callback(self._insert_event_handler)
elif self.runout_enabled: elif self.runout_enabled:
# runout detected # runout detected
self.event_running = True self.min_event_systime = self.reactor.NEVER
self.last_event_time = eventtime
logging.info( logging.info(
"Filament Sensor %s: runout event detected, Time %.2f" % "Filament Sensor %s: runout event detected, Time %.2f" %
(self.name, eventtime)) (self.name, eventtime))