From b8fec59f216a020c0e28dcdfe06f75d891ea6c68 Mon Sep 17 00:00:00 2001
From: NotaRobotexe <petermravecc@gmail.com>
Date: Wed, 17 Jul 2019 19:59:31 +0200
Subject: [PATCH] octoprint fan error fix

---
 Firmware/Marlin_main.cpp | 11 +++++++++--
 Firmware/temperature.cpp |  3 ++-
 Firmware/ultralcd.cpp    |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 35827021d..e536df96d 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3393,8 +3393,15 @@ void process_commands()
   if (fan_check_error){
 	if( fan_check_error == EFCE_DETECTED ){
 		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;
   }
   #endif
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index f9bb11f80..1ef855492 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -524,6 +524,8 @@ void checkFanSpeed()
 		fan_speed_errors[1] = 0;
 		fanSpeedError(1); //print fan
 	}
+
+  SERIAL_PROTOCOLLNRPGM(MSG_OK); //for octoprint
 }
 
 //! Prints serialMsg to serial port, displays lcdMsg onto the LCD and beeps.
@@ -547,7 +549,6 @@ void fanSpeedError(unsigned char _fan) {
 		}
 		else {
 			fan_check_error = EFCE_DETECTED;
-      SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE);
 		}
 	}
 	else {
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e87908867..c70fe8fc2 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1658,6 +1658,7 @@ void lcd_pause_print()
     {
         lcd_commands_type = LcdCommands::LongPause;
     }
+	SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //pause for octoprint
 }