Merge pull request #185 from jurikaur/jurikaur-patch2

Probe start print sequence update and document
Frix-x · May 6, 2023 · e1288d0 · e1288d0
2 parents 5d68624 + ed9a293
commit e1288d0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/config/hardware/probes/dockable_probe.cfg b/config/hardware/probes/dockable_probe.cfg
@@ -1,6 +1,6 @@
 [gcode_macro _USER_VARIABLES]
 variable_probe_type_enabled: "dockable"
-variable_startprint_actions: "bed_soak", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
+variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
 gcode:
 
 # Dockable probe definition also include the probe management and overides directly from here

diff --git a/config/hardware/probes/inductive_probe.cfg b/config/hardware/probes/inductive_probe.cfg
@@ -1,6 +1,6 @@
 [gcode_macro _USER_VARIABLES]
 variable_probe_type_enabled: "inductive"
-variable_startprint_actions: "bed_soak", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
+variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
 gcode:
 
 # Inductive probe definition also include the probe management macro directly from here

diff --git a/config/hardware/probes/no_probe.cfg b/config/hardware/probes/no_probe.cfg
@@ -1,5 +1,5 @@
 # When no probe is installed on the machine, there is still the need to define a corresponding default START_PRINT sequence.
 # If you want to write your own sequence, have a look at your overrides.cfg file!
 [gcode_macro _USER_VARIABLES]
-variable_startprint_actions: "bed_soak", "chamber_soak", "extruder_heating", "purge", "clean", "z_offset", "primeline"
+variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "extruder_heating", "purge", "clean", "z_offset", "primeline"
 gcode:
diff --git a/config/hardware/probes/tap_probe.cfg b/config/hardware/probes/tap_probe.cfg
@@ -1,6 +1,6 @@
 [gcode_macro _USER_VARIABLES]
 variable_probe_type_enabled: "vorontap"
-variable_startprint_actions: "bed_soak", "chamber_soak", "clean", "tilt_calib", "z_offset", "bedmesh", "extruder_heating", "purge", "clean", "primeline"
+variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "clean", "tap_heating", "tilt_calib", "z_offset", "bedmesh", "extruder_heating", "purge", "clean", "primeline"
 gcode:
 
 # TAP probe definition also include the probe management macro directly from here

diff --git a/macros/base/start_print.cfg b/macros/base/start_print.cfg
@@ -117,6 +117,8 @@ gcode:
             _MODULE_BED_MESH
         {% elif action == "primeline" %}
             _MODULE_PRIMELINE
+        {% elif action == "extruder_preheating" %}
+            _MODULE_EXTRUDER_PREHEATING
         {% elif action == "custom1" %}
             _MODULE_CUSTOM1
         {% elif action == "custom2" %}
@@ -229,13 +231,11 @@ gcode:
 gcode:
     # ----- CHAMBER HEATSOAK ----------------------------------
     # If a setpoint is defined and a sensor available, then we wait to reach the chamber temperature (with a timeout in case it's winter...)
-    # We heat up the extruder a little bit to speed up the process by using the hotend fan. If there is one, the recirculating filter
-    # is also be powered on from the previous step and kept like that to act as bed fans
+    # If there is one, the recirculating filter is also be powered on from the previous step and kept like that to act as bed fans
     {% set CHAMBER_TEMP = printer["gcode_macro START_PRINT"].chamber_temp %}
     {% set CHAMBER_MAXTIME = printer["gcode_macro START_PRINT"].chamber_maxtime %}
 
     {% set chamber_sensor_enabled = printer["gcode_macro _USER_VARIABLES"].chamber_temperature_sensor_enabled %}
-    {% set safe_extruder_temp = printer["gcode_macro _USER_VARIABLES"].safe_extruder_temp|float %}
     {% set filter_enabled = printer["gcode_macro _USER_VARIABLES"].filter_enabled %}
 
     {% set St = printer["gcode_macro _USER_VARIABLES"].travel_speed * 60 %}
@@ -252,8 +252,6 @@ gcode:
                 START_FILTER SPEED=1
             {% endif %}
 
-            # Heat the hotend to the safe temperature to spread some heat as well
-            M104 S{safe_extruder_temp}
             # Wait for the temperature of the chamber to be reached (default max: 15min)
             HEATSOAK_CHAMBER TEMP={CHAMBER_TEMP} MAXTIME={CHAMBER_MAXTIME}
 
@@ -403,6 +401,19 @@ gcode:
     {% endif %}
 
 
+[gcode_macro _MODULE_EXTRUDER_PREHEATING]
+gcode:
+    # Preheat the nozzle to safe probing temperature.
+    {% set safe_extruder_temp = printer["gcode_macro _USER_VARIABLES"].safe_extruder_temp|float %}
+
+    {% set status_leds_enabled = printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
+
+    {% if status_leds_enabled %}
+        STATUS_LEDS COLOR="HEATING"
+    {% endif %}
+
+    M109 S{safe_extruder_temp}
+
 [gcode_macro _MODULE_CUSTOM1]
 gcode:
     # ---- CUSTOM Macro section

diff --git a/user_templates/overrides.cfg b/user_templates/overrides.cfg
@@ -26,7 +26,7 @@
 ## The START_PRINT sequence is modular and fully customizable. A default START_PRINT sequence is auto-populated based on
 ## your probe choice (TAP, Dockable, Inductive), but if for some reasons you still want to modify it, please uncomment the following 3
 ## lines to define a new `variable_startprint_actions`. You can use any number of action or even duplicate some actions if needed.
-## Available actions: "bed_soak", "chamber_soak", "extruder_heating", "tilt_calib", "z_offset", "bedmesh", "purge", "clean", "primeline"
+## Available actions: "bed_soak", "extruder_preheating", "chamber_soak", "extruder_heating", "tilt_calib", "z_offset", "bedmesh", "purge", "clean", "primeline"
 ##
 # [gcode_macro _USER_VARIABLES]
 # variable_startprint_actions: "action1", "action2", ...