diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2017-09-06 14:51:47 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2017-09-07 11:19:27 -0400 |
commit | 7d17002b33f9f5da78bfde049331e125b426a4f9 (patch) | |
tree | d3fab2dd65f4e0b94914424269141b44f6968cc4 /klippy/extruder.py | |
parent | 477b3941a6e0ea83d73fbb1ad9e2ac17696bd0a3 (diff) | |
download | kutter-7d17002b33f9f5da78bfde049331e125b426a4f9.tar.gz kutter-7d17002b33f9f5da78bfde049331e125b426a4f9.tar.xz kutter-7d17002b33f9f5da78bfde049331e125b426a4f9.zip |
fan: Allow heater_fan to work with heater_bed
Fix order of init error preventing heater_fan from being used with
heater_bed.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extruder.py')
-rw-r--r-- | klippy/extruder.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index 45ed3bfc..44315f9b 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -252,11 +252,10 @@ def get_printer_extruders(printer): return out def get_printer_heater(printer, name): - if name == 'heater_bed': - return printer.objects.get(name) + if name == 'heater_bed' and name in printer.objects: + return printer.objects[name] if name == 'extruder': name = 'extruder0' - extruder = printer.objects.get(name) - if extruder is None: - return None - return extruder.get_heater() + if name.startswith('extruder') and name in printer.objects: + return printer.objects[name].get_heater() + raise printer.config_error("Unknown heater '%s'" % (name,)) |