3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-07 05:54:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

heaters: Make heater.py an "extras" module

Browse source 
The heater logic is an independent module that does not need to be
treated as part of the "core" klipper code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-25 13:27:41 -04:00
parent d858498a53
commit 17123889f6
16 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/kinematics/extruder.py
View file

@ -11,12 +11,12 @@ class PrinterExtruder:
self.printer = config.get_printer()
self.name = config.get_name()
shared_heater = config.get('shared_heater', None)
pheater = self.printer.lookup_object('heater')
pheaters = self.printer.try_load_module(config, 'heaters')
gcode_id = 'T%d' % (extruder_num,)
if shared_heater is None:
self.heater = pheater.setup_heater(config, gcode_id)
self.heater = pheaters.setup_heater(config, gcode_id)
else:
self.heater = pheater.lookup_heater(shared_heater)
self.heater = pheaters.lookup_heater(shared_heater)
self.stepper = stepper.PrinterStepper(config)
self.nozzle_diameter = config.getfloat('nozzle_diameter', above=0.)
filament_diameter = config.getfloat(
@ -167,7 +167,7 @@ class PrinterExtruder:
heater = extruder.get_heater()
heater.set_temp(temp)
if wait and temp:
self.printer.lookup_object('heater').wait_for_temperature(heater)
self.printer.lookup_object('heaters').wait_for_temperature(heater)
def cmd_M109(self, params):
# Set Extruder Temperature and Wait
self.cmd_M104(params, wait=True)