Browse Source

Fix compiling the watchdog error message when the manual reset watchdog is used.

daid303 12 years ago
parent
commit
1f27870d41
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/watchdog.cpp

+ 5
- 5
Marlin/watchdog.cpp View File

1
 #include "Marlin.h"
1
 #include "Marlin.h"
2
 
2
 
3
-#ifdef USE_WATCHDOG
4
-#include <avr/wdt.h>
3
+#ifdef USE_WATCHDOG
4
+#include <avr/wdt.h>
5
 
5
 
6
 #include "watchdog.h"
6
 #include "watchdog.h"
7
 #include "ultralcd.h"
7
 #include "ultralcd.h"
42
 //Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
42
 //Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
43
 #ifdef WATCHDOG_RESET_MANUAL
43
 #ifdef WATCHDOG_RESET_MANUAL
44
 ISR(WDT_vect)
44
 ISR(WDT_vect)
45
-{ 
45
+{ 
46
     //TODO: This message gets overwritten by the kill() call
46
     //TODO: This message gets overwritten by the kill() call
47
-    LCD_MESSAGEPGM("ERR:Please Reset");//16 characters so it fits on a 16x2 display
48
-    LCD_STATUS;
47
+    LCD_ALERTMESSAGEPGM("ERR:Please Reset");//16 characters so it fits on a 16x2 display
48
+    lcd_update();
49
     SERIAL_ERROR_START;
49
     SERIAL_ERROR_START;
50
     SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
50
     SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
51
     kill(); //kill blocks
51
     kill(); //kill blocks

Loading…
Cancel
Save