3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #351 from michalprusa/Unload-fix

Browse Source 
Filament unload slightly tweaked
This commit is contained in:
XPila 2017-12-28 01:32:22 +01:00 committed by GitHub
commit e00ac9566e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -9,7 +9,7 @@
// Firmware version // Firmware version
#define FW_version "3.1.1-RC3" #define FW_version "3.1.1-RC3"
#define FW_build 138m1 #define FW_build 138
//#define FW_build --BUILD-NUMBER-- //#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) "b" #define FW_version_build FW_version " b" STR(FW_build) "b"

24
Firmware/Marlin_main.cpp
View File

@ -5583,7 +5583,19 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
#else #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], 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 #endif // SNMM
@ -5974,8 +5986,14 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
// extr_unload2(); // extr_unload2();
current_position[E_AXIS] -= 80; current_position[E_AXIS] -= 50;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 7000 / 60, active_extruder); 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(); st_synchronize();
lcd_setstatuspgm(WELCOME_MSG); lcd_setstatuspgm(WELCOME_MSG);
custom_message = false; custom_message = false;

6
Firmware/language_all.cpp
View File

@ -596,8 +596,8 @@ const char * const MSG_FILAMENTCHANGE_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FILAMENTCHANGE_CZ MSG_FILAMENTCHANGE_CZ
}; };
const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Is color clear?"; const char MSG_FILAMENT_CLEAN_EN[] PROGMEM = "Filament extruding & with right color?";
const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Je barva cista?"; const char MSG_FILAMENT_CLEAN_CZ[] PROGMEM = "Filament vytlacen a spravne barvy?";
const char * const MSG_FILAMENT_CLEAN_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_FILAMENT_CLEAN_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_FILAMENT_CLEAN_EN, MSG_FILAMENT_CLEAN_EN,
MSG_FILAMENT_CLEAN_CZ MSG_FILAMENT_CLEAN_CZ
@ -1144,7 +1144,7 @@ const char * const MSG_NO_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_NO_CZ 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 MSG_NOT_COLOR_CZ[] PROGMEM = "Barva neni cista";
const char * const MSG_NOT_COLOR_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_NOT_COLOR_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_NOT_COLOR_EN, MSG_NOT_COLOR_EN,

4
Firmware/language_cz.h
View File

@ -278,7 +278,7 @@
#define MSG_MARK_FIL "Oznacte filament 100 mm od tela extruderu a po te potvrdte tlacitkem." #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_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_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_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." #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_FILE_CNT "Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100."
#define MSG_SORT_TIME "Trideni [Cas]" #define MSG_SORT_TIME "Trideni [Cas]"
#define MSG_SORT_ALPHA "Trideni [Abeceda]" #define MSG_SORT_ALPHA "Trideni [Abeceda]"
#define MSG_SORT_NONE "Trideni [Zadne]" #define MSG_SORT_NONE "Trideni [Zadne]"

4
Firmware/language_en.h
View File

@ -91,7 +91,7 @@
#define MSG_YES "Yes" #define MSG_YES "Yes"
#define MSG_NO "No" #define MSG_NO "No"
#define(length=19) MSG_NOT_LOADED "Filament not loaded" #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_LOADING_FILAMENT "Loading filament"
#define(length=20) MSG_PLEASE_WAIT "Please wait" #define(length=20) MSG_PLEASE_WAIT "Please wait"
#define MSG_LOADING_COLOR "Loading color" #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_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=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=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(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." #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."