diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index f2e3903..d26acd9 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -123,8 +123,14 @@ gcode: {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %} {% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %} - {% set safeX = printer.configfile.settings.safe_z_home.home_xy_position[0]|float %} - {% set safeY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %} + + {% 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 %} + {% else %} + {% set startX = 0 %} + {% set startY = 0 %} + {% endif %} {% set bedtempAlmost = (bedtemp - 2)|int %} {% set hotendtempStepOne = 150|int %} @@ -137,7 +143,7 @@ gcode: M140 S{bedtempAlmost} ; set & don't wait for bed temp M104 S{hotendtempStepOne} ; set & don't wait for hotend temp G28 X Y - G1 X{safeX} Y{safeY} F{maxVelocityAdjusted} + G1 X{startX} Y{startY} F{maxVelocityAdjusted} M190 S{bedtempAlmost} ; set & wait for bed temp M104 S{hotendtempStepTwo} ; set & don't wait for hotend temp