CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for the Tronxy and Zonestar LCD

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-15 19:05:57 -06:00
parent 9abbcc3ee0
commit 15d05748df
6 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration.h
View File

@ -1516,11 +1516,13 @@
//#define CARTESIO_UI //#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 // This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up. // 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 //#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 // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -42,7 +42,7 @@
#define U8GLIB_ST7565_64128N #define U8GLIB_ST7565_64128N
#elif ENABLED(ANET_KEYPAD_LCD) #elif ENABLED(ZONESTAR_LCD)
#define REPRAPWORLD_KEYPAD #define REPRAPWORLD_KEYPAD
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0

6
Marlin/src/inc/SanityCheck.h
View File

@ -229,6 +229,8 @@
#error "K1 is now PID_K1. Please update your configuration." #error "K1 is now PID_K1. Please update your configuration."
#elif defined(PROBE_DOUBLE_TOUCH) #elif defined(PROBE_DOUBLE_TOUCH)
#error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING. Please update your configuration." #error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING. Please update your configuration."
#elif defined(ANET_KEYPAD_LCD)
#error "ANET_KEYPAD_LCD is now ZONESTAR_LCD. Please update your configuration."
#endif #endif
/** /**
@ -1359,7 +1361,7 @@ static_assert(1 >= 0
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD) \ #if ENABLED(REPRAPWORLD_KEYPAD) \
&& DISABLED(CARTESIO_UI) \ && DISABLED(CARTESIO_UI) \
&& DISABLED(ANET_KEYPAD_LCD) && DISABLED(ZONESTAR_LCD)
+ 1 + 1
#endif #endif
#if ENABLED(RIGIDBOT_PANEL) #if ENABLED(RIGIDBOT_PANEL)
@ -1395,7 +1397,7 @@ static_assert(1 >= 0
#if ENABLED(OLED_PANEL_TINYBOY2) #if ENABLED(OLED_PANEL_TINYBOY2)
+ 1 + 1
#endif #endif
#if ENABLED(ANET_KEYPAD_LCD) #if ENABLED(ZONESTAR_LCD)
+ 1 + 1
#endif #endif
, "Please select no more than one LCD controller option." , "Please select no more than one LCD controller option."

4
Marlin/src/pins/pins_ANET_10.h
View File

@ -145,7 +145,7 @@
* LCD / Controller * LCD / Controller
* *
* Only the following displays are supported: * Only the following displays are supported:
* ANET_KEYPAD_LCD * ZONESTAR_LCD
* ANET_FULL_GRAPHICS_LCD * ANET_FULL_GRAPHICS_LCD
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/ */
@ -209,7 +209,7 @@
* ===================== LCD PINOUTS ================================== * ===================== 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 * physical logical alt | | GRAPHICS_LCD | Graphics Display Wiring | http://www.thingiverse
* pin pin functions | | | | .com/thing:2103748 * pin pin functions | | | | .com/thing:2103748
*------------------------------------------------------------------------------------------------------------------------ *------------------------------------------------------------------------------------------------------------------------

4
Marlin/src/pins/pins_RAMPS.h
View File

@ -538,7 +538,7 @@
#endif // ULTRA_LCD #endif // ULTRA_LCD
#if ENABLED(ANET_KEYPAD_LCD) #if ENABLED(ZONESTAR_LCD)
#define LCD_PINS_RS 64 #define LCD_PINS_RS 64
#define LCD_PINS_ENABLE 44 #define LCD_PINS_ENABLE 44
#define LCD_PINS_D4 63 #define LCD_PINS_D4 63
@ -550,4 +550,4 @@
#define BTN_EN2 -1 #define BTN_EN2 -1
#define BTN_ENC -1 #define BTN_ENC -1
// pin 29 N/C // pin 29 N/C
#endif // ANET_KEYPAD_LCD #endif // ZONESTAR_LCD

16
Marlin/src/pins/pins_SANGUINOLOLU_11.h
View File

@ -243,7 +243,21 @@
#define ST7920_DELAY_3 DELAY_0_NOP #define ST7920_DELAY_3 DELAY_0_NOP
#endif #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 BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi