From 2cadcf65aab0a0609fddd02ecfaf620e82641ed6 Mon Sep 17 00:00:00 2001
From: Bassam Husain <bassam.husain@gmail.com>
Date: Sun, 23 Apr 2023 15:44:04 -0400
Subject: [PATCH] Pulling in from master.

---
 cfgs/misc-macros.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index 8f1ed9c..9f7cb76 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -136,9 +136,9 @@ gcode:
         {% set startY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %}
     {% endif %}
 
-    {% set bedtempAlmost =  (bedtemp - 2)|int %}
-    {% set hotendtempStepOne = 150|int %}
-    {% set hotendtempStepTwo = 170|int %}
+    {% set bedtempAlmost = (bedtemp - 2, 0)|max %}
+    {% set hotendtempStepOne = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 150)|max %}
+    {% set hotendtempStepTwo = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 170)|max %}
 
     BED_MESH_PROFILE LOAD=default                                                ; NOTE if not using a mesh, comment out this line
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1