Merge branch 'fix2' into personal

This commit is contained in:
Bassam Husain
2023-03-12 12:55:55 -04:00

View File

@@ -20,7 +20,7 @@ gcode:
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
[gcode_macro _globals]
variable_filament_sensor_enabled: 0 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected
variable_filament_sensor_enabled: 1 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected
variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration
variable_pre_purge_prime_length: 1.4
gcode:
@@ -112,7 +112,7 @@ gcode:
{% set chambertemp = params.CHAMBER|default(0)|int %}
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
# SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
G28 X Y
# <insert your routines here>
@@ -131,7 +131,7 @@ gcode:
[gcode_macro PRINT_END]
gcode:
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
# SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
CONDITIONAL_BEEP I=2 DUR=30 FREQ=8500 ; NOTE Comment out this line to stop the beeps at the end of a print
{% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %}
M400 ; wait for buffer to clear
@@ -200,7 +200,7 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target} ; set hotend temp variable for reference in resume macro
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
# SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
SAVE_GCODE_STATE NAME=PAUSE ; save current print position for resume
BASE_PAUSE ; pause print
{% if (printer.gcode_move.position.z + z) < printer.toolhead.axis_maximum.z %} ; check that zhop doesn't exceed z max
@@ -227,7 +227,7 @@ gcode:
{% if printer['pause_resume'].is_paused|int == 1 %}
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
# SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
SET_IDLE_TIMEOUT TIMEOUT={printer.configfile.settings.idle_timeout.timeout} ; set timeout back to configured value
{% if etemp > 0 %}