From 877441cc73bf24689b135fc3b91cc1c609934a73 Mon Sep 17 00:00:00 2001
From: Ted Hess <thess@kitschensync.net>
Date: Tue, 20 Feb 2018 11:38:40 -0500
Subject: [PATCH] Disable M851 and zprobe_zoffset (rethink usage)

---
 Firmware/Configuration.h        |  2 +-
 Firmware/ConfigurationStore.cpp | 13 ++++++++++---
 Firmware/Marlin.h               |  2 ++
 Firmware/Marlin_main.cpp        |  3 +++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index cabf6d7b6..ad6fdbcc7 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -469,7 +469,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 //===========================================================================
 
 // Custom M code points
-#define CUSTOM_M_CODES
+//#define CUSTOM_M_CODES
 #ifdef CUSTOM_M_CODES
   #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
   #define Z_PROBE_OFFSET_RANGE_MIN -15
diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp
index 68e1ad686..cc888ae9d 100644
--- a/Firmware/ConfigurationStore.cpp
+++ b/Firmware/ConfigurationStore.cpp
@@ -85,7 +85,11 @@ void Config_StoreSettings()
   EEPROM_WRITE_VAR(i,absPreheatFanSpeed);
 */
   
-  EEPROM_WRITE_VAR(i,zprobe_zoffset);
+  #ifdef ENABLE_AUTO_BED_LEVELING
+   EEPROM_WRITE_VAR(i,zprobe_zoffset);
+  #else
+   i += sizeof(float);
+  #endif
   #ifdef PIDTEMP
     EEPROM_WRITE_VAR(i,Kp);
     EEPROM_WRITE_VAR(i,Ki);
@@ -314,8 +318,11 @@ bool Config_RetrieveSettings()
         EEPROM_READ_VAR(i,absPreheatFanSpeed);
         */
 
-        
-        EEPROM_READ_VAR(i,zprobe_zoffset);
+        #ifdef ENABLE_AUTO_BED_LEVELING
+         EEPROM_READ_VAR(i,zprobe_zoffset);
+	#else
+	 i += sizeof(float);
+        #endif
         #ifndef PIDTEMP
         float Kp,Ki,Kd;
         #endif
diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
index 0c10ee3d6..8f70ce8f4 100644
--- a/Firmware/Marlin.h
+++ b/Firmware/Marlin.h
@@ -258,7 +258,9 @@ extern float add_homing[3];
 extern float min_pos[3];
 extern float max_pos[3];
 extern bool axis_known_position[3];
+#ifdef ENABLE_AUTO_BED_LEVELING
 extern float zprobe_zoffset;
+#endif
 extern int fanSpeed;
 extern void homeaxis(int axis);
 
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index aa73be165..285066319 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -319,7 +319,10 @@ float add_homing[3]={0,0,0};
 float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
 float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
 bool axis_known_position[3] = {false, false, false};
+
+#ifdef ENABLE_AUTO_BED_LEVELING
 float zprobe_zoffset;
+#endif
 
 // Extruder offset
 #if EXTRUDERS > 1