From 03f4cc150bef6b284d8c1db8e00e178bc6fa4e3f Mon Sep 17 00:00:00 2001
From: Konstantin Koslowski <konstantin.koslowski@posteo.de>
Date: Sun, 19 Dec 2021 20:15:04 +0100
Subject: [PATCH] v2.4: update macros

---
 macros/print.cfg | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/macros/print.cfg b/macros/print.cfg
index c4aadb3..e25f198 100644
--- a/macros/print.cfg
+++ b/macros/print.cfg
@@ -129,13 +129,13 @@ gcode:
   {% set ERCF_EXTRUDER=params.ERCF_EXTRUDER|default(0)|int %}
   {action_respond_info("starting print BED=%d, EXTRUDER=%d, CHAMBER=%d, SHEET=%s, QGL=%d, BMC=%d, PURGE=%d, SOAK=%d, Z_AJUST=%f, ERCF=%d, ERCF_EXTRUDER=%d" % (BED, EXTRUDER, CHAMBER, SHEET, QGL, BMC, PURGE, SOAK, Z_ADJUST, ERCF, ERCF_EXTRUDER))}
   M118 configuring
-  SET_GCODE_OFFSET Z=0.0 # reset z offset
-  M140 S{BED}            # start bed heating
-  M104 S{EXTRUDER}       # start extruder heating
-  G92 E0                 # reset extruder
-  G21                    # set units to millimeters
-  G90                    # use absolute coordinates
-  M83                    # use relative distances for extrusion
+  SET_GCODE_OFFSET Z=0.0  # reset z offset
+  M140 S{BED}             # start bed heating
+  M104 S{EXTRUDER}        # start extruder heating
+  G92 E0                  # reset extruder
+  G21                     # set units to millimeters
+  G90                     # use absolute coordinates
+  M83                     # use relative distances for extrusion
 
   G4 P2000
   {% if BMC %}
@@ -144,11 +144,7 @@ gcode:
   M118 home
   G28
   BRUSHIE
-  {% if ERCF %}
-    M118 ercf home
-    ERCF_HOME
-  {% endif %}
-  {% if QGL or printer.quad_gantry_level.applied|lower == 'false' %}
+  {% if QGL %}
     M118 qgl
     QUAD_GANTRY_LEVEL PARK=false
     BRUSHIE
@@ -175,14 +171,12 @@ gcode:
   {% endif %}
 
   M118 starting
-  SET_PRESSURE_ADVANCE ADVANCE=0.05
   SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1
-
   {% if ERCF %}
     M118 ercf changing to tool {ERCF_EXTRUDER}
-    ERCF_CHANGE_TOOL_STANDALONE TOOL={ERCF_EXTRUDER}
+    ERCF_CHANGE_TOOL_SLICER TOOL={ERCF_EXTRUDER}
   {% endif %}
-  G4 P2000
+  BRUSHIE
   {% if PURGE %}
     PURGE_NOZZLE
   {% endif %}