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

add lcd_print_stop() function

This commit is contained in:
PavelSindler 2019-04-08 18:24:18 +02:00
parent 858a44e915
commit 6615717fd4
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Firmware/ultralcd.cpp
View File

@ -4872,6 +4872,41 @@ static void lcd_sd_updir()
currentMenuViewOffset = 0; currentMenuViewOffset = 0;
} }
void lcd_print_stop() {
cancel_heatup = true;
#ifdef MESH_BED_LEVELING
mbl.active = false;
#endif
// Stop the stoppers, update the position from the stoppers.
if (mesh_bed_leveling_flag == false && homing_flag == false) {
planner_abort_hard();
// Because the planner_abort_hard() initialized current_position[Z] from the stepper,
// Z baystep is no more applied. Reset it.
babystep_reset();
}
// Clean the input command queue.
cmdqueue_reset();
lcd_setstatuspgm(MSG_PRINT_ABORTED);
lcd_update(2);
card.sdprinting = false;
card.closefile();
stoptime = millis();
unsigned long t = (stoptime - starttime - pause_time) / 1000; //time in s
pause_time = 0;
save_statistics(total_filament_used, t);
lcd_return_to_status();
lcd_ignore_click(true);
lcd_commands_type = LCD_COMMAND_STOP_PRINT;
if (farm_mode) prusa_statistics(7);
// Turn off the print fan
SET_OUTPUT(FAN_PIN);
WRITE(FAN_PIN, 0);
fanSpeed=0;
}
void lcd_sdcard_stop() void lcd_sdcard_stop()
{ {
@ -4899,37 +4934,7 @@ void lcd_sdcard_stop()
} }
if ((int32_t)encoderPosition == 2) if ((int32_t)encoderPosition == 2)
{ {
cancel_heatup = true; lcd_print_stop();
#ifdef MESH_BED_LEVELING
mbl.active = false;
#endif
// Stop the stoppers, update the position from the stoppers.
if (mesh_bed_leveling_flag == false && homing_flag == false) {
planner_abort_hard();
// Because the planner_abort_hard() initialized current_position[Z] from the stepper,
// Z baystep is no more applied. Reset it.
babystep_reset();
}
// Clean the input command queue.
cmdqueue_reset();
lcd_setstatuspgm(MSG_PRINT_ABORTED);
lcd_update(2);
card.sdprinting = false;
card.closefile();
stoptime = millis();
unsigned long t = (stoptime - starttime - pause_time) / 1000; //time in s
pause_time = 0;
save_statistics(total_filament_used, t);
lcd_return_to_status();
lcd_ignore_click(true);
lcd_commands_type = LCD_COMMAND_STOP_PRINT;
if (farm_mode) prusa_statistics(7);
// Turn off the print fan
SET_OUTPUT(FAN_PIN);
WRITE(FAN_PIN, 0);
fanSpeed=0;
} }
} }

1
Firmware/ultralcd.h
View File

@ -31,6 +31,7 @@
unsigned char lcd_choose_color(); unsigned char lcd_choose_color();
void lcd_mylang(); void lcd_mylang();
bool lcd_detected(void); bool lcd_detected(void);
void lcd_print_stop();
void lcd_menu_statistics(); void lcd_menu_statistics();