From 1ca3355dd74cfebf44edcbcbad925ee4bdae5b18 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Thu, 20 Apr 2023 12:26:14 -0400 Subject: [PATCH] Pulling in print_start from master branch. --- cfgs/misc-macros.cfg | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index ad74710..8f1ed9c 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -5,6 +5,11 @@ enable_force_move: True # [temperature_sensor raspberry_pi] # sensor_type: temperature_host +# NOTE If you're using a an Orange Pi, you can uncomment the next 2 lines, optionally. +# [temperature_sensor Orange_Pi] +# sensor_type: temperature_host +# sensor_path: /sys/class/thermal/thermal_zone0/temp + [virtual_sdcard] path: /home/pi/printer_data/gcodes @@ -123,9 +128,14 @@ gcode: {% set hotendtemp = params.HOTEND|int %} {% set chambertemp = params.CHAMBER|default(0)|int %} - # Set safe speeds {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %} {% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %} + + {% if printer.configfile.settings.safe_z_home %} + {% set startX = printer.configfile.settings.safe_z_home.home_xy_position[0]|float %} + {% set startY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %} + {% endif %} + {% set bedtempAlmost = (bedtemp - 2)|int %} {% set hotendtempStepOne = 150|int %} {% set hotendtempStepTwo = 170|int %} @@ -133,18 +143,23 @@ gcode: BED_MESH_PROFILE LOAD=default ; NOTE if not using a mesh, comment out this line ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 - G90 + 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 + + M104 S{hotendtemp} ; set & don't wait for hotend temp G28 Z ; final z homing - M109 S{hotendtemp} ; set & wait for hotend temp G1 X0 Y0 F{maxVelocityAdjusted} + M109 S{hotendtemp} ; set & wait for hotend temp G1 Z20 F3000 ; move nozzle away from bed