From 5249765508eeb37673eccdd39a17d0cc4ed923d6 Mon Sep 17 00:00:00 2001
From: Dan Delaney <github@loclhst.com>
Date: Mon, 11 Dec 2017 22:43:56 -0600
Subject: [PATCH] Adding support for the Tronxy and Zonestar LCD

Code borrowed and modified from erikkallen/Marlin_tronxy.
Changed the ANET_KEYPAD_LCD to zonestar, since it is the same device.
I kept a define for ANET_KEYPAD_LCD to enable ZONESTAR_LCD.
---
 Marlin/Conditionals_LCD.h     |  2 +-
 Marlin/Configuration.h        |  6 ++++--
 Marlin/SanityCheck.h          |  4 ++--
 Marlin/pins_ANET_10.h         |  6 +++---
 Marlin/pins_RAMPS.h           |  4 ++--
 Marlin/pins_SANGUINOLOLU_11.h | 16 +++++++++++++++-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h
index 57cfc40fe8..c563b64d89 100644
--- a/Marlin/Conditionals_LCD.h
+++ b/Marlin/Conditionals_LCD.h
@@ -42,7 +42,7 @@
 
     #define U8GLIB_ST7565_64128N
 
-  #elif ENABLED(ANET_KEYPAD_LCD)
+  #elif ENABLED(ZONESTAR_LCD)
 
     #define REPRAPWORLD_KEYPAD
     #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c6e172af26..0736ed9b56 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1516,11 +1516,13 @@
 //#define CARTESIO_UI
 
 //
-// ANET_10 Controller supported displays.
+// ANET and Tronxy Controller supported displays.
 //
-//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
+//#define ZONESTAR_LCD            // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
                                   // This LCD is known to be susceptible to electrical interference
                                   // which scrambles the display.  Pressing any button clears it up.
+                                  // This is a LCD2004 display with 5 analog buttons.
+
 //#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
                                   // A clone of the RepRapDiscount full graphics display but with
                                   // different pins/wiring (see pins_ANET_10.h).
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 0afa7164b0..170b30518a 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -1342,7 +1342,7 @@ static_assert(1 >= 0
   #endif
   #if ENABLED(REPRAPWORLD_KEYPAD) \
       && DISABLED(CARTESIO_UI) \
-      && DISABLED(ANET_KEYPAD_LCD)
+      && DISABLED(ZONESTAR_LCD)
     + 1
   #endif
   #if ENABLED(RIGIDBOT_PANEL)
@@ -1378,7 +1378,7 @@ static_assert(1 >= 0
   #if ENABLED(OLED_PANEL_TINYBOY2)
     + 1
   #endif
-  #if ENABLED(ANET_KEYPAD_LCD)
+  #if ENABLED(ZONESTAR_LCD)
     + 1
   #endif
   , "Please select no more than one LCD controller option."
diff --git a/Marlin/pins_ANET_10.h b/Marlin/pins_ANET_10.h
index 1e37247c47..fcac4c0908 100644
--- a/Marlin/pins_ANET_10.h
+++ b/Marlin/pins_ANET_10.h
@@ -145,10 +145,10 @@
  * LCD / Controller
  *
  * Only the following displays are supported:
- *  ANET_KEYPAD_LCD
+ *  ZONESTAR_LCD
  *  ANET_FULL_GRAPHICS_LCD
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-*/
+ */
 
 #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
   #define LCD_SDSS           28
@@ -209,7 +209,7 @@
  * ===================== LCD PINOUTS ==================================
  * ====================================================================
  *
- *   Anet V1.0 controller           | ANET_KEYPAD_LCD   | ANET_FULL_      | RepRapDiscount Full      | Thingiverse RepRap wiring
+ *   Anet V1.0 controller           | ZONESTAR_LCD      | ANET_FULL_      | RepRapDiscount Full      | Thingiverse RepRap wiring
  *   physical   logical   alt       |                   | GRAPHICS_LCD    | Graphics Display Wiring  | http://www.thingiverse
  *     pin        pin     functions |                   |                 |                          | .com/thing:2103748
  *------------------------------------------------------------------------------------------------------------------------
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 1a0ad91d6e..e070e8fb93 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -533,7 +533,7 @@
 
 #endif // ULTRA_LCD
 
-#if ENABLED(ANET_KEYPAD_LCD)
+#if ENABLED(ZONESTAR_LCD)
   #define LCD_PINS_RS        64
   #define LCD_PINS_ENABLE    44
   #define LCD_PINS_D4        63
@@ -545,4 +545,4 @@
   #define BTN_EN2            -1
   #define BTN_ENC            -1
   // pin 29 N/C
-#endif // ANET_KEYPAD_LCD
+#endif // ZONESTAR_LCD
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h
index 13da81cffb..00c2c58426 100644
--- a/Marlin/pins_SANGUINOLOLU_11.h
+++ b/Marlin/pins_SANGUINOLOLU_11.h
@@ -243,7 +243,21 @@
       #define ST7920_DELAY_3 DELAY_0_NOP
     #endif
 
-  #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI
+  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
+
+    #define LCD_PINS_RS         28
+    #define LCD_PINS_ENABLE     29
+    #define LCD_PINS_D4         10
+    #define LCD_PINS_D5         11
+    #define LCD_PINS_D6         16
+    #define LCD_PINS_D7         17
+    #define ADC_KEYPAD_PIN       1
+
+    // Not used
+    #define BTN_EN1             -1
+    #define BTN_EN2             -1
+
+  #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI && !ZONESTAR_LCD
 
     #define BTN_ENC             16
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi