From d7f53214e30b0619965fda0157b013ae09f2db63 Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Wed, 19 Jul 2017 12:42:56 -0600
Subject: [PATCH] Fixes for Mini. M115 fixed.

---
 Marlin/Configuration_LulzBot.h | 23 +++++++++++++++--------
 Marlin/Version.h               |  6 +++---
 README_LulzBot.md              |  3 +--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration_LulzBot.h b/Marlin/Configuration_LulzBot.h
index 19b281c63..5fdc94e9b 100644
--- a/Marlin/Configuration_LulzBot.h
+++ b/Marlin/Configuration_LulzBot.h
@@ -63,7 +63,7 @@
     #error      Angelfish_Aero           // Titan AERO (Angelfish)
 #endif
 
-#define LULZBOT_FW_VERSION ".3"
+#define LULZBOT_FW_VERSION ".4"
 
 // Select options based on printer model
 
@@ -523,8 +523,8 @@
     #define LULZBOT_DEFAULT_ACCELERATION          2000
     #define LULZBOT_DEFAULT_TRAVEL_ACCELERATION   3000
 
-    #define LULZBOT_Z_MAX_POS                      159
-    #define LULZBOT_Z_MIN_POS                       -2
+    #define LULZBOT_Z_MAX_POS                      160
+    #define LULZBOT_Z_MIN_POS                      0
 
 #elif defined(LULZBOT_IS_TAZ)
     #define DIGIPOT_MOTOR_CURRENT_XY              175
@@ -644,8 +644,15 @@
         u8g.drawStr(67,62,SHORT_BUILD_VERSION LULZBOT_FW_VERSION); \
     } while( u8g.nextPage() );
 
-// Z Probe w/ Rewipe
-#define LULZBOT_NUM_REWIPES 1
+// Customize version string
+
+#define LULZBOT_DETAILED_BUILD_VERSION SHORT_BUILD_VERSION LULZBOT_FW_VERSION " (LulzBot " LULZBOT_CUSTOM_MACHINE_NAME " " LULZBOT_LCD_TOOLHEAD_NAME ")"
+#define LULZBOT_STRING_DISTRIBUTION_DATE __DATE__ __TIME__
+#define LULZBOT_SOURCE_CODE_URL "https://code.alephobjects.com/diffusion/MARLIN"
+
+// Bed Probe w/ Rewipe
+#define LULZBOT_NUM_REWIPES    1
+#define LULZBOT_BED_PROBE_MIN -2 // How far to push into bed before failing.
 
 #if defined(LULZBOT_USE_LCD_DISPLAY)
     #define LULZBOT_STOP_JOB_CMD card.stopSDPrint();
@@ -654,13 +661,13 @@
 #endif
 
 #define LULZBOT_PROBE_Z_WITH_REWIPE(speed) \
-    do_probe_move(0, speed);                          /* probe; if we reach Z=0, the probe failed */ \
-    for(int rewipes = 1; current_position[Z_AXIS] == 0; rewipes++) { \
+    do_probe_move(LULZBOT_BED_PROBE_MIN, speed); /* probe; if we reach limit, the probe failed */ \
+    for(int rewipes = 1; current_position[Z_AXIS] == LULZBOT_BED_PROBE_MIN; rewipes++) { \
         SERIAL_ERRORLNPGM(MSG_REWIPE); \
         LCD_MESSAGEPGM(MSG_REWIPE); \
         do_blocking_move_to_z(10, MMM_TO_MMS(speed)); /* raise nozzle */ \
         Nozzle::clean(0, 2, 0, 0);                    /* wipe nozzle */ \
-        do_probe_move(0, speed);                      /* reprobe */ \
+        do_probe_move(LULZBOT_BED_PROBE_MIN, speed);  /* reprobe */ \
         if(rewipes >= LULZBOT_NUM_REWIPES) {          /* max of tries */ \
             SERIAL_ERRORLNPGM("PROBE FAIL CLEAN NOZZLE"); /* cura listens for this message specifically */ \
             LCD_MESSAGEPGM(MSG_LEVEL_FAIL);           /* use a more friendly message on the LCD */ \
diff --git a/Marlin/Version.h b/Marlin/Version.h
index a14d8202c..2d8c53c74 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,14 +41,14 @@
    * Verbose version identifier which should contain a reference to the location
    * from where the binary was downloaded or the source code was compiled.
    */
-  #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (Github)"
+  #define DETAILED_BUILD_VERSION LULZBOT_DETAILED_BUILD_VERSION
 
   /**
    * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
    * here we define this default string as the date where the latest release
    * version was tagged.
    */
-  #define STRING_DISTRIBUTION_DATE "2017-07-04 12:00"
+  #define STRING_DISTRIBUTION_DATE LULZBOT_STRING_DISTRIBUTION_DATE
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.
@@ -78,7 +78,7 @@
    * has a distinct Github fork— the Source Code URL should just be the main
    * Marlin repository.
    */
-  #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
+  #define SOURCE_CODE_URL LULZBOT_SOURCE_CODE_URL
 
   /**
    * Default generic printer UUID.
diff --git a/README_LulzBot.md b/README_LulzBot.md
index 493e753b1..0f4f33a69 100644
--- a/README_LulzBot.md
+++ b/README_LulzBot.md
@@ -17,5 +17,4 @@ To select what firmware to build, modify lines 6 and 7 of "Configuration_LulzBot
 1. The Makefile does not work. Building must be done via the Arduino IDE (internal builds are being done with 1.8.3)
 2. There is no way to tune the FlexyDually properly right now, as Marlin 1.1.4 does not support separate ESTEPs per extruder.
 3. Printer needs to be power cycled to clear "clean nozzle" state.
-4. M114 not reporting complete version string.
-5. LCD display will show "Heating" when cooling.
\ No newline at end of file
+4. LCD display will show "Heating" when cooling.
\ No newline at end of file