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

M600: prevention of blob; massage changed when autoload is active

Browse Source
This commit is contained in:
PavelSindler 2019-02-01 21:04:06 +01:00
parent 97aaf919a3
commit 4444b155f1
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -3081,6 +3081,11 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
sprintf_P(cmd, PSTR("M220 S%i"), feedmultiplyBckp); sprintf_P(cmd, PSTR("M220 S%i"), feedmultiplyBckp);
enquecommand(cmd); enquecommand(cmd);
#ifdef IR_SENSOR
//this will set fsensor_watch_autoload to correct value and prevent possible M701 gcode enqueuing when M600 is finished
fsensor_check_autoload();
#endif //IR_SENSOR
lcd_setstatuspgm(_T(WELCOME_MSG)); lcd_setstatuspgm(_T(WELCOME_MSG));
custom_message_type = CUSTOM_MSG_TYPE_STATUS; custom_message_type = CUSTOM_MSG_TYPE_STATUS;
} }

7
Firmware/ultralcd.cpp
View File

@ -2442,9 +2442,10 @@ void lcd_wait_interact() {
#else #else
lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 r=0 lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 r=0
#endif #endif
lcd_set_cursor(0, 2); if (!fsensor_autoload_enabled) {
lcd_puts_P(_i("and press the knob"));////MSG_PRESS c=20 r=0 lcd_set_cursor(0, 2);
lcd_puts_P(_i("and press the knob"));////MSG_PRESS c=20 r=0
}
} }