diff options
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/display/display.py | 9 | ||||
| -rw-r--r-- | klippy/extras/gcode_macro.py | 6 | ||||
| -rw-r--r-- | klippy/extras/manual_probe.py | 2 | ||||
| -rw-r--r-- | klippy/extras/tsl1401cl_filament_width_sensor.py | 13 |
4 files changed, 14 insertions, 16 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 diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py index 3818df7e..e34dbf74 100644 --- a/klippy/extras/gcode_macro.py +++ b/klippy/extras/gcode_macro.py @@ -13,11 +13,7 @@ class GCodeMacro: self.script = config.get('gcode') printer = config.get_printer() self.gcode = printer.lookup_object('gcode') - try: - self.gcode.register_command( - self.alias, self.cmd, desc=self.cmd_desc) - except self.gcode.error as e: - raise config.error(str(e)) + self.gcode.register_command(self.alias, self.cmd, desc=self.cmd_desc) self.in_script = False self.kwparams = { o[len(DEFAULT_PREFIX):].upper(): config.get(o) for o in config.get_prefix_options(DEFAULT_PREFIX) } diff --git a/klippy/extras/manual_probe.py b/klippy/extras/manual_probe.py index a1fc63cf..b816d6c8 100644 --- a/klippy/extras/manual_probe.py +++ b/klippy/extras/manual_probe.py @@ -58,7 +58,7 @@ class ManualProbeHelper: try: self.gcode.register_command('ACCEPT', self.cmd_ACCEPT, desc=self.cmd_ACCEPT_help) - except self.gcode.error as e: + except self.printer.config_error as e: self.gcode.respond_error( "Already in a manual Z probe. Use ABORT to abort it.") self.finalize_callback(None) 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) |