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>
This commit is contained in:
Kevin O'Connor
2017-09-06 14:51:47 -04:00
parent 477b3941a6
commit 7d17002b33
3 changed files with 12 additions and 14 deletions

View File

@@ -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,))