From 6d95644c0d7dcb17b9723374b92aaceed11c6548 Mon Sep 17 00:00:00 2001
From: Erik van der Zalm <erik@vdzalm.eu>
Date: Mon, 28 Nov 2011 21:49:54 +0100
Subject: [PATCH] Moved M88 into M84. (M84 E)

---
 Marlin/Marlin.pde | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 191f70b646..86f5626599 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -852,7 +852,18 @@ inline void process_commands()
       }
       else
       { 
-        finishAndDisableSteppers();
+        #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
+        if(code_seen('E')) {
+          st_synchronize()
+          LCD_MESSAGEPGM("Free Move");
+          disable_e();
+        }
+        else {
+          finishAndDisableSteppers();
+        }
+        #else
+          finishAndDisableSteppers();
+        #endif
       }
       break;
     case 85: // M85
@@ -866,21 +877,6 @@ inline void process_commands()
           axis_steps_per_unit[i] = code_value();
       }
       break;
-    case 88: //M88
-      #if ((E_ENABLE_PIN != X_ENABLE_PIN) && (E_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS
-        if(code_seen('S')) {
-          stepper_inactive_time = code_value() * 1000;
-        }
-        else {
-          st_synchronize()
-          LCD_MESSAGEPGM("Free Move");
-          disable_e();
-        }
-      #else
-        SERIAL_ECHO_START;
-        SERIAL_ECHOLN("M88 not supported");
-      #endif
-      break;
     case 115: // M115
       SerialprintPGM("FIRMWARE_NAME:Marlin; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1");
       break;