From b0ae371ec844f63b627701708b86ffa9bb69c394 Mon Sep 17 00:00:00 2001
From: Adrian Bowyer <reprappro@gmail.com>
Date: Thu, 23 May 2013 12:27:05 +0100
Subject: [PATCH] Small bug in relative extrude feeds fixed.

---
 Configuration.h | 3 ---
 GCodes.ino      | 2 +-
 Move.ino        | 4 ++--
 Platform.h      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Configuration.h b/Configuration.h
index 6913953..87077cd 100644
--- a/Configuration.h
+++ b/Configuration.h
@@ -58,8 +58,5 @@ Licence: GPL
 #define START_FEED_RATE 200
 #define GCODE_LENGTH 100 // Maximum lenght of internally-generated G Code string
 
-// The axes etc in a GCode
-
-#define GCODE_LETTERS { 'X', 'Y', 'Z', 'E', 'F' }
 
 #endif
diff --git a/GCodes.ino b/GCodes.ino
index ba47a59..0da10c5 100644
--- a/GCodes.ino
+++ b/GCodes.ino
@@ -43,7 +43,7 @@ void GCodes::Init()
   active = true;
   moveAvailable = false;
   heatAvailable = false;
-  drivesRelative = false;
+  drivesRelative = true;
   axesRelative = false;
   gCodeLetters = GCODE_LETTERS;
   distanceScale = 1.0;
diff --git a/Move.ino b/Move.ino
index f452d60..29f6caf 100644
--- a/Move.ino
+++ b/Move.ino
@@ -107,7 +107,7 @@ void Move::Qmove()
   
   boolean work = dda->Init(currentPosition, nextMove, u, v);
   
-  for(char i = 0; i <= AXES; i++)
+  for(char i = 0; i < AXES; i++)
     currentPosition[i] = nextMove[i];
     
   if(work)
@@ -241,7 +241,7 @@ boolean DDA::Init(float currentPosition[], float targetPosition[], float& u, flo
   
   distance = sqrt(distance);
   
-  if(axesMoving&4) // Z involved?
+  if(axesMoving & (1<<Z_AXIS)) // Z involved?
   {
     acceleration = platform->Acceleration(Z_AXIS);
     jerk = platform->Jerk(Z_AXIS);
diff --git a/Platform.h b/Platform.h
index f4da6a1..f336884 100644
--- a/Platform.h
+++ b/Platform.h
@@ -72,7 +72,7 @@ Licence: GPL
 #define ACCELERATIONS {800, 800, 30, 250}    // mm/sec^2??
 #define DRIVE_STEPS_PER_UNIT {91.4286, 91.4286, 4000, 929}
 #define JERKS {15.0, 15.0, 0.4, 15.0}    // (mm/sec)
-
+#define GCODE_LETTERS { 'X', 'Y', 'Z', 'E', 'F' } // The drives and feedrate in a GCode
 
 // AXES