aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/klippy.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-01-08 11:09:55 -0500
committerKevin O'Connor <kevin@koconnor.net>2019-01-08 11:09:55 -0500
commit857e7ed5f1a725e1342359b6c071586a3d495702 (patch)
tree5d5345cf064c080cf436bfe1f0c5138d700780ad /klippy/klippy.py
parent797367b9f5652df4103d7185567c8d749a8afbff (diff)
downloadkutter-857e7ed5f1a725e1342359b6c071586a3d495702.tar.gz
kutter-857e7ed5f1a725e1342359b6c071586a3d495702.tar.xz
kutter-857e7ed5f1a725e1342359b6c071586a3d495702.zip
klippy: Convert printer_state("connect") to an event handler
Convert all users of the printer_state("connect") handler to register a "klippy:connect" event handler instead. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/klippy.py')
-rw-r--r--klippy/klippy.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 0a8f2852..51ec2bd6 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -58,7 +58,6 @@ class Printer:
self.event_handlers = {}
gc = gcode.GCodeParser(self, input_fd)
self.objects = collections.OrderedDict({'gcode': gc})
- self.state_cb = [gc.printer_state]
def get_start_args(self):
return self.start_args
def get_reactor(self):
@@ -128,16 +127,13 @@ class Printer:
m.add_printer_objects(config)
# Validate that there are no undefined parameters in the config file
pconfig.check_unused_options(config)
- # Determine which printer objects have state callbacks
- self.state_cb = [o.printer_state for o in self.objects.values()
- if hasattr(o, 'printer_state')]
def _connect(self, eventtime):
try:
self._read_config()
- for cb in self.state_cb:
+ for cb in self.event_handlers.get("klippy:connect", []):
if self.state_message is not message_startup:
return
- cb('connect')
+ cb()
except (self.config_error, pins.error) as e:
logging.exception("Config error")
self._set_state("%s%s" % (str(e), message_restart))