diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-02-18 18:04:42 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-18 18:04:42 -0500 |
| commit | b260eb916863aa2dc1e632bdd164ee67c4675c68 (patch) | |
| tree | 19ffc30703ef642b18b12dff02da41622d55224d /klippy/extras/display | |
| parent | 276d5a1436f3f2c1d54665fcef518bbe8d42e617 (diff) | |
| download | kutter-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/display')
| -rw-r--r-- | klippy/extras/display/display.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/klippy/extras/display/display.py b/klippy/extras/display/display.py index e83ed1a4..ce34a6bb 100644 --- a/klippy/extras/display/display.py +++ b/klippy/extras/display/display.py @@ -24,17 +24,20 @@ class PrinterLCD: # menu self.menu = menu.MenuManager(config, self.lcd_chip) # printer objects - self.gcode = self.toolhead = self.sdcard = None + self.toolhead = self.sdcard = None self.fan = self.extruder0 = self.extruder1 = self.heater_bed = None self.printer.register_event_handler("klippy:ready", self.handle_ready) # screen updating self.screen_update_timer = self.reactor.register_timer( self.screen_update_event) + # Register commands + self.gcode = self.printer.lookup_object('gcode') + self.gcode.register_command('M73', self.cmd_M73) + self.gcode.register_command('M117', self.cmd_M117) # Initialization def handle_ready(self): self.lcd_chip.init() # Load printer objects - self.gcode = self.printer.lookup_object('gcode') self.toolhead = self.printer.lookup_object('toolhead') self.sdcard = self.printer.lookup_object('virtual_sdcard', None) self.fan = self.printer.lookup_object('fan', None) @@ -45,8 +48,6 @@ class PrinterLCD: self.progress = None self.msg_time = None self.message = None - self.gcode.register_command('M73', self.cmd_M73) - self.gcode.register_command('M117', self.cmd_M117) # Start screen update timer self.reactor.update_timer(self.screen_update_timer, self.reactor.NOW) # Get menu instance |