From 0987771d3bafe61ff15fd5010d13a637521e50e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Pr=C5=AF=C5=A1a?= Date: Wed, 27 Dec 2017 23:31:49 +0100 Subject: [PATCH] Language corrections for colour not clear and M600 tune Color not clear is not a thing anymore, message was reformed to make more sense. M600 now has improved unloading too. --- Firmware/Marlin_main.cpp | 14 +++++++++++++- Firmware/language_all.cpp | 6 +++--- Firmware/language_cz.h | 4 ++-- Firmware/language_en.h | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 05271559..086bd1c9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5582,7 +5582,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 diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index d2546d64..a9e9f9d1 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -591,8 +591,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 @@ -1139,7 +1139,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 0bdd3540..94b8e450 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." @@ -364,4 +364,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 637324a0..a271ce47 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."