From f1c6a74b36a0b8c97672729df670ec17d1b6e91c Mon Sep 17 00:00:00 2001
From: Konstantin Koslowski <konstantin.koslowski@posteo.de>
Date: Fri, 8 Oct 2021 21:13:51 +0200
Subject: [PATCH] v2.4: update menu, macros

---
 display_menu.cfg | 12 +++++++++---
 macros.cfg       | 27 ++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/display_menu.cfg b/display_menu.cfg
index cb16ad5..ddf66ff 100644
--- a/display_menu.cfg
+++ b/display_menu.cfg
@@ -39,17 +39,23 @@ type: disabled
 
 
 # Added Items to the Stock menu
+[menu __main __filament __front_center]
+type: command
+name: Front Center
+gcode:
+  CENTER Y=25
+
 [menu __main __filament __preheat_pla]
 type: command
-name: Preheat for PLA
+name: Preheat PLA
 gcode:
   PREHEAT EXTRUDER_TEMP=190
 
 [menu __main __filament __preheat_abs]
 type: command
-name: Preheat for ABS
+name: Preheat ABS
 gcode:
-  PREHEAT EXTRUDER_TEMP=210
+  PREHEAT EXTRUDER_TEMP=215
 
 [menu __main __filament __load]
 type: command
diff --git a/macros.cfg b/macros.cfg
index 7c0438a..c7a6c85 100644
--- a/macros.cfg
+++ b/macros.cfg
@@ -1,9 +1,15 @@
 [gcode_macro G32]
 gcode:
-  BED_MESH_CLEAR
+  BED_MESH_CLEAR                # clear bed_mesh profile
+  M117 > home
   G28
+  M117 > QGL
   QUAD_GANTRY_LEVEL
+  M117 > HOME
   G28
+  M117 > bed mesh calibrate
+  BED_MESH_CALIBRATE
+  # BED_MESH_PROFILE load=default # load default bed_mesh profile
   G0 X150 Y150 Z30 F3600
 
 
@@ -27,8 +33,10 @@ gcode:
 
 [gcode_macro CENTER]
 gcode:
+  {% set X=params.X|default(150) %}
+  {% set Y=params.Y|default(150) %}
   {% if "xyz" in printer.toolhead.homed_axes %}
-    G0 X150 Y150 F10000
+    G0 X{X} Y{Y} F10000
   {% else %}
     {action_respond_info("Printer not homed")}
   {% endif %}
@@ -94,6 +102,16 @@ gcode:
     {% endif %}
     RESUME_BASE {get_params}
 
+[gcode_macro PREHEAT]
+description: set bed and extruder temperature
+gcode:
+  {% set BED_TEMP = params.BED_TEMP|default(0)|float %}
+  {% set EXTRUDER_TEMP = params.EXTRUDER_TEMP|default(190)|float %}
+  M117 > start heating
+  M140 S{BED_TEMP}            # start bed heating
+  M104 S{EXTRUDER_TEMP}       # start extruder heating
+  M109 S{EXTRUDER_TEMP}       # set and wait for nozzle temperature
+  M117 > done
 
 [gcode_macro FILAMENT_UNLOAD]
 description: unload filament
@@ -147,26 +165,29 @@ gcode:
 gcode:
   M117 > configuring
   SET_LED LED=caselight RED=0.00 GREEN=0.00 BLUE=0.50
+  G4 P2000
   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 P1000
 
   M117 > homing
   SET_LED LED=caselight RED=0.00 GREEN=0.50 BLUE=0.00
+  G4 P2000
   G32                           # home all axes
 
   M117 > heating
   SET_LED LED=caselight RED=0.50 GREEN=0.00 BLUE=0.00
+  G4 P2000
   G92 E0                 # reset extruder
   M190 S{BED}            # set and wait for bed temperature
   M109 S{EXTRUDER}       # set and wait for nozzle temperature
 
   M117 > starting
   SET_LED LED=caselight RED=0.50 GREEN=0.50 BLUE=0.50
+  G4 P2000
 
 [gcode_macro PRINT_LAYER_CHANGE]
 gcode: