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

unloading filaments and M600 messages updated

This commit is contained in:
PavelSindler 2017-05-12 15:02:52 +02:00
parent bb3887fe1b
commit 57ef9cf59b
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -4978,6 +4978,7 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
#ifdef FILAMENTCHANGEENABLE #ifdef FILAMENTCHANGEENABLE
case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
{ {
st_synchronize(); st_synchronize();
float target[4]; float target[4];
float lastpos[4]; float lastpos[4];
@ -5058,6 +5059,9 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
#endif #endif
} }
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder);
st_synchronize();
custom_message = true;
lcd_setstatuspgm(MSG_UNLOADING_FILAMENT);
// Unload filament // Unload filament
if(code_seen('L')) if(code_seen('L'))

2
Firmware/language_all.cpp
View File

@ -1959,7 +1959,7 @@ const char MSG_PRESS_EN[] PROGMEM = "and press the knob";
const char MSG_PRESS_CZ[] PROGMEM = "a stisknete tlacitko"; const char MSG_PRESS_CZ[] PROGMEM = "a stisknete tlacitko";
const char MSG_PRESS_IT[] PROGMEM = "e cliccare manopola"; const char MSG_PRESS_IT[] PROGMEM = "e cliccare manopola";
const char MSG_PRESS_ES[] PROGMEM = "Pulsar el mando"; const char MSG_PRESS_ES[] PROGMEM = "Pulsar el mando";
const char MSG_PRESS_PL[] PROGMEM = "Nacisnij przycisk"; const char MSG_PRESS_PL[] PROGMEM = "i nacisnij przycisk";
const char MSG_PRESS_DE[] PROGMEM = "und Knopf druecken"; const char MSG_PRESS_DE[] PROGMEM = "und Knopf druecken";
const char * const MSG_PRESS_LANG_TABLE[LANG_NUM] PROGMEM = { const char * const MSG_PRESS_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_PRESS_EN, MSG_PRESS_EN,

4
Firmware/language_es.h
View File

@ -270,4 +270,6 @@
#define MSG_TEMP_CALIBRATION "Cal. temp. " #define MSG_TEMP_CALIBRATION "Cal. temp. "
#define MSG_TEMP_CALIBRATION_DONE "Calibracon temperatura terminada. Presionar para continuar." #define MSG_TEMP_CALIBRATION_DONE "Calibracon temperatura terminada. Presionar para continuar."
#define MSG_TEMP_CALIBRATION_ON "Cal. temp. [ON]" #define MSG_TEMP_CALIBRATION_ON "Cal. temp. [ON]"
#define MSG_TEMP_CALIBRATION_OFF "Cal. temp. [OFF]" #define MSG_TEMP_CALIBRATION_OFF "Cal. temp. [OFF]"
#define MSG_PREPARE_FILAMENT "Preparar filamento"

3
Firmware/language_pl.h
View File

@ -276,4 +276,5 @@
#define MSG_TEMP_CALIBRATION "Ciepl. kal. " #define MSG_TEMP_CALIBRATION "Ciepl. kal. "
#define MSG_TEMP_CALIBRATION_DONE "Cieplna kalibracja zakonczona. Kontynuuj przyciskiem" #define MSG_TEMP_CALIBRATION_DONE "Cieplna kalibracja zakonczona. Kontynuuj przyciskiem"
#define MSG_TEMP_CALIBRATION_ON "Ciepl. kal. [ON]" #define MSG_TEMP_CALIBRATION_ON "Ciepl. kal. [ON]"
#define MSG_TEMP_CALIBRATION_OFF "Ciepl. kal. [OFF]" #define MSG_TEMP_CALIBRATION_OFF "Ciepl. kal. [OFF]"
#define MSG_PREPARE_FILAMENT "Przygotuj filament"

5
Firmware/ultralcd.cpp
View File

@ -3122,7 +3122,10 @@ static void extr_unload() { //unloads filament
lcd_implementation_clear(); lcd_implementation_clear();
lcd_display_message_fullscreen_P(PSTR("")); lcd_display_message_fullscreen_P(PSTR(""));
max_feedrate[E_AXIS] = 50; max_feedrate[E_AXIS] = 50;
lcd.setCursor(0, 1); lcd_printPGM(MSG_PLEASE_WAIT); lcd.setCursor(0, 0); lcd_printPGM(MSG_UNLOADING_FILAMENT);
lcd.print(" ");
lcd.print(snmm_extruder + 1);
lcd.setCursor(0, 2); lcd_printPGM(MSG_PLEASE_WAIT);
if (current_position[Z_AXIS] < 15) { if (current_position[Z_AXIS] < 15) {
current_position[Z_AXIS] += 15; //lifting in Z direction to make space for extrusion current_position[Z_AXIS] += 15; //lifting in Z direction to make space for extrusion
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 25, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 25, active_extruder);