diff --git a/macros/print.cfg b/macros/print.cfg index 400c11b..961d8b1 100644 --- a/macros/print.cfg +++ b/macros/print.cfg @@ -44,7 +44,6 @@ gcode: description: Cancel the actual running print rename_existing: _CANCEL_PRINT_BASE gcode: - SET_FILAMENT_SENSOR SENSOR=encoder_sensor ENABLE=0 CLEAR_PAUSE SDCARD_RESET_FILE TURN_OFF_HEATERS @@ -52,16 +51,6 @@ gcode: _CANCEL_PRINT_BASE -[gcode_macro LOAD_FILAMENT] -gcode: - T0 - - -[gcode_macro UNLOAD_FILAMENT] -gcode: - ERCF_EJECT - - [gcode_macro M600] description: Change filament gcode: @@ -124,25 +113,21 @@ gcode: M118 already paused {% endif %} - # - PRINT_START [gcode_macro PRINT_START] gcode: {% set BED=params.BED|default(100)|int %} {% set EXTRUDER=params.EXTRUDER|default(250)|int %} - {% set QGL=params.QGL|default(1)|int %} + {% set QGL=params.QGL|default(0)|int %} {% set BMC=params.BMC|default(0)|int %} {% set SHEET=params.SHEET|default("default")|string %} {% set PURGE=params.PURGE|default(0)|int %} {% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %} - {% set ERCF=params.ERCF|default(0)|int %} - {% set ERCF_EXTRUDER=params.ERCF_EXTRUDER|default(0)|int %} - {action_respond_info("starting print BED=%d, EXTRUDER=%d, SHEET=%s, BMC=%d, PURGE=%d, Z_AJUST=%f, ERCF=%d, ERCF_EXTRUDER=%d" % (BED, EXTRUDER, SHEET, BMC, PURGE, Z_ADJUST, ERCF, ERCF_EXTRUDER))} + {action_respond_info("starting print BED=%d, EXTRUDER=%d, SHEET=%s, BMC=%d, PURGE=%d, Z_AJUST=%f" % (BED, EXTRUDER, SHEET, BMC, PURGE, Z_ADJUST))} M117 CONFIGURING M118 CONFIGURING SET_GCODE_OFFSET Z=0.0 # reset z offset M140 S{BED} # start bed heating to bed - # M104 S{EXTRUDER} # start extruder heating G92 E0 # reset extruder G21 # set units to millimeters G90 # use absolute coordinates @@ -188,12 +173,6 @@ gcode: M109 S{EXTRUDER} # set and wait for extruder temperature SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1 - {% if ERCF %} - M117 ercf changing to tool {ERCF_EXTRUDER} - M118 ercf changing to tool {ERCF_EXTRUDER} - ERCF_HOME - _ERCF_CHANGE_TOOL_SLICER TOOL={ERCF_EXTRUDER} - {% endif %} BRUSHIE {% if PURGE %} PURGE_NOZZLE @@ -211,9 +190,6 @@ gcode: M400 ; wait for buffer to clear G92 E0 ; zero the extruder G1 E-10.0 F3600 ; retract filament - {% if UNLOAD_AT_END == 1 %} - ERCF_EJECT - {% endif %} TURN_OFF_HEATERS M107 ; turn off fan @@ -245,17 +221,9 @@ description: Resume the actual running print rename_existing: _RESUME_BASE gcode: {% if printer.pause_resume.is_paused|lower == 'true' %} - {% if printer["gcode_macro _ERCF_PAUSE"].is_paused|int != 0 %} - M118 You can't resume the print without unlocking the ERCF first. - M118 Run ERCF_UNLOCK and solve any issue before hitting Resume again - {% else %} - RESTORE_GCODE_STATE NAME=PAUSE_state - G90 - {% if printer["gcode_macro _ERCF_VAR"].clog_detection|int == 1 %} - SET_FILAMENT_SENSOR SENSOR=encoder_sensor ENABLE=1 - {% endif %} - _RESUME_BASE - {% endif %} + RESTORE_GCODE_STATE NAME=PAUSE_state + G90 + _RESUME_BASE {% else %} M117 not paused M118 not paused diff --git a/moonraker.conf b/moonraker.conf index 5688cf8..c3d4ad6 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -69,12 +69,12 @@ is_system_service: false path: ~/moonraker-timelapse origin: https://github.com/mainsail-crew/moonraker-timelapse.git -[update_manager ercf] -type: git_repo -primary_branch: main -is_system_service: false -path: ~/EnragedRabbitProject -origin: https://github.com/EtteGit/EnragedRabbitProject.git +# [update_manager ercf] +# type: git_repo +# primary_branch: main +# is_system_service: false +# path: ~/EnragedRabbitProject +# origin: https://github.com/EtteGit/EnragedRabbitProject.git [power voron-v2.4] # type: tplink_smartplug diff --git a/printer.cfg b/printer.cfg index 5a411f7..4aed32a 100644 --- a/printer.cfg +++ b/printer.cfg @@ -65,7 +65,6 @@ path: /home/pi/printer_data/gcodes [include neopixel.cfg] [include fans.cfg] [include resonance_test.cfg] -[include ercf.cfg] #####################################################################