diff options
| author | PavelSindler <pavel@prusa3d.cz> | 2018-01-17 23:55:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 23:55:47 +0300 |
| commit | c45098d9556485c209cfb1879225d9886054fc8a (patch) | |
| tree | daf5faed5a3d4d14f9cef2a978692954228fc916 | |
| parent | 3852ba0b36a004d69f543b1003ce1777be4a9560 (diff) | |
| parent | e60cb2a79e5c284875bd55f5924298ac0e2c0b6b (diff) | |
Merge pull request #415 from PavelSindler/unload_filament_fixv3.1.1-RC5
unload filament sequence same as in M600
| -rw-r--r-- | Firmware/Configuration.h | 2 | ||||
| -rw-r--r-- | Firmware/Marlin_main.cpp | 29 |
2 files changed, 27 insertions, 4 deletions
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 258b8c923..6872603bc 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_VERSION "3.1.1-RC5" -#define FW_COMMIT_NR 149 +#define FW_COMMIT_NR 150 #define FW_DEV_VERSION FW_VERSION_RC #define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2f5c6f76d..0628e0feb 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6092,11 +6092,34 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 5200 / 60, active_extruder); st_synchronize(); current_position[E_AXIS] -= 15; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 160 / 60, active_extruder); + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1000 / 60, active_extruder); st_synchronize(); current_position[E_AXIS] -= 20; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 5000 / 60, active_extruder); - st_synchronize(); + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1000 / 60, active_extruder); + st_synchronize(); + + lcd_display_message_fullscreen_P(MSG_PULL_OUT_FILAMENT); + + //disable extruder steppers so filament can be removed + disable_e0(); + disable_e1(); + disable_e2(); + delay(100); + + + WRITE(BEEPER, HIGH); + uint8_t counterBeep = 0; + while (!lcd_clicked() && (counterBeep < 50)) { + if (counterBeep > 5) WRITE(BEEPER, LOW); + delay_keep_alive(100); + counterBeep++; + } + WRITE(BEEPER, LOW); + st_synchronize(); + while (lcd_clicked()) delay_keep_alive(100); + + lcd_update_enable(true); + lcd_setstatuspgm(WELCOME_MSG); custom_message = false; custom_message_type = 0; |