Auto Filament Change Reworked: finally working #3638
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -449,6 +449,10 @@ static uint8_t target_extruder; | |
| static bool filament_ran_out = false; | ||
| #endif | ||
|
|
||
| #if ENABLED(FILAMENT_CHANGE_ENABLE) | ||
| FilamentChangeMenuResponse filament_change_menu_response; | ||
| #endif | ||
|
|
||
| static bool send_ok[BUFSIZE]; | ||
|
|
||
| #if HAS_SERVOS | ||
|
|
@@ -5997,7 +6001,7 @@ inline void gcode_M503() { | |
|
|
||
| #endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET | ||
|
|
||
| #if ENABLED(FILAMENT_CHANGE_ENABLE) | ||
|
|
||
| /** | ||
| * M600: Pause for filament change | ||
|
|
@@ -6013,135 +6017,164 @@ inline void gcode_M503() { | |
| */ | ||
| inline void gcode_M600() { | ||
|
|
||
| // Show initial message and wait for synchronize steppers | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INIT); | ||
| st_synchronize(); | ||
|
|
||
| if (degHotend(active_extruder) < extrude_min_temp) { | ||
| SERIAL_ERROR_START; | ||
|
Contributor
There was a problem hiding this comment. Maybe should we update the LCD message with the error also ? |
||
| SERIAL_ERRORLNPGM(MSG_TOO_COLD_FOR_M600); | ||
| return; | ||
| } | ||
| float lastpos[NUM_AXIS]; | ||
|
|
||
| // Save current position of all axes | ||
| for (int i = 0; i < NUM_AXIS; i++) | ||
| lastpos[i] = destination[i] = current_position[i]; | ||
|
|
||
| // Define runplan for move axes | ||
| #if ENABLED(DELTA) | ||
| #define RUNPLAN calculate_delta(destination); \ | ||
| plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], destination[E_AXIS], FILAMENT_CHANGE_XY_FEEDRATE * 60, active_extruder); | ||
| #else | ||
| #define RUNPLAN line_to_destination(FILAMENT_CHANGE_XY_FEEDRATE * 60); | ||
| #endif | ||
|
|
||
| KEEPALIVE_STATE(IN_HANDLER); | ||
|
|
||
| // Initial retract before move to filament change position | ||
| if (code_seen('E')) destination[E_AXIS] += code_value(); | ||
| #ifdef FILAMENT_CHANGE_RETRACT_LENGTH | ||
| else destination[E_AXIS] -= FILAMENT_CHANGE_RETRACT_LENGTH; | ||
| #endif | ||
| line_to_destination(FILAMENT_CHANGE_RETRACT_FEEDRATE * 60); | ||
|
|
||
| // Lift Z axis | ||
| if (code_seen('Z')) destination[Z_AXIS] += code_value(); | ||
| #ifdef FILAMENT_CHANGE_Z_ADD | ||
| else destination[Z_AXIS] += FILAMENT_CHANGE_Z_ADD; | ||
|
Contributor
There was a problem hiding this comment. An improvement suggestion, this should check if the move will not go over Z-Max. |
||
| #endif | ||
| // RUNPLAN; | ||
| #if ENABLED(DELTA) | ||
| // calculate_delta(destination); | ||
| // plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], destination[E_AXIS], FILAMENT_CHANGE_XY_FEEDRATE * 60, active_extruder); | ||
| RUNPLAN; | ||
| #else | ||
| line_to_destination(FILAMENT_CHANGE_Z_FEEDRATE * 60); | ||
| #endif | ||
|
|
||
| // Move XY axes to filament exchange position | ||
| if (code_seen('X')) destination[X_AXIS] = code_value(); | ||
| #ifdef FILAMENT_CHANGE_X_POS | ||
| else destination[X_AXIS] = FILAMENT_CHANGE_X_POS; | ||
| #endif | ||
| if (code_seen('Y')) destination[Y_AXIS] = code_value(); | ||
| #ifdef FILAMENT_CHANGE_Y_POS | ||
| else destination[Y_AXIS] = FILAMENT_CHANGE_Y_POS; | ||
| #endif | ||
| RUNPLAN; | ||
|
|
||
| // Synchronize steppers and show unload message | ||
| st_synchronize(); | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_UNLOAD); | ||
|
|
||
| // Unload filament | ||
| if (code_seen('L')) destination[E_AXIS] += code_value(); | ||
| #ifdef FILAMENT_CHANGE_UNLOAD_LENGTH | ||
| else destination[E_AXIS] -= FILAMENT_CHANGE_UNLOAD_LENGTH; | ||
| #endif | ||
| line_to_destination(FILAMENT_CHANGE_UNLOAD_FEEDRATE * 60); | ||
|
|
||
| // Synchronize steppers and then disable extruders steppers for manual filament changing | ||
| st_synchronize(); | ||
| disable_e0(); | ||
| disable_e1(); | ||
| disable_e2(); | ||
| disable_e3(); | ||
| delay(100); | ||
|
|
||
| millis_t next_tick = 0; | ||
|
|
||
| // Wait for filament insert by user and press button | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT); | ||
|
|
||
| while (!lcd_clicked()) { | ||
| millis_t ms = millis(); | ||
|
Contributor
There was a problem hiding this comment. The
Contributor
There was a problem hiding this comment. @clexpert if #if HAS_BUZZER
millis_t ms = millis();
if (ms >= next_tick) {
buzz(300, 2000);
next_tick = ms + 2500; // Beep every 2.5s while waiting
}
#endif |
||
| if (ms >= next_tick) { | ||
| buzz(300, 2000); | ||
| next_tick = ms + 2500; // Beep every 2.5s while waiting | ||
| } | ||
| idle(true); | ||
| } | ||
| delay(100); | ||
| while (lcd_clicked()) { | ||
| idle(true); | ||
| } | ||
| delay(100); | ||
|
|
||
| // Show load message | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_LOAD); | ||
|
|
||
| // Load filament | ||
| if (code_seen('L')) destination[E_AXIS] -= code_value(); | ||
| #ifdef FILAMENT_CHANGE_LOAD_LENGTH | ||
| else destination[E_AXIS] += FILAMENT_CHANGE_LOAD_LENGTH; | ||
| #endif | ||
| line_to_destination(FILAMENT_CHANGE_LOAD_FEEDRATE * 60); | ||
| st_synchronize(); | ||
|
|
||
| #ifdef FILAMENT_CHANGE_EXTRUDE_LENGTH | ||
| do { | ||
| // Extrude filament to get into hotend | ||
| KEEPALIVE_STATE(IN_HANDLER); | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_EXTRUDE); | ||
| destination[E_AXIS] += FILAMENT_CHANGE_EXTRUDE_LENGTH; | ||
| line_to_destination(FILAMENT_CHANGE_EXTRUDE_FEEDRATE * 60); | ||
| st_synchronize(); | ||
| // Ask user if more filament should be extruded | ||
| KEEPALIVE_STATE(PAUSED_FOR_USER); | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_OPTION); | ||
| while (filament_change_menu_response == FILAMENT_CHANGE_RESPONSE_WAIT_FOR) { | ||
| idle(true); | ||
| } | ||
| } while (filament_change_menu_response != FILAMENT_CHANGE_RESPONSE_RESUME_PRINT); | ||
| #endif | ||
|
|
||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_RESUME); | ||
|
|
||
| KEEPALIVE_STATE(IN_HANDLER); | ||
|
|
||
| // Set extruder to saved position | ||
| current_position[E_AXIS] = lastpos[E_AXIS]; | ||
| destination[E_AXIS] = lastpos[E_AXIS]; | ||
| plan_set_e_position(current_position[E_AXIS]); | ||
|
|
||
| #if ENABLED(DELTA) | ||
| // Move XYZ to starting position, then E | ||
| calculate_delta(lastpos); | ||
| plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], destination[E_AXIS], FILAMENT_CHANGE_XY_FEEDRATE * 60, active_extruder); | ||
| plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], lastpos[E_AXIS], FILAMENT_CHANGE_XY_FEEDRATE * 60, active_extruder); | ||
| #else | ||
| // Move XY to starting position, then Z, then E | ||
| destination[X_AXIS] = lastpos[X_AXIS]; | ||
| destination[Y_AXIS] = lastpos[Y_AXIS]; | ||
| line_to_destination(FILAMENT_CHANGE_XY_FEEDRATE * 60); | ||
| destination[Z_AXIS] = lastpos[Z_AXIS]; | ||
| line_to_destination(FILAMENT_CHANGE_Z_FEEDRATE * 60); | ||
| #endif | ||
| st_synchronize(); | ||
|
|
||
| #if ENABLED(FILAMENT_RUNOUT_SENSOR) | ||
| filament_ran_out = false; | ||
| #endif | ||
|
|
||
| // Show status screen | ||
| lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_STATUS); | ||
| KEEPALIVE_STATE(NOT_BUSY); | ||
| } | ||
|
|
||
| #endif // FILAMENT_CHANGE_ENABLE | ||
|
|
||
| #if ENABLED(DUAL_X_CARRIAGE) | ||
|
|
||
|
|
@@ -6994,11 +7027,11 @@ void process_next_command() { | |
| break; | ||
| #endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET | ||
|
|
||
| #if ENABLED(FILAMENT_CHANGE_ENABLE) | ||
| case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] | ||
| gcode_M600(); | ||
| break; | ||
| #endif // FILAMENT_CHANGE_ENABLE | ||
|
|
||
| #if ENABLED(DUAL_X_CARRIAGE) | ||
| case 605: | ||
|
|
@@ -7738,13 +7771,13 @@ void disable_all_steppers() { | |
| * Standard idle routine keeps the machine alive | ||
| */ | ||
| void idle( | ||
| #if ENABLED(FILAMENT_CHANGE_ENABLE) | ||
| bool no_stepper_sleep/*=false*/ | ||
| #endif | ||
| ) { | ||
| manage_heater(); | ||
| manage_inactivity( | ||
| #if ENABLED(FILAMENT_CHANGE_ENABLE) | ||
| no_stepper_sleep | ||
| #endif | ||
| ); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should keep it disabled by default.