aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/tsl1401cl_filament_width_sensor.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-02-18 18:04:42 -0500
committerKevin O'Connor <kevin@koconnor.net>2019-02-18 18:04:42 -0500
commitb260eb916863aa2dc1e632bdd164ee67c4675c68 (patch)
tree19ffc30703ef642b18b12dff02da41622d55224d /klippy/extras/tsl1401cl_filament_width_sensor.py
parent276d5a1436f3f2c1d54665fcef518bbe8d42e617 (diff)
downloadkutter-b260eb916863aa2dc1e632bdd164ee67c4675c68.tar.gz
kutter-b260eb916863aa2dc1e632bdd164ee67c4675c68.tar.xz
kutter-b260eb916863aa2dc1e632bdd164ee67c4675c68.zip
gcode: Raise a config error on invalid register_command()
Raise a printer.config_error() on an invalid register_command() call. This error is easier to handle for the vast majority of callers. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/tsl1401cl_filament_width_sensor.py')
-rw-r--r--klippy/extras/tsl1401cl_filament_width_sensor.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/klippy/extras/tsl1401cl_filament_width_sensor.py b/klippy/extras/tsl1401cl_filament_width_sensor.py
index 06530bf8..fa1ac26d 100644
--- a/klippy/extras/tsl1401cl_filament_width_sensor.py
+++ b/klippy/extras/tsl1401cl_filament_width_sensor.py
@@ -24,7 +24,7 @@ class FilamentWidthSensor:
self.filament_array = []
self.lastFilamentWidthReading = 0
# printer objects
- self.gcode = self.toolhead = self.ppins = self.mcu_adc = None
+ self.toolhead = self.ppins = self.mcu_adc = None
self.printer.register_event_handler("klippy:ready", self.handle_ready)
# Start adc
self.ppins = self.printer.lookup_object('pins')
@@ -34,17 +34,18 @@ class FilamentWidthSensor:
# extrude factor updating
self.extrude_factor_update_timer = self.reactor.register_timer(
self.extrude_factor_update_event)
-
- # Initialization
- def handle_ready(self):
- # Load printer objects
+ # Register commands
self.gcode = self.printer.lookup_object('gcode')
- self.toolhead = self.printer.lookup_object('toolhead')
self.gcode.register_command('QUERY_FILAMENT_WIDTH', self.cmd_M407)
self.gcode.register_command('RESET_FILAMENT_WIDTH_SENSOR', self.cmd_ClearFilamentArray)
self.gcode.register_command('DISABLE_FILAMENT_WIDTH_SENSOR', self.cmd_M406)
self.gcode.register_command('ENABLE_FILAMENT_WIDTH_SENSOR', self.cmd_M405)
+ # Initialization
+ def handle_ready(self):
+ # Load printer objects
+ self.toolhead = self.printer.lookup_object('toolhead')
+
# Start extrude factor update timer
self.reactor.update_timer(self.extrude_factor_update_timer, self.reactor.NOW)