From d3bf28f025251e4e721565f1afd5e76af647c52c Mon Sep 17 00:00:00 2001
From: henols <henols@gmail.com>
Date: Fri, 7 Mar 2014 19:33:57 +0100
Subject: [PATCH 1/2] Probing command gets stuck in hold if several g38.2 are
 submitted Ex. G0 X0 Y0 Z0 G38.2 Z-10 F100 G10 L20 P0 Z0 G0 Z2 G38.2 Z-1 F50
 G10 L20 P0 Z0 G0 Z2 G0 X0 Y0 G38.2 Z-1 F100 G0 Z2

---
 motion_control.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/motion_control.c b/motion_control.c
index 3b2080c..6fda0c2 100644
--- a/motion_control.c
+++ b/motion_control.c
@@ -279,6 +279,7 @@ void mc_probe_cycle(float *target, float feed_rate, uint8_t invert_feed_rate, in
 void mc_probe_cycle(float *target, float feed_rate, uint8_t invert_feed_rate)
 #endif
 {
+  if (sys.state != STATE_CYCLE) protocol_auto_cycle_start();
   protocol_buffer_synchronize(); // Finish all queued commands
   if (sys.abort) { return; } // Return if system reset has been issued.
 

From 60dd609b7956037369d5591bee33b778a6614efd Mon Sep 17 00:00:00 2001
From: Rob Brown <rob@elitewa.com.au>
Date: Tue, 11 Mar 2014 09:23:39 +0800
Subject: [PATCH 2/2] Added Probing to Mega2560 and fixed Shapeoko2 compile
 error

---
 cpu_map.h  | 9 ++++++++-
 defaults.h | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cpu_map.h b/cpu_map.h
index 060135a..797f6bf 100644
--- a/cpu_map.h
+++ b/cpu_map.h
@@ -223,10 +223,17 @@
   #define PINOUT_PCMSK     PCMSK2 // Pin change interrupt register
   #define PINOUT_MASK ((1<<PIN_RESET)|(1<<PIN_FEED_HOLD)|(1<<PIN_CYCLE_START))
 
+  // Define probe switch input pin.
+  #define PROBE_DDR       DDRK
+  #define PROBE_PIN       PINK
+  #define PROBE_PORT      PORTK
+  #define PROBE_BIT       3  // MEGA2560 Analog Pin 11
+  #define PROBE_MASK      (1<<PROBE_BIT)
+
   // Start of PWM & Stepper Enabled Spindle
   #ifdef VARIABLE_SPINDLE
     // Advanced Configuration Below You should not need to touch these variables
-    // Set Timer up to use TIMER4 OCR4B which is attached to Digital Pin 7
+    // Set Timer up to use TIMER2B which is attached to Digital Pin 9
     #define TCCRA_REGISTER		TCCR2A
     #define TCCRB_REGISTER		TCCR2B
     #define OCR_REGISTER		OCR2B
diff --git a/defaults.h b/defaults.h
index a1de3fe..415a44c 100644
--- a/defaults.h
+++ b/defaults.h
@@ -169,7 +169,8 @@
   #define DEFAULT_Z_MAX_TRAVEL 200.0 // mm
   #define DEFAULT_STEP_PULSE_MICROSECONDS 10
   #define DEFAULT_FEEDRATE 250.0
-  #define DEFAULT_STEPPING_INVERT_MASK ((1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT))
+  #define DEFAULT_STEPPING_INVERT_MASK 0
+  #define DEFAULT_DIRECTION_INVERT_MASK ((1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT))
   #define DEFAULT_STEPPER_IDLE_LOCK_TIME 255 // msec (0-254, 255 keeps steppers enabled)
   #define DEFAULT_JUNCTION_DEVIATION 0.05 // mm
   #define DEFAULT_ARC_TOLERANCE 0.002 // mm