aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/heater.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-12-16 19:16:58 -0500
committerKevin O'Connor <kevin@koconnor.net>2019-12-16 19:16:58 -0500
commit665323eb29c7794776ce64a17786032690ef3a2a (patch)
treeae19bd7bff5cb564c5406d1d9a3b92bfe04d2612 /klippy/heater.py
parent254789f4c570426f589e3cf966dac12a0600b6a5 (diff)
downloadkutter-665323eb29c7794776ce64a17786032690ef3a2a.tar.gz
kutter-665323eb29c7794776ce64a17786032690ef3a2a.tar.xz
kutter-665323eb29c7794776ce64a17786032690ef3a2a.zip
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 <kevin@koconnor.net>
Diffstat (limited to 'klippy/heater.py')
-rw-r--r--klippy/heater.py9
1 files changed, 3 insertions, 6 deletions
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):