diff --git a/macros/helpers.cfg b/macros/helpers.cfg index 05ca004..6320aa9 100644 --- a/macros/helpers.cfg +++ b/macros/helpers.cfg @@ -11,7 +11,7 @@ gcode: {% set N=params.N|default(1)|int %} {% if printer.idle_timeout.state != "Printing" %} {% if "xyz" in printer.toolhead.homed_axes %} - M118 moving {N}x with F{F} + M118 moving N={N} with F={F} {% set X0=275 %} {% set X1=25 %} {% set Y0=275 %} @@ -65,9 +65,7 @@ gcode: [gcode_macro zm] gcode: - {% set speed = params.SPEED|default(300)|int %} - {action_respond_info("moving with F%d" % speed)} - G0 Z30 F{speed} - G0 Z10 F{speed} - - + {% set F = params.SPEED|default(300)|int %} + {action_respond_info("moving with F=%d" % F)} + G0 Z30 F{F} + G0 Z10 F{F} diff --git a/macros/print.cfg b/macros/print.cfg index a5f960e..c4aadb3 100644 --- a/macros/print.cfg +++ b/macros/print.cfg @@ -16,8 +16,8 @@ # BRUSHIE [gcode_macro BRUSHIE] gcode: - {% set x0=200 %} - {% set x1=250 %} + {% set x0=250 %} + {% set x1=200 %} {% set y0=309 %} {% set z0=1.5 %} {% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %} @@ -29,7 +29,6 @@ gcode: G0 X{x1} # 1 G0 X{x0} # 2 G0 X{x1} # 3 - G0 X{x0} # 4 G0 Z{z_hop} F300 # move Z to travel height {% else %} M118 Printer not homed @@ -121,7 +120,7 @@ gcode: {% set EXTRUDER=params.EXTRUDER|default(250)|int %} {% set CHAMBER=params.CHAMBER|default(0)|int %} {% set SHEET=params.SHEET|default("default")|string %} - {% set QGL=params.QGL|default(0)|int %} + {% set QGL=params.QGL|default(1)|int %} {% set BMC=params.BMC|default(0)|int %} {% set PURGE=params.PURGE|default(1)|int %} {% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %} @@ -184,10 +183,6 @@ gcode: ERCF_CHANGE_TOOL_STANDALONE TOOL={ERCF_EXTRUDER} {% endif %} G4 P2000 - {% if printer['filament_switch_sensor toolhead_sensor'].filament_detected == False %} - M118 Insert filament and press resume - PAUSE - {% endif %} {% if PURGE %} PURGE_NOZZLE {% endif %} @@ -251,6 +246,7 @@ gcode: {% if printer.extruder.can_extrude|lower == 'true' %} G91 G1 E{E} F6000 + G90 {% else %} M118 Extruder not hot enough {% endif %}