From 0e0e4945d8ad060aa50552a0b27369c18442c2d0 Mon Sep 17 00:00:00 2001
From: Erik van der Zalm <erik@vdzalm.eu>
Date: Fri, 25 Nov 2011 13:59:58 +0100
Subject: [PATCH] Removed ISR overtaken message from ISR routine

---
 Marlin/Marlin.pde  |  1 +
 Marlin/stepper.cpp | 18 +++++++++++++++---
 Marlin/stepper.h   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 61078eee7..edba13f35 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -289,6 +289,7 @@ void loop()
   manage_heater();
   manage_inactivity(1);
   checkHitEndstops();
+  checkStepperErrors();
   LCD_STATUS;
 }
 
diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index ad1fda9e0..2a3b8d8ca 100644
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -77,6 +77,9 @@ static bool old_y_max_endstop=false;
 static bool old_z_min_endstop=false;
 static bool old_z_max_endstop=false;
 
+static bool bussy_error=false;
+unsigned char OCR1A_error=12345;
+
 volatile long count_position[NUM_AXIS] = { 0, 0, 0, 0};
 volatile char count_direction[NUM_AXIS] = { 1, 1, 1, 1};
 
@@ -160,6 +163,16 @@ asm volatile ( \
 #define ENABLE_STEPPER_DRIVER_INTERRUPT()  TIMSK1 |= (1<<OCIE1A)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT() TIMSK1 &= ~(1<<OCIE1A)
 
+void checkStepperErrors()
+{
+  if(bussy_error) {
+    SERIAL_ERROR_START
+    SERIAL_ERROR(OCR1A_error);
+    SERIAL_ERRORLNPGM(" ISR overtaking itself.");
+    bussy_error = false;
+  }
+}
+
 void checkHitEndstops()
 {
  if( endstop_x_hit || endstop_y_hit || endstop_z_hit) {
@@ -264,9 +277,8 @@ inline void trapezoid_generator_reset() {
 ISR(TIMER1_COMPA_vect)
 {        
   if(busy){ 
-    SERIAL_ERROR_START
-    SERIAL_ERROR(*(unsigned short *)OCR1A);
-    SERIAL_ERRORLNPGM(" ISR overtaking itself.");
+    OCR1A_error = OCR1A;
+    bussy_error = true;
     OCR1A = 0x30000;
     return; 
   } // The busy-flag is used to avoid reentering this interrupt
diff --git a/Marlin/stepper.h b/Marlin/stepper.h
index 468838486..97f72bf2e 100644
--- a/Marlin/stepper.h
+++ b/Marlin/stepper.h
@@ -44,7 +44,7 @@ void st_wake_up();
 void checkHitEndstops(); //call from somwhere to create an serial error message with the locations the endstops where hit, in case they were triggered
 void endstops_hit_on_purpose(); //avoid creation of the message, i.e. after homeing and before a routine call of checkHitEndstops();
 
-
+void checkStepperErrors(); //Print errors detected by the stepper
 
 extern block_t *current_block;  // A pointer to the block currently being traced