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

Merge pull request #50 from PavelSindler/MK3 

Fan errors updated
This commit is contained in:
PavelSindler 2017-09-22 19:48:27 +02:00 committed by GitHub
parent bf5e4de5b7 045ffb9f0e
commit 7e71d21a03
3 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/temperature.cpp
View File

@ -456,27 +456,35 @@ void checkFanSpeed()
if ((fan_speed_errors[1] > 15) && fans_check_enabled) fanSpeedError(1); //print fan if ((fan_speed_errors[1] > 15) && fans_check_enabled) fanSpeedError(1); //print fan
} }
extern void stop_and_save_print_to_ram(float z_move, float e_move);
extern void restore_print_from_ram_and_continue(float e_move);
void fanSpeedError(unsigned char _fan) { void fanSpeedError(unsigned char _fan) {
if (card.sdprinting) { if (card.sdprinting) {
card.pauseSDPrint(); if(heating_status != 0) lcd_print_stop();
else lcd_sdcard_pause();
} }
setTargetHotend0(0); setTargetHotend0(0);
/*lcd_update();
//lcd_update();
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(500); delayMicroseconds(2000);
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
delayMicroseconds(100);*/ delayMicroseconds(100);
SERIAL_ERROR_START; SERIAL_ERROR_START;
switch (_fan) { switch (_fan) {
case 0: case 0:
fanSpeed = 255;
//lcd_print_stop();
SERIAL_ERRORLNPGM("ERROR: Extruder fan speed is lower then expected"); SERIAL_ERRORLNPGM("ERROR: Extruder fan speed is lower then expected");
LCD_ALERTMESSAGEPGM("Err: EXTR. FAN ERROR"); LCD_ALERTMESSAGEPGM("Err: EXTR. FAN ERROR");
break; break;
case 1: case 1:
//stop_and_save_print_to_ram(0, 0);
SERIAL_ERRORLNPGM("ERROR: Print fan speed is lower then expected"); SERIAL_ERRORLNPGM("ERROR: Print fan speed is lower then expected");
LCD_ALERTMESSAGEPGM("Err: PRINT FAN ERROR"); LCD_ALERTMESSAGEPGM("Err: PRINT FAN ERROR");
break; break;

59
Firmware/ultralcd.cpp
View File

@ -820,7 +820,7 @@ static void lcd_return_to_status() {
} }
static void lcd_sdcard_pause() { void lcd_sdcard_pause() {
lcd_return_to_status(); lcd_return_to_status();
lcd_commands_type = LCD_COMMAND_LONG_PAUSE; lcd_commands_type = LCD_COMMAND_LONG_PAUSE;
@ -4140,33 +4140,7 @@ static void lcd_sd_updir()
currentMenuViewOffset = 0; currentMenuViewOffset = 0;
} }
void lcd_print_stop() {
void lcd_sdcard_stop()
{
lcd.setCursor(0, 0);
lcd_printPGM(MSG_STOP_PRINT);
lcd.setCursor(2, 2);
lcd_printPGM(MSG_NO);
lcd.setCursor(2, 3);
lcd_printPGM(MSG_YES);
lcd.setCursor(0, 2); lcd.print(" ");
lcd.setCursor(0, 3); lcd.print(" ");
if ((int32_t)encoderPosition > 2) { encoderPosition = 2; }
if ((int32_t)encoderPosition < 1) { encoderPosition = 1; }
lcd.setCursor(0, 1 + encoderPosition);
lcd.print(">");
if (lcd_clicked())
{
if ((int32_t)encoderPosition == 1)
{
lcd_return_to_status();
}
if ((int32_t)encoderPosition == 2)
{
cancel_heatup = true; cancel_heatup = true;
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
mbl.active = false; mbl.active = false;
@ -4199,6 +4173,35 @@ void lcd_sdcard_stop()
WRITE(FAN_PIN, 0); WRITE(FAN_PIN, 0);
fanSpeed = 0; fanSpeed = 0;
} }
void lcd_sdcard_stop()
{
lcd.setCursor(0, 0);
lcd_printPGM(MSG_STOP_PRINT);
lcd.setCursor(2, 2);
lcd_printPGM(MSG_NO);
lcd.setCursor(2, 3);
lcd_printPGM(MSG_YES);
lcd.setCursor(0, 2); lcd.print(" ");
lcd.setCursor(0, 3); lcd.print(" ");
if ((int32_t)encoderPosition > 2) { encoderPosition = 2; }
if ((int32_t)encoderPosition < 1) { encoderPosition = 1; }
lcd.setCursor(0, 1 + encoderPosition);
lcd.print(">");
if (lcd_clicked())
{
if ((int32_t)encoderPosition == 1)
{
lcd_return_to_status();
}
if ((int32_t)encoderPosition == 2)
{
lcd_print_stop();
}
} }
} }

2
Firmware/ultralcd.h
View File

@ -26,6 +26,8 @@
void lcd_loading_color(); void lcd_loading_color();
void lcd_force_language_selection(); void lcd_force_language_selection();
void lcd_sdcard_stop(); void lcd_sdcard_stop();
void lcd_sdcard_pause();
void lcd_print_stop();
void prusa_statistics(int _message); void prusa_statistics(int _message);
void lcd_confirm_print(); void lcd_confirm_print();
void lcd_mylang(); void lcd_mylang();