h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heater: take a gcode_id when setting up a heater (#1028)

Browse Source 
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 <john@gprime.net>
This commit is contained in:
john--
2019-01-02 17:44:02 -05:00
committed by KevinOConnor
parent f4d323adbc
commit f6c9150349
4 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
klippy/kinematics/extruder.py
View File

@@ -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 = []