Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS
This commit is contained in:
parent
014a83fe09
commit
eeb4611606
5 changed files with 23 additions and 21 deletions
|
@ -1552,6 +1552,12 @@
|
||||||
//
|
//
|
||||||
//#define MKS_12864OLED
|
//#define MKS_12864OLED
|
||||||
|
|
||||||
|
//
|
||||||
|
// AZSMZ 12864 LCD with SD
|
||||||
|
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
|
||||||
|
//
|
||||||
|
//#define AZSMZ_12864
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
//=============================== Extra Features ==============================
|
//=============================== Extra Features ==============================
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
#define LONG_FILENAME_HOST_SUPPORT
|
#define LONG_FILENAME_HOST_SUPPORT
|
||||||
|
|
||||||
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
|
||||||
|
|
||||||
#define ULTRA_LCD //general LCD support, also 16x2
|
#define ULTRA_LCD //general LCD support, also 16x2
|
||||||
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
|
||||||
|
@ -86,6 +86,11 @@
|
||||||
#define DEFAULT_LCD_CONTRAST 110
|
#define DEFAULT_LCD_CONTRAST 110
|
||||||
#define U8GLIB_LM6059_AF
|
#define U8GLIB_LM6059_AF
|
||||||
#define SD_DETECT_INVERTED
|
#define SD_DETECT_INVERTED
|
||||||
|
#elif ENABLED(AZSMZ_12864)
|
||||||
|
#define LCD_CONTRAST_MIN 120
|
||||||
|
#define LCD_CONTRAST_MAX 255
|
||||||
|
#define DEFAULT_LCD_CONTRAST 190
|
||||||
|
#define U8GLIB_ST7565_64128N
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(OLED_PANEL_TINYBOY2)
|
#elif ENABLED(OLED_PANEL_TINYBOY2)
|
||||||
|
@ -224,6 +229,7 @@
|
||||||
|
|
||||||
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
|
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
|
||||||
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||||
|
|| ENABLED(AZSMZ_12864) \
|
||||||
|| ENABLED(OLED_PANEL_TINYBOY2) \
|
|| ENABLED(OLED_PANEL_TINYBOY2) \
|
||||||
|| ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
|| ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
||||||
|| ENABLED(LCD_I2C_PANELOLU2) \
|
|| ENABLED(LCD_I2C_PANELOLU2) \
|
||||||
|
@ -327,6 +333,7 @@
|
||||||
ENABLED(MAKRPANEL) \
|
ENABLED(MAKRPANEL) \
|
||||||
|| ENABLED(CARTESIO_UI) \
|
|| ENABLED(CARTESIO_UI) \
|
||||||
|| ENABLED(VIKI2) \
|
|| ENABLED(VIKI2) \
|
||||||
|
|| ENABLED(AZSMZ_12864) \
|
||||||
|| ENABLED(miniVIKI) \
|
|| ENABLED(miniVIKI) \
|
||||||
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||||
)
|
)
|
||||||
|
|
|
@ -869,9 +869,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
|
* VIKI2, miniVIKI, and AZSMZ_12864 require DOGLCD_SCK and DOGLCD_MOSI to be defined.
|
||||||
*/
|
*/
|
||||||
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
#if ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(AZSMZ_12864)
|
||||||
#ifndef DOGLCD_SCK
|
#ifndef DOGLCD_SCK
|
||||||
#define DOGLCD_SCK SCK_PIN
|
#define DOGLCD_SCK SCK_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1155,6 +1155,7 @@ static_assert(1 >= 0
|
||||||
* miniVIKI => ULTIMAKERCONTROLLER
|
* miniVIKI => ULTIMAKERCONTROLLER
|
||||||
* VIKI2 => ULTIMAKERCONTROLLER
|
* VIKI2 => ULTIMAKERCONTROLLER
|
||||||
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
|
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
|
||||||
|
* AZSMZ_12864 => ULTIMAKERCONTROLLER
|
||||||
* PANEL_ONE => ULTIMAKERCONTROLLER
|
* PANEL_ONE => ULTIMAKERCONTROLLER
|
||||||
*/
|
*/
|
||||||
static_assert(1 >= 0
|
static_assert(1 >= 0
|
||||||
|
@ -1163,6 +1164,7 @@ static_assert(1 >= 0
|
||||||
&& DISABLED(miniVIKI) \
|
&& DISABLED(miniVIKI) \
|
||||||
&& DISABLED(VIKI2) \
|
&& DISABLED(VIKI2) \
|
||||||
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||||
|
&& DISABLED(AZSMZ_12864) \
|
||||||
&& DISABLED(PANEL_ONE) \
|
&& DISABLED(PANEL_ONE) \
|
||||||
&& DISABLED(MKS_12864OLED)
|
&& DISABLED(MKS_12864OLED)
|
||||||
+ 1
|
+ 1
|
||||||
|
@ -1208,6 +1210,9 @@ static_assert(1 >= 0
|
||||||
#if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
#if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
+ 1
|
+ 1
|
||||||
#endif
|
#endif
|
||||||
|
#if ENABLED(AZSMZ_12864)
|
||||||
|
+ 1
|
||||||
|
#endif
|
||||||
#if ENABLED(G3D_PANEL)
|
#if ENABLED(G3D_PANEL)
|
||||||
+ 1
|
+ 1
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -84,30 +84,14 @@
|
||||||
//
|
//
|
||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel (not tested)
|
// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
|
||||||
#if ENABLED(VIKI2)
|
#if ENABLED(AZSMZ_12864)
|
||||||
#undef BEEPER_PIN
|
|
||||||
#define BEEPER_PIN 66
|
#define BEEPER_PIN 66
|
||||||
|
|
||||||
// Pins for DOGM SPI LCD Support
|
|
||||||
#undef DOGLCD_A0
|
|
||||||
#define DOGLCD_A0 59
|
#define DOGLCD_A0 59
|
||||||
|
|
||||||
#undef DOGLCD_A0
|
|
||||||
#define DOGLCD_CS 44
|
#define DOGLCD_CS 44
|
||||||
|
|
||||||
#undef BTN_EN1
|
|
||||||
#define BTN_EN1 58
|
#define BTN_EN1 58
|
||||||
|
|
||||||
#undef BTN_EN2
|
|
||||||
#define BTN_EN2 40
|
#define BTN_EN2 40
|
||||||
|
|
||||||
#undef BTN_ENC
|
|
||||||
#define BTN_ENC 67
|
#define BTN_ENC 67
|
||||||
|
|
||||||
#undef SD_DETECT_PIN
|
|
||||||
#define SD_DETECT_PIN 49 // Pin 49 for display sd interface, 72 for easy adapter board
|
#define SD_DETECT_PIN 49 // Pin 49 for display sd interface, 72 for easy adapter board
|
||||||
|
|
||||||
#undef KILL_PIN
|
|
||||||
#define KILL_PIN 42
|
#define KILL_PIN 42
|
||||||
#endif
|
#endif
|
||||||
|
|
Reference in a new issue