diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index cd2065a1..f223151e 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.1.1-RC3" -#define FW_build 138m1 +#define FW_build 138 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build) "b" diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 88307644..64ceadc3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5583,7 +5583,19 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp #else // plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder); - plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 3500 / 60, active_extruder); + //plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 3500 / 60, active_extruder); + + target[E_AXIS] -= FILAMENTCHANGE_FINALRETRACT; + target[E_AXIS] -= 50; + plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 5200 / 60, active_extruder); + st_synchronize(); + target[E_AXIS] -= 10; + plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 80 / 60, active_extruder); + st_synchronize(); + target[E_AXIS] -= 20; + plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 5000 / 60, active_extruder); + st_synchronize(); + #endif // SNMM @@ -5974,8 +5986,14 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp // extr_unload2(); - current_position[E_AXIS] -= 80; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 7000 / 60, active_extruder); + current_position[E_AXIS] -= 50; + 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] -= 10; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 80 / 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(); lcd_setstatuspgm(WELCOME_MSG); custom_message = false; diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index dde72322..f0ab7ca9 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -596,8 +596,8 @@ const char * const MSG_FILAMENTCHANGE_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_FILAMENTCHANGE_CZ }; -const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Is color clear?"; -const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Je barva cista?"; +const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Filament extruding & with right color?"; +const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Filament vytlacen a spravne barvy?"; const char * const MSG_FILAMENT_CLEAN_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_FILAMENT_CLEAN_EN, MSG_FILAMENT_CLEAN_CZ @@ -1144,7 +1144,7 @@ const char * const MSG_NO_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_NO_CZ }; -const char MSG_NOT_COLOR_EN[] PROGMEM = "Color not clear"; +const char MSG_NOT_COLOR_EN[] PROGMEM = "Color not right"; const char MSG_NOT_COLOR_CZ[] PROGMEM = "Barva neni cista"; const char * const MSG_NOT_COLOR_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_NOT_COLOR_EN, diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index e1aa8b88..3f7cfdd2 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -278,7 +278,7 @@ #define MSG_MARK_FIL "Oznacte filament 100 mm od tela extruderu a po te potvrdte tlacitkem." #define MSG_CLEAN_NOZZLE_E "E kalibrace ukoncena. Prosim ocistete trysku. Po te potvrdte tlacitkem." #define MSG_WAITING_TEMP "Cekani na zchladnuti trysky a podlozky." -#define MSG_FILAMENT_CLEAN "Je barva cista?" +#define MSG_FILAMENT_CLEAN "Filament vytlacen a spravne barvy?" #define MSG_UNLOADING_FILAMENT "Vysouvam filament" #define MSG_PAPER "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, vypnete tiskarnu." @@ -365,4 +365,4 @@ #define MSG_FILE_CNT "Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100." #define MSG_SORT_TIME "Trideni [Cas]" #define MSG_SORT_ALPHA "Trideni [Abeceda]" -#define MSG_SORT_NONE "Trideni [Zadne]" \ No newline at end of file +#define MSG_SORT_NONE "Trideni [Zadne]" diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 8f9037d4..1a9f0976 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -91,7 +91,7 @@ #define MSG_YES "Yes" #define MSG_NO "No" #define(length=19) MSG_NOT_LOADED "Filament not loaded" -#define MSG_NOT_COLOR "Color not clear" +#define MSG_NOT_COLOR "Color not right" #define(length=20) MSG_LOADING_FILAMENT "Loading filament" #define(length=20) MSG_PLEASE_WAIT "Please wait" #define MSG_LOADING_COLOR "Loading color" @@ -268,7 +268,7 @@ #define(length=20, lines=8) MSG_MARK_FIL "Mark filament 100mm from extruder body. Click when done." #define(length=20, lines=8) MSG_CLEAN_NOZZLE_E "E calibration finished. Please clean the nozzle. Click when done." #define(length=20, lines=3) MSG_WAITING_TEMP "Waiting for nozzle and bed cooling" -#define(length=20, lines=2) MSG_FILAMENT_CLEAN "Is color clear?" +#define(length=20, lines=2) MSG_FILAMENT_CLEAN "Filament extruding & with right color?" #define(lenght=18, lines=1) MSG_UNLOADING_FILAMENT "Unloading filament" #define(length=20, lines=8) MSG_PAPER "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."