Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STEAPP-588: fixed bug, status was overwritten by M109 command. #147

Merged
merged 2 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions stereotech_config/extruder_macros.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,15 @@ rename_existing: M1091
gcode:
STATUS_LED STATUS=started
{% set extruder = params.T|default(-1)|int %}
{% set current_extruder = printer.toolhead.extruder %}
{% set extruder_name = printer.toolhead.extruder %}
{% set heat_phase = "_heating" if params.S|int > 50 else "_cooling" %}
{% if extruder >= 0 %}
{% set extruder_name = "extruder" if extruder == 0 else "extruder1" %}
{% endif %}
M117 {extruder_name ~ heat_phase}
{% if extruder >= 0 %}
{% if extruder == 0 %}
M117 extruder_heating
{% elif extruder == 1 %}
M117 extruder1_heating
{% endif %}
M1091 T{params.T} S{params.S}
{% else %}
{% if current_extruder == 'extruder' %}
M117 extruder_heating
{% elif current_extruder == 'extruder1' %}
M117 extruder1_heating
{% endif %}
M1091 S{params.S}
{% endif %}
STATUS_LED STATUS=printing
Expand Down
2 changes: 0 additions & 2 deletions stereotech_config/filament_control_2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,10 @@ gcode:
{% else %}
{% if printer["gcode_macro RECOVER_EXTRUSION_BY_PRIME"].use_cooldown and printer["gcode_macro RECOVER_EXTRUSION_BY_PRIME"].checks_made >= printer["gcode_macro RECOVER_EXTRUSION_BY_PRIME"].check_count %}
{% set extruder_temp = printer["gcode_macro PAUSE"].extruder_temp if extruder == 'extruder' else printer["gcode_macro PAUSE"].extruder1_temp %}
M117 cooling_extruder
{action_respond_warning('Recover extrusion after cooling and heating.')}
M106 S255
M109 S50
M107
M117 heat_extruder
M109 S{extruder_temp}
M400
G4 P3000
Expand Down