Added custom macros for start and end

Prutsium · Jan 9, 2022 · 6d090fc · 6d090fc
1 parent 95c61ce
commit 6d090fc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/Klipper_cfg/Prusa_Universal_Config_Revised/Boards/Octopus_MMU/printer_octopus_mmu.cfg b/Klipper_cfg/Prusa_Universal_Config_Revised/Boards/Octopus_MMU/printer_octopus_mmu.cfg
@@ -290,20 +290,26 @@ color_order: RGB
 
 #	Set RGB values on boot up for each Neopixel. 
 #	Index 1 = display, Index 2 and 3 = Knob
-[delayed_gcode setdisplayneopixel]
+
+[gcode_macro SET_LED_DISPLAY]
+gcode:
+  SET_LED LED=display RED=1 GREEN=0 BLUE=0 INDEX=1 TRANSMIT=0
+  SET_LED LED=display RED=1 GREEN=0 BLUE=0 INDEX=2 TRANSMIT=0
+  SET_LED LED=display RED=1 GREEN=0.49 BLUE=0.83 INDEX=3
+
+[delayed_gcode _setdisplayneopixel]
 initial_duration: 1
 gcode:
-        SET_LED LED=display RED=1 GREEN=0 BLUE=0 INDEX=1 TRANSMIT=0
-        SET_LED LED=display RED=1 GREEN=0 BLUE=0 INDEX=2 TRANSMIT=0
-        SET_LED LED=display RED=1 GREEN=0.49 BLUE=0.83 INDEX=3
+  SET_LED_DISPLAY
+
 
 #####################################################################
 #   ADXL On SPI port Octopus
 #####################################################################
 [resonance_tester]
 accel_chip: adxl345
 probe_points:
-    102,102,20 # Override this in printer.cfg to be the center of your bed.
+  102,102,20 # Override this in printer.cfg to be the center of your bed.
 
 [adxl345]
 spi_bus: spi3 #a

diff --git a/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/cancel_print.cfg b/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/cancel_print.cfg
@@ -11,4 +11,9 @@ gcode:
     _ADD_PRINT_TIME
     CLEAR_PAUSE
     SDCARD_RESET_FILE
-    BASE_CANCEL_PRINT
+    BASE_CANCEL_PRINT
+    CUSTOM_PRINT_CANCELED
+
+[gcode_macro CUSTOM_PRINT_CANCELED]
+gcode:
+    M117 Print canceled
diff --git a/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/end_print.cfg b/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/end_print.cfg
@@ -38,4 +38,8 @@ gcode:
     G0 X60 Y{max_y} F3600          ; park nozzle at rear
 	DISABLE_XY_STEPPERS
 	_ADD_PRINT_TIME
+    CUSTOM_PRINT_FINISHED
+
+[gcode_macro CUSTOM_PRINT_FINISHED]
+gcode:
     M117 Printing Done
diff --git a/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/start_print.cfg b/Klipper_cfg/Prusa_Universal_Config_Revised/Macros/start_print.cfg
@@ -46,8 +46,10 @@ gcode:
     G0 Z100 F1000
     # set bed temp
     M140 S{BED_TEMP}
+    CUSTOM_HEATING_BED_START BED_TEMP={BED_TEMP} EXTRUDER_TEMP={EXTRUDER_TEMP}
     # wait for bed temp
     M190 S{BED_TEMP}
+    CUSTOM_HEATING_BED_FINISHED BED_TEMP={BED_TEMP} EXTRUDER_TEMP={EXTRUDER_TEMP}
     # Z_Tilt + mesh 
 	{% if printer["gcode_macro _ztilt"].ztilting|int == 1 %}
 		{% if printer.z_tilt.applied is false %}
@@ -66,7 +68,9 @@ gcode:
     # set and wait for nozzle/bed to reach temperature
     M117 Nozzle to {EXTRUDER_TEMP}
     M104 S{EXTRUDER_TEMP}       ; set extruder temp
+    CUSTOM_HEATING_EXTRUDER_START BED_TEMP={BED_TEMP} EXTRUDER_TEMP={EXTRUDER_TEMP}
     M109 S{EXTRUDER_TEMP}       ; wait for extruder temp
+    CUSTOM_HEATING_EXTRUDER_FINISHED BED_TEMP={BED_TEMP} EXTRUDER_TEMP={EXTRUDER_TEMP}
     # zero the extruded length
     G92 E0
     M117 Purge line
@@ -76,4 +80,27 @@ gcode:
     G1 F9000
     SET_PRESSURE_ADVANCE ADVANCE={PA} ADVANCE_LOOKAHEAD_TIME=0.010
     #M117 Printing with PA {PA}
-    #UPDATE_DELAYED_GCODE ID=clear_display DURATION=4
+    #UPDATE_DELAYED_GCODE ID=clear_display DURATION=4
+    CUSTOM_PRINT_START BED_TEMP={BED_TEMP} EXTRUDER_TEMP={EXTRUDER_TEMP}
+
+
+[gcode_macro CUSTOM_HEATING_BED_START]
+gcode:
+    M117 Heating Bed
+
+[gcode_macro CUSTOM_HEATING_BED_FINISHED]
+gcode:
+    M117 Heating Bed finished
+
+[gcode_macro CUSTOM_HEATING_EXTRUDER_START]
+gcode:
+    M117 Heating Extruder
+
+[gcode_macro CUSTOM_HEATING_EXTRUDER_FINISHED]
+gcode:
+    M117 Heating Extruder finished
+
+[gcode_macro CUSTOM_PRINT_START]
+gcode:
+    M117 Starting the print
+    UPDATE_DELAYED_GCODE ID=clear_display DURATION=2