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

gcode: Rename self.heater to self.heaters 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-02-25 20:04:05 -05:00
parent f7d8854587
commit 13b2e091b8
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
klippy/gcode.py
View File

@ -56,7 +56,7 @@ class GCodeParser:
# G-Code state # G-Code state
self.need_ack = False self.need_ack = False
self.toolhead = self.fan = self.extruder = None self.toolhead = self.fan = self.extruder = None
self.heater = None self.heaters = None
self.speed = 25. * 60. self.speed = 25. * 60.
self.axis2pos = {'X': 0, 'Y': 1, 'Z': 2, 'E': 3} self.axis2pos = {'X': 0, 'Y': 1, 'Z': 2, 'E': 3}
def register_command(self, cmd, func, when_not_ready=False, desc=None): def register_command(self, cmd, func, when_not_ready=False, desc=None):
@ -136,7 +136,7 @@ class GCodeParser:
self.is_printer_ready = True self.is_printer_ready = True
self.gcode_handlers = self.ready_gcode_handlers self.gcode_handlers = self.ready_gcode_handlers
# Lookup printer components # Lookup printer components
self.heater = self.printer.lookup_object('heater') self.heaters = self.printer.lookup_object('heater')
self.toolhead = self.printer.lookup_object('toolhead') self.toolhead = self.printer.lookup_object('toolhead')
if self.move_transform is None: if self.move_transform is None:
self.move_with_transform = self.toolhead.move self.move_with_transform = self.toolhead.move
@ -372,11 +372,10 @@ class GCodeParser:
def get_temp(self, eventtime): def get_temp(self, eventtime):
# Tn:XXX /YYY B:XXX /YYY # Tn:XXX /YYY B:XXX /YYY
out = [] out = []
if self.heater is not None: if self.heaters is not None:
for heater in self.heater.get_all_heaters(): for heater in self.heaters.get_all_heaters():
if heater is not None: cur, target = heater.get_temp(eventtime)
cur, target = heater.get_temp(eventtime) out.append("%s:%.1f /%.1f" % (heater.gcode_id, cur, target))
out.append("%s:%.1f /%.1f" % (heater.gcode_id, cur, target))
if not out: if not out:
return "T:0" return "T:0"
return " ".join(out) return " ".join(out)
@ -392,12 +391,12 @@ class GCodeParser:
temp = self.get_float('S', params, 0.) temp = self.get_float('S', params, 0.)
heater = None heater = None
if is_bed: if is_bed:
heater = self.heater.get_heater_by_gcode_id('B') heater = self.heaters.get_heater_by_gcode_id('B')
elif 'T' in params: elif 'T' in params:
index = self.get_int('T', params, minval=0) index = self.get_int('T', params, minval=0)
heater = self.heater.get_heater_by_gcode_id('T%d' % (index,)) heater = self.heaters.get_heater_by_gcode_id('T%d' % (index,))
else: else:
heater = self.heater.get_heater_by_gcode_id('T0') heater = self.heaters.get_heater_by_gcode_id('T0')
if heater is None: if heater is None:
if temp > 0.: if temp > 0.:
self.respond_error("Heater not configured") self.respond_error("Heater not configured")
@ -674,10 +673,9 @@ class GCodeParser:
if self.is_printer_ready: if self.is_printer_ready:
self.toolhead.motor_off() self.toolhead.motor_off()
print_time = self.toolhead.get_last_move_time() print_time = self.toolhead.get_last_move_time()
if self.heater is not None: if self.heaters is not None:
for heater in self.heater.get_all_heaters(): for heater in self.heaters.get_all_heaters():
if heater is not None: heater.set_temp(print_time, 0.)
heater.set_temp(print_time, 0.)
if self.fan is not None: if self.fan is not None:
self.fan.set_speed(print_time, 0.) self.fan.set_speed(print_time, 0.)
self.toolhead.dwell(0.500) self.toolhead.dwell(0.500)