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

octoprint fan error fix

This commit is contained in:
NotaRobotexe 2019-07-17 19:59:31 +02:00
parent e6255e8451
commit b8fec59f21
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Firmware/Marlin_main.cpp
View File

@ -3393,8 +3393,15 @@ void process_commands()
if (fan_check_error){ if (fan_check_error){
if( fan_check_error == EFCE_DETECTED ){ if( fan_check_error == EFCE_DETECTED ){
fan_check_error = EFCE_REPORTED; fan_check_error = EFCE_REPORTED;
lcd_pause_print();
} // otherwise it has already been reported, so just ignore further processing if(is_usb_printing){
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE);
}
else{
lcd_pause_print();
}
} // otherwise it has already been reported, so just ignore further processing
return; return;
} }
#endif #endif

3
Firmware/temperature.cpp
View File

@ -524,6 +524,8 @@ void checkFanSpeed()
fan_speed_errors[1] = 0; fan_speed_errors[1] = 0;
fanSpeedError(1); //print fan fanSpeedError(1); //print fan
} }
SERIAL_PROTOCOLLNRPGM(MSG_OK); //for octoprint
} }
//! Prints serialMsg to serial port, displays lcdMsg onto the LCD and beeps. //! Prints serialMsg to serial port, displays lcdMsg onto the LCD and beeps.
@ -547,7 +549,6 @@ void fanSpeedError(unsigned char _fan) {
} }
else { else {
fan_check_error = EFCE_DETECTED; fan_check_error = EFCE_DETECTED;
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE);
} }
} }
else { else {

1
Firmware/ultralcd.cpp
View File

@ -1658,6 +1658,7 @@ void lcd_pause_print()
{ {
lcd_commands_type = LcdCommands::LongPause; lcd_commands_type = LcdCommands::LongPause;
} }
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //pause for octoprint
} }