bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -229,6 +229,8 @@
#error "K1 is now PID_K1. Please update your configuration."
#elif defined(PROBE_DOUBLE_TOUCH)
#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
/**
@ -1359,7 +1361,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)
@ -1395,7 +1397,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."