From 787ed452c2abe3bad81ffaf732b0b2609e3534bb Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 5 May 2020 14:10:30 -0400 Subject: klippy: Rename try_load_module() to load_object() Rename try_load_module() so that it uses consistent naming for "printer objects". Change the function to raise an error by default if the specified module does not exist. Signed-off-by: Kevin O'Connor --- klippy/extras/filament_switch_sensor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/extras/filament_switch_sensor.py') diff --git a/klippy/extras/filament_switch_sensor.py b/klippy/extras/filament_switch_sensor.py index 58d2bb07..78dee6f8 100644 --- a/klippy/extras/filament_switch_sensor.py +++ b/klippy/extras/filament_switch_sensor.py @@ -14,9 +14,9 @@ class RunoutHelper: # Read config self.runout_pause = config.getboolean('pause_on_runout', True) if self.runout_pause: - self.printer.try_load_module(config, 'pause_resume') + self.printer.load_object(config, 'pause_resume') self.runout_gcode = self.insert_gcode = None - gcode_macro = self.printer.try_load_module(config, 'gcode_macro') + gcode_macro = self.printer.load_object(config, 'gcode_macro') if self.runout_pause or config.get('runout_gcode', None) is not None: self.runout_gcode = gcode_macro.load_template( config, 'runout_gcode', '') @@ -104,7 +104,7 @@ class RunoutHelper: class SwitchSensor: def __init__(self, config): printer = config.get_printer() - buttons = printer.try_load_module(config, 'buttons') + buttons = printer.load_object(config, 'buttons') switch_pin = config.get('switch_pin') buttons.register_buttons([switch_pin], self._button_handler) self.runout_helper = RunoutHelper(config) -- cgit v1.2.3-70-g09d2