From 1f27870d41d6c1e7743d1a09d618c6d743347793 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 6 Dec 2012 10:27:50 +0100 Subject: [PATCH] Fix compiling the watchdog error message when the manual reset watchdog is used. --- Marlin/watchdog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/watchdog.cpp b/Marlin/watchdog.cpp index f3290895a..b378ca706 100644 --- a/Marlin/watchdog.cpp +++ b/Marlin/watchdog.cpp @@ -1,7 +1,7 @@ #include "Marlin.h" -#ifdef USE_WATCHDOG -#include +#ifdef USE_WATCHDOG +#include #include "watchdog.h" #include "ultralcd.h" @@ -42,10 +42,10 @@ void watchdog_reset() //Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled. #ifdef WATCHDOG_RESET_MANUAL ISR(WDT_vect) -{ +{ //TODO: This message gets overwritten by the kill() call - LCD_MESSAGEPGM("ERR:Please Reset");//16 characters so it fits on a 16x2 display - LCD_STATUS; + LCD_ALERTMESSAGEPGM("ERR:Please Reset");//16 characters so it fits on a 16x2 display + lcd_update(); SERIAL_ERROR_START; SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer."); kill(); //kill blocks