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

Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang

This commit is contained in:
Robert Pelnar 2018-06-22 11:46:08 +02:00
parent 834e0bd3f5 49ad60f0ff
commit 7f5d216a21
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -4397,6 +4397,7 @@ void process_commands()
} }
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
// Restore custom message state // Restore custom message state
lcd_setstatuspgm(_T(WELCOME_MSG));
custom_message = custom_message_old; custom_message = custom_message_old;
custom_message_type = custom_message_type_old; custom_message_type = custom_message_type_old;
custom_message_state = custom_message_state_old; custom_message_state = custom_message_state_old;
@ -7317,6 +7318,7 @@ void clamp_to_software_endstops(float target[3])
float de = e - current_position[E_AXIS]; float de = e - current_position[E_AXIS];
for (int i = 1; i < n_segments; ++ i) { for (int i = 1; i < n_segments; ++ i) {
float t = float(i) / float(n_segments); float t = float(i) / float(n_segments);
if (saved_printing || (mbl.active == false)) return;
plan_buffer_line( plan_buffer_line(
current_position[X_AXIS] + t * dx, current_position[X_AXIS] + t * dx,
current_position[Y_AXIS] + t * dy, current_position[Y_AXIS] + t * dy,
@ -8940,8 +8942,8 @@ void restore_print_from_ram_and_continue(float e_move)
else { else {
//not sd printing nor usb printing //not sd printing nor usb printing
} }
lcd_setstatuspgm(_T(WELCOME_MSG));
saved_printing = false; saved_printing = false;
} }
void print_world_coordinates() void print_world_coordinates()