From f6c9150349d3ffb364a990132a16afa64c890b2e Mon Sep 17 00:00:00 2001 From: john-- Date: Wed, 2 Jan 2019 17:44:02 -0500 Subject: heater: take a gcode_id when setting up a heater (#1028) Allow an arbitrary gcode_id to be supplied during heater setup. This allows future extras to register additional IDs beyond B, and T#. Signed-off-by: John Jardine --- klippy/kinematics/extruder.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'klippy/kinematics/extruder.py') diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py index f3821d05..ec51b4df 100644 --- a/klippy/kinematics/extruder.py +++ b/klippy/kinematics/extruder.py @@ -9,13 +9,14 @@ import stepper, homing, chelper EXTRUDE_DIFF_IGNORE = 1.02 class PrinterExtruder: - def __init__(self, config): + def __init__(self, config, extruder_num): self.printer = config.get_printer() self.name = config.get_name() shared_heater = config.get('shared_heater', None) pheater = self.printer.lookup_object('heater') + gcode_id = 'T%d' % (extruder_num,) if shared_heater is None: - self.heater = pheater.setup_heater(config) + self.heater = pheater.setup_heater(config, gcode_id) else: self.heater = pheater.lookup_heater(shared_heater) self.stepper = stepper.PrinterStepper(config) @@ -237,11 +238,11 @@ def add_printer_objects(config): section = 'extruder%d' % (i,) if not config.has_section(section): if not i and config.has_section('extruder'): - pe = PrinterExtruder(config.getsection('extruder')) + pe = PrinterExtruder(config.getsection('extruder'), 0) printer.add_object('extruder0', pe) continue break - printer.add_object(section, PrinterExtruder(config.getsection(section))) + printer.add_object(section, PrinterExtruder(config.getsection(section), i)) def get_printer_extruders(printer): out = [] -- cgit v1.2.3-70-g09d2