From 67fabfd1d235de69929c5cb65e45a9fc61113fcd Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Wed, 19 Jul 2017 14:28:13 -0600
Subject: [PATCH] Fixed encoder settings and added Gladiola_GLCD.

---
 Marlin/Configuration.h         |  8 +++++---
 Marlin/Configuration_LulzBot.h | 21 ++++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b8bdfc853..d63fc7038 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1249,13 +1249,13 @@
 // This option overrides the default number of encoder pulses needed to
 // produce one step. Should be increased for high-resolution encoders.
 //
-//#define ENCODER_PULSES_PER_STEP 1
+#define ENCODER_PULSES_PER_STEP LULZBOT_ENCODER_PULSES_PER_STEP
 
 //
 // Use this option to override the number of step signals required to
 // move between next/prev menu items.
 //
-//#define ENCODER_STEPS_PER_MENU_ITEM 5
+#define ENCODER_STEPS_PER_MENU_ITEM LULZBOT_ENCODER_STEPS_PER_MENU_ITEM
 
 /**
  * Encoder Direction Options
@@ -1272,7 +1272,9 @@
 //
 //  Set this option if CLOCKWISE causes values to DECREASE
 //
-//#define REVERSE_ENCODER_DIRECTION
+#if defined(LULZBOT_REVERSE_ENCODER_DIRECTION)
+#define REVERSE_ENCODER_DIRECTION LULZBOT_REVERSE_ENCODER_DIRECTION
+#endif
 
 //
 // This option reverses the encoder direction for navigating LCD menus.
diff --git a/Marlin/Configuration_LulzBot.h b/Marlin/Configuration_LulzBot.h
index 5fdc94e9b..c5d9ad442 100644
--- a/Marlin/Configuration_LulzBot.h
+++ b/Marlin/Configuration_LulzBot.h
@@ -23,6 +23,7 @@
 #if ( \
     !defined(LULZBOT_Gladiola_Mini) && \
     !defined(LULZBOT_Huerfano_Mini) && \
+    !defined(LULZBOT_Gladiola_GLCD) && \
     !defined(LULZBOT_Oliveoil_TAZ_6) && \
     !defined(LULZBOT_Huerfano_TAZ_7) \
 ) || ( \
@@ -45,6 +46,7 @@
     #error   Printer Model Choices:
     #error      Gladiola_Mini            // Lulzbot Mini  (Gladiola)
     #error      Huerfano_Mini            // Lulzbot Mini  (Huerfano)
+    #error      Gladiola_GLCD            // Lulzbot Mini  (Gladiola w/ LCD)
     #error      Oliveoil_TAZ_6           // Lulzbot TAZ 6 (Olive Oil)
     #error      Huerfano_TAZ_7           // Lulzbot TAZ 7 (Huerfano)
     #error
@@ -63,7 +65,7 @@
     #error      Angelfish_Aero           // Titan AERO (Angelfish)
 #endif
 
-#define LULZBOT_FW_VERSION ".4"
+#define LULZBOT_FW_VERSION ".5"
 
 // Select options based on printer model
 
@@ -80,6 +82,13 @@
     #define LULZBOT_MINI_BED
 #endif
 
+#if defined(LULZBOT_Gladiola_GLCD)
+    #define LULZBOT_CUSTOM_MACHINE_NAME "Mini GLCD"
+    #define LULZBOT_IS_MINI
+    #define LULZBOT_MINI_BED
+    #define LULZBOT_USE_LCD_DISPLAY
+#endif
+
 #if defined(LULZBOT_Oliveoil_TAZ_6)
     #define LULZBOT_CUSTOM_MACHINE_NAME "TAZ 6"
     #define LULZBOT_IS_TAZ
@@ -150,7 +159,7 @@
 /* Endstop settings are determined by printer model, except for the
  * X_MAX which varies by toolhead. */
 
-#if defined(LULZBOT_Gladiola_Mini)
+#if defined(LULZBOT_Gladiola_Mini) || defined(LULZBOT_Gladiola_GLCD)
     #define LULZBOT_X_MIN_ENDSTOP_INVERTING       true
     #define LULZBOT_Y_MIN_ENDSTOP_INVERTING       true
     #define LULZBOT_Y_MAX_ENDSTOP_INVERTING       true
@@ -310,7 +319,13 @@
     #define LULZBOT_BABYSTEPPING
     #define LULZBOT_BABYSTEP_ZPROBE_OFFSET
     #define LULZBOT_SHOW_CUSTOM_BOOTSCREEN
+    #define LULZBOT_ENCODER_PULSES_PER_STEP 2
+    #define LULZBOT_ENCODER_STEPS_PER_MENU_ITEM 1
     #define LULZBOT_MENU_BED_LEVELING_GCODE "G28 XY\nM109 S175\nG28 Z\nM109 R145\nG12\nG29\nM104 S0"
+    #if defined(LULZBOT_Gladiola_GLCD)
+        // In the experimental Gladiola_GLCD, the encoder direction is reversed.
+        #define LULZBOT_REVERSE_ENCODER_DIRECTION
+    #endif
 #endif
 
 /*********************************************** COMMON TOOLHEADS PARAMETERS *****************************/
@@ -539,7 +554,7 @@
     #define LULZBOT_Z_MIN_POS                       0
 #endif
 
-#if defined(LULZBOT_Gladiola_Mini)
+#if defined(LULZBOT_Gladiola_Mini) || defined(LULZBOT_Gladiola_GLCD)
     #define PWM_MOTOR_CURRENT_Z                   1630
     #define LULZBOT_Z_STEPS                       1600