From 665323eb29c7794776ce64a17786032690ef3a2a Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 16 Dec 2019 19:16:58 -0500 Subject: heater: Use printer.command_error() instead of internal heater.error() Use the more standard command_error to report invalid temperature requests. Signed-off-by: Kevin O'Connor --- klippy/heater.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'klippy/heater.py') diff --git a/klippy/heater.py b/klippy/heater.py index 3631db38..c16cafaa 100644 --- a/klippy/heater.py +++ b/klippy/heater.py @@ -15,11 +15,7 @@ MAX_HEAT_TIME = 5.0 AMBIENT_TEMP = 25. PID_PARAM_BASE = 255. -class error(Exception): - pass - class Heater: - error = error def __init__(self, config, sensor): self.printer = config.get_printer() self.gcode = self.printer.lookup_object("gcode") @@ -103,8 +99,9 @@ class Heater: return self.smooth_time def set_temp(self, print_time, degrees): if degrees and (degrees < self.min_temp or degrees > self.max_temp): - raise error("Requested temperature (%.1f) out of range (%.1f:%.1f)" - % (degrees, self.min_temp, self.max_temp)) + raise self.printer.command_error( + "Requested temperature (%.1f) out of range (%.1f:%.1f)" + % (degrees, self.min_temp, self.max_temp)) with self.lock: self.target_temp = degrees def get_temp(self, eventtime): -- cgit v1.2.3-70-g09d2