From 7e45ae0f2d94168b9c36edb421373a9618b68005 Mon Sep 17 00:00:00 2001
From: Bassam Husain <bassam.husain@gmail.com>
Date: Sat, 20 May 2023 20:00:55 -0400
Subject: [PATCH] Pulled in print_start from master: prints start with higher
 bed temp now, range 10C.

---
 cfgs/misc-macros.cfg | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index e987a76..6e0d4be 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -127,6 +127,9 @@ gcode:
     {% set hotendtemp = params.HOTEND|int %}
     {% set chambertemp = params.CHAMBER|default(0)|int %}
     
+    # Other variables
+    {% set bedtempSlicer = bedtemp %}
+    {% set bedtempRange = 10 %}
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
     {% set maxVelocityAdjusted =  (0.90 * maxVelocity * 60)|int %}
 
@@ -135,32 +138,40 @@ gcode:
         {% set startY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %}
     {% endif %}
 
-    {% set bedtempAlmost = (bedtemp - 2, 0)|max %}
+    {% set bedtempAlmost = ((bedtemp - 2, 0, printer.heater_bed.temperature|int)|max, bedtemp)|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
+    # If bed-temp-almost is higher than bed-temp by a maximum of 10C
+    {% if bedtempAlmost > bedtemp %}
+        {% if (bedtempAlmost - bedtempRange) <= bedtemp %}
+            {% set bedtemp = bedtempAlmost %}
+        {% endif %}
+    {% endif %}
+
+    BED_MESH_PROFILE LOAD=default                        ; NOTE if not using a mesh, comment out this line
     ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
 
-    G90                                                                          ; absolute positioning
-    M140 S{bedtempAlmost}                                                        ; set & don't wait for bed temp
-    M104 S{hotendtempStepOne}                                                    ; set & don't wait for hotend temp
+    G90                                                  ; absolute positioning
+    M140 S{bedtempAlmost}                                ; set & don't wait for bed temp
+    M104 S{hotendtempStepOne}                            ; set & don't wait for hotend temp
     G28 X Y
     {% if printer.configfile.settings.safe_z_home %}
         G1 X{startX} Y{startY} F{maxVelocityAdjusted}
     {% endif %}
 
-    M190 S{bedtempAlmost}                                                        ; set & wait for bed temp
-    M104 S{hotendtempStepTwo}                                                    ; set & don't wait for hotend temp
-    M190 S{bedtemp}                                                              ; set & wait for bed temp
+    M190 S{bedtempAlmost}                                ; set & wait for bed temp
+    M104 S{hotendtempStepTwo}                            ; set & don't wait for hotend temp
+    M190 S{bedtemp}                                      ; set & wait for bed temp
+    M140 S{bedtempSlicer}                                ; set & don't wait for bed temp ; set temp to sliced setting regardless
 
-    M104 S{hotendtemp}                                                           ; set & don't wait for hotend temp
-    G28 Z                                                                        ; final z homing
+    M104 S{hotendtemp}                                   ; set & don't wait for hotend temp
+    G28 Z                                                ; final z homing
 
     G1 X0 Y0 F{maxVelocityAdjusted}
-    M109 S{hotendtemp}                                                           ; set & wait for hotend temp
+    M109 S{hotendtemp}                                   ; set & wait for hotend temp
 
-    G1 Z20 F3000                                                                 ; move nozzle away from bed
+    G1 Z20 F3000                                         ; move nozzle away from bed
 
 [gcode_macro PRINT_END]
 gcode: