From b8f0a2399e1aaf2c8e5c87d2ef9f02a46d73bab2 Mon Sep 17 00:00:00 2001
From: Sonny Jeon <chamnit@gmail.com>
Date: Tue, 29 Oct 2013 19:28:44 -0600
Subject: [PATCH] Merge fixes.

---
 limits.c         | 1 -
 motion_control.c | 1 -
 planner.c        | 5 +----
 report.c         | 2 --
 report.h         | 1 -
 stepper.c        | 6 ------
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/limits.c b/limits.c
index 3b15353..4fde4c9 100644
--- a/limits.c
+++ b/limits.c
@@ -67,7 +67,6 @@ ISR(LIMIT_INT_vect)
   if (sys.state != STATE_ALARM) { 
     if (bit_isfalse(sys.execute,EXEC_ALARM)) {
       mc_reset(); // Initiate system kill.
-      report_alarm_message(ALARM_HARD_LIMIT);
       sys.execute |= EXEC_CRIT_EVENT; // Indicate hard limit critical event
     }
   }
diff --git a/motion_control.c b/motion_control.c
index d417031..e420c98 100644
--- a/motion_control.c
+++ b/motion_control.c
@@ -35,7 +35,6 @@
 #include "planner.h"
 #include "limits.h"
 #include "protocol.h"
-#include "report.h"
 
 // Execute linear motion in absolute millimeter coordinates. Feed rate given in millimeters/second
 // unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in
diff --git a/planner.c b/planner.c
index 18f7bc1..0afa018 100644
--- a/planner.c
+++ b/planner.c
@@ -22,18 +22,14 @@
 
 /* The ring buffer implementation gleaned from the wiring_serial library by David A. Mellis. */
 
-#include <avr/interrupt.h>
-#include <util/atomic.h>
 #include <inttypes.h>    
 #include <stdlib.h>
-#include <stdio.h>
 #include "planner.h"
 #include "nuts_bolts.h"
 #include "stepper.h"
 #include "settings.h"
 #include "config.h"
 #include "protocol.h"
-#include "motion_control.h"
 
 #define SOME_LARGE_VALUE 1.0E+38 // Used by rapids and acceleration maximization calculations. Just needs
                                  // to be larger than any feasible (mm/min)^2 or mm/sec^2 value.
@@ -452,6 +448,7 @@ void plan_buffer_line(float *target, float feed_rate, uint8_t invert_feed_rate)
     }
   }
 
+
   // TODO: Need to check this method handling zero junction speeds when starting from rest.
   if (block_buffer_head == block_buffer_tail) {
   
diff --git a/report.c b/report.c
index 8688e4f..e71ac54 100644
--- a/report.c
+++ b/report.c
@@ -92,8 +92,6 @@ void report_alarm_message(int8_t alarm_code)
     printPgmString(PSTR("Hard/soft limit")); break;
     case ALARM_ABORT_CYCLE: 
     printPgmString(PSTR("Abort during cycle")); break;
-    case ALARM_SOFT_LIMIT: 
-    printPgmString(PSTR("Soft Limit")); break;
   }
   printPgmString(PSTR(". MPos?\r\n"));
   delay_ms(500); // Force delay to ensure message clears serial write buffer.
diff --git a/report.h b/report.h
index 26af23d..7dcfc47 100644
--- a/report.h
+++ b/report.h
@@ -41,7 +41,6 @@
 // Define Grbl alarm codes. Less than zero to distinguish alarm error from status error.
 #define ALARM_LIMIT_ERROR -1
 #define ALARM_ABORT_CYCLE -2
-#define ALARM_SOFT_LIMIT -3
 
 // Define Grbl feedback message codes.
 #define MESSAGE_CRITICAL_EVENT 1
diff --git a/stepper.c b/stepper.c
index a70a744..e3e4b25 100644
--- a/stepper.c
+++ b/stepper.c
@@ -177,7 +177,6 @@ void st_go_idle()
       STEPPERS_DISABLE_PORT |= (1<<STEPPERS_DISABLE_BIT); 
     }   
   }
-  st.ramp_type = ACCEL_RAMP;
 }
 
 
@@ -702,8 +701,3 @@ void st_fetch_partial_block_parameters(uint8_t block_index, float *millimeters_r
   }
   return;
 }
-
-uint8_t st_is_decelerating() {
-  return st.ramp_type == DECEL_RAMP;
-}
-