From 2076b545f77b2ce008478343a2daaacc4e0dd02b Mon Sep 17 00:00:00 2001 From: jmdearras Date: Wed, 13 Sep 2017 17:20:43 -0400 Subject: [PATCH 01/29] add 2 displays original CR-10 and MKS Minidisplay --- Marlin/Configuration.h | 17 ++++++++- Marlin/pins_RAMPS.h | 82 +++++++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 21 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 36caf2ecb1a0..7ee9944ef1ff 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1384,6 +1384,14 @@ // //#define MINIPANEL +// MKS Mini Panel with graphic +// controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 +// +#define MKS_MINIPANEL +#if ENABLED(MKS_MINIPANEL) + #define MINIPANEL +#endif + // // RepRapWorld REPRAPWORLD_KEYPAD v1.1 // http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 @@ -1485,7 +1493,14 @@ #define U8GLIB_SH1106 #endif -// +//#define CR10_stockdisplay +#if ENABLED(CR10_stockdisplay) + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #define ST7920_DELAY_1 DELAY_0_NOP + #define ST7920_DELAY_2 DELAY_1_NOP + #define ST7920_DELAY_3 DELAY_2_NOP +#endif + // // CONTROLLER TYPE: Shift register panels // // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 9b18461137ca..1ec2de759411 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -258,6 +258,23 @@ #define LCD_PINS_D6 44 #define LCD_PINS_D7 64 #else +#if ENABLED(CR10_stockdisplay) + #define LCD_PINS_RS 27 //16 + #define LCD_PINS_ENABLE 29 //17 + #define LCD_PINS_D4 25 //23 + #define LCD_PINS_D5 -1 //25 + #define LCD_PINS_D6 -1 //27 + #define LCD_PINS_D7 -1 //29 + #if DISABLED(NEWPANEL) + #define BEEPER_PIN 37 //33 + // Buttons are attached to a shift register + // Not wired yet + //#define SHIFT_CLK 38 + //#define SHIFT_LD 42 + //#define SHIFT_OUT 40 + //#define SHIFT_EN 17 + #endif + #else #define LCD_PINS_RS 16 #define LCD_PINS_ENABLE 17 #define LCD_PINS_D4 23 @@ -273,6 +290,7 @@ //#define SHIFT_OUT 40 //#define SHIFT_EN 17 #endif + #endif #endif #if ENABLED(NEWPANEL) @@ -281,9 +299,15 @@ #define BEEPER_PIN 37 +#if ENABLED(CR10_stockdisplay) + #define BTN_EN1 17 //31 + #define BTN_EN2 23 //33 + #define BTN_ENC 35 //35 +#else #define BTN_EN1 31 #define BTN_EN2 33 #define BTN_ENC 35 +#endif #define SD_DETECT_PIN 49 #define KILL_PIN 41 @@ -350,26 +374,44 @@ #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 #elif ENABLED(MINIPANEL) - #define BEEPER_PIN 42 - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 44 - #define DOGLCD_CS 66 - #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 - #define SDSS 53 + #if ENABLED(MKS_MINIPANEL) + #define BEEPER_PIN 37 //42 + // Pins for DOGM SPI LCD Support + #define DOGLCD_A0 27 //44 + #define DOGLCD_CS 25 //66 + // GLCD features + //#define LCD_CONTRAST 190 + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 + // The encoder and click button + #define BTN_EN1 31 //40 + #define BTN_EN2 33 //63 + #define BTN_ENC 35 //59 - #define KILL_PIN 64 - // GLCD features - //#define LCD_CONTRAST 190 - // Uncomment screen orientation - //#define LCD_SCREEN_ROT_90 - //#define LCD_SCREEN_ROT_180 - //#define LCD_SCREEN_ROT_270 - // The encoder and click button - #define BTN_EN1 40 - #define BTN_EN2 63 - #define BTN_ENC 59 - // not connected to a pin - #define SD_DETECT_PIN 49 + #else + #define BEEPER_PIN 42 + // Pins for DOGM SPI LCD Support + #define DOGLCD_A0 44 + #define DOGLCD_CS 66 + // GLCD features + //#define LCD_CONTRAST 190 + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 + // The encoder and click button + #define BTN_EN1 40 + #define BTN_EN2 63 + #define BTN_ENC 59 + #endif + // not connected to a pin + #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + #define SDSS 53 + + #define KILL_PIN 64 + #define SD_DETECT_PIN 49 #else @@ -404,4 +446,4 @@ #endif #endif // NEWPANEL -#endif // ULTRA_LCD + #endif // ULTRA_LCD From 37eb88ea197d17096f011ec8fd168108dba6f0e0 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 14 Sep 2017 09:20:54 -0400 Subject: [PATCH 02/29] "Standard" Display --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7ee9944ef1ff..073525915910 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1376,7 +1376,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // MakerLab Mini Panel with graphic @@ -1387,7 +1387,7 @@ // MKS Mini Panel with graphic // controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 // -#define MKS_MINIPANEL +//#define MKS_MINIPANEL #if ENABLED(MKS_MINIPANEL) #define MINIPANEL #endif From 27560684188fea7066e1b5e435e6ae845de0a21d Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 14 Sep 2017 11:18:15 -0400 Subject: [PATCH 03/29] Edit CR10_stockdisplay NOPs --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 073525915910..7d633fa990cd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1496,8 +1496,8 @@ //#define CR10_stockdisplay #if ENABLED(CR10_stockdisplay) #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #define ST7920_DELAY_1 DELAY_0_NOP - #define ST7920_DELAY_2 DELAY_1_NOP + #define ST7920_DELAY_1 DELAY_2_NOP + #define ST7920_DELAY_2 DELAY_2_NOP #define ST7920_DELAY_3 DELAY_2_NOP #endif // From dd72bfdd364c7208a0a44391a0a434220843c0d6 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 21 Sep 2017 15:24:50 -0400 Subject: [PATCH 04/29] Added Displays cleanup --- Marlin/Conditionals_LCD.h | 21 ++++++++++++++++++++- Marlin/Configuration.h | 26 ++++++++++---------------- Marlin/Marlin_main.cpp | 12 +++++++++++- Marlin/SanityCheck.h | 2 +- Marlin/pins_RAMPS.h | 15 +++++++++++++++ Marlin/ultralcd_impl_DOGM.h | 6 +++++- 6 files changed, 62 insertions(+), 20 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 171ca09ce083..a5144fa1427d 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -108,7 +108,26 @@ #define ULTIPANEL #define NEWPANEL - #endif + #elif ENABLED(CR10_stockdisplay) + + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #define ST7920_DELAY_1 DELAY_2_NOP + #define ST7920_DELAY_2 DELAY_2_NOP + #define ST7920_DELAY_3 DELAY_2_NOP + + #elif ENABLED (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + + #define U8GLIB_SH1106 + #define REPRAP_DISCOUNT_SMART_CONTROLLER + #define NEWPANEL + #define REVERSE_MENU_DIRECTION + + #elif ENABLED(MKS_MINIPANEL) + + #define MINIPANEL + + #endif + // Generic support for SSD1306 / SH1106 OLED based LCDs. #if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7d633fa990cd..92baf3cb27ce 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -118,7 +118,7 @@ // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_RAMPS_14_EFB + #define MOTHERBOARD BOARD_MKS_BASE #endif // Optional custom name for your RepStrap or other custom machine @@ -1224,7 +1224,7 @@ * you must uncomment the following option or it won't work. * */ -//#define SDSUPPORT +#define SDSUPPORT /** * SD CARD: SPI SPEED @@ -1234,14 +1234,14 @@ */ //#define SPI_SPEED SPI_HALF_SPEED //#define SPI_SPEED SPI_QUARTER_SPEED -//#define SPI_SPEED SPI_EIGHTH_SPEED +#define SPI_SPEED SPI_EIGHTH_SPEED /** * SD CARD: ENABLE CRC * * Use CRC checks and retries on the SD communication. */ -//#define SD_CHECK_AND_RETRY +#define SD_CHECK_AND_RETRY // // ENCODER SETTINGS @@ -1376,7 +1376,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // MakerLab Mini Panel with graphic @@ -1388,9 +1388,6 @@ // controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 // //#define MKS_MINIPANEL -#if ENABLED(MKS_MINIPANEL) - #define MINIPANEL -#endif // // RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -1494,13 +1491,11 @@ #endif //#define CR10_stockdisplay -#if ENABLED(CR10_stockdisplay) - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #define ST7920_DELAY_1 DELAY_2_NOP - #define ST7920_DELAY_2 DELAY_2_NOP - #define ST7920_DELAY_3 DELAY_2_NOP -#endif - // + +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +#define MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER + +// // CONTROLLER TYPE: Shift register panels // // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH @@ -1668,5 +1663,4 @@ // Display filament width on the LCD status line. Status messages will expire after 5 seconds. //#define FILAMENT_LCD_DISPLAY #endif - #endif // CONFIGURATION_H diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1c159c3b4eeb..ff7976c41da5 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -13561,8 +13561,18 @@ void setup() { pe_deactivate_magnet(1); #endif #endif -} + + /*---------------MKS OLED patch_3-----------------------*/ +#if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + pinMode(LCD_PINS_DC, OUTPUT); + pinMode(LCD_PINS_RST, OUTPUT); + digitalWrite(LCD_PINS_RST , LOW); + delay(1000); + digitalWrite(LCD_PINS_RST , HIGH); +#endif +/*---------------MKS OLED patch_3-----------------------*/ +} /** * The main Marlin program loop * diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 87d5a235bb00..b0a000b3504a 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1146,7 +1146,7 @@ static_assert(1 >= 0 static_assert(1 >= 0 #if ENABLED(ULTIMAKERCONTROLLER) \ && DISABLED(SAV_3DGLCD) && DISABLED(miniVIKI) && DISABLED(VIKI2) \ - && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) + && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + 1 #endif #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 1ec2de759411..2bf293c40326 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -129,6 +129,21 @@ #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #endif +/*---------------MKS OLED patch_4-----------------------*/ +#if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + +#ifdef LCD_PINS_D5 +#undef LCD_PINS_D5 +#define LCD_PINS_D5 -1 +#endif +#ifdef LCD_PINS_D6 +#undef LCD_PINS_D6 +#define LCD_PINS_D6 -1 +#endif +#define LCD_PINS_RST 27 +#define LCD_PINS_DC 25 +#endif +/*---------------MKS OLED patch_4-----------------------*/ // // Augmentation for auto-assigning RAMPS plugs // diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 3cbced445fb0..863a74597fda 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -180,9 +180,13 @@ //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #elif ENABLED(U8GLIB_SH1106) + #if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 + #else // Generic support for SH1106 OLED I2C LCDs //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes - U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes + U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes //bunnyhack + #endif #elif ENABLED(MINIPANEL) // The MINIPanel display //U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes From 4dd63f41a3c4b87bf64cd05fc508b89ffab48a85 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 21 Sep 2017 18:27:27 -0400 Subject: [PATCH 05/29] Added 2 line display --- Marlin/Conditionals_LCD.h | 8 +++++++- Marlin/Configuration.h | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index a5144fa1427d..d914caea658b 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -139,7 +139,13 @@ #define ULTIMAKERCONTROLLER #endif - #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI) + #if ENABLED (MAKEBOARD_MINI_2_LINE_DISPLAY_1602) + #define REPRAP_DISCOUNT_SMART_CONTROLLER + #define LCD_WIDTH 16 + #define LCD_HEIGHT 2 + #endif + +#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI) #define DOGLCD #define U8GLIB_ST7920 #define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 92baf3cb27ce..5a44470ca82f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1378,6 +1378,11 @@ // //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller + +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + // // MakerLab Mini Panel with graphic // controller and SD support - http://reprap.org/wiki/Mini_panel From 075e393e0ac435abed5e870022b1edda48376d7c Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 21 Sep 2017 18:43:17 -0400 Subject: [PATCH 06/29] More cleanup --- Marlin/Configuration.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5a44470ca82f..8fbd1f64073e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1364,6 +1364,10 @@ // //#define REPRAP_DISCOUNT_SMART_CONTROLLER +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller + +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + // // GADGETS3D G3D LCD/SD Controller // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel @@ -1378,11 +1382,6 @@ // //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - -// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller - -//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 - // // MakerLab Mini Panel with graphic // controller and SD support - http://reprap.org/wiki/Mini_panel From f44758cd8cea3c66b20f973a9eb4061bd054696d Mon Sep 17 00:00:00 2001 From: Roxy-3D Date: Mon, 2 Oct 2017 16:04:33 -0500 Subject: [PATCH 07/29] The default board needs to be RAMPS_EFB --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8fbd1f64073e..613aa8d93e72 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -118,7 +118,7 @@ // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_BASE + #define MOTHERBOARD BOARD_RAMPS_14_EFB #endif // Optional custom name for your RepStrap or other custom machine From 2346eae03f26e417627c63b5749a6e4fb7dd3015 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 10:04:47 -0400 Subject: [PATCH 08/29] Working on merge issues --- Marlin/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8fbd1f64073e..7586e2b77356 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -771,8 +771,8 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 200 -#define Y_BED_SIZE 200 +#define X_BED_SIZE 300 +#define Y_BED_SIZE 300 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 From 42e3c7a7952ddd0841f12e205b8389403ef97bac Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 10:52:16 -0400 Subject: [PATCH 09/29] more edits --- Marlin/Conditionals_LCD.h | 14 ++++---- Marlin/Configuration.h | 2 +- Marlin/SanityCheck.h | 7 ++-- Marlin/pins_RAMPS.h | 71 ++++++++++++++++--------------------- Marlin/ultralcd_impl_DOGM.h | 6 ++-- 5 files changed, 47 insertions(+), 53 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index d914caea658b..b438c975006b 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -108,24 +108,26 @@ #define ULTIPANEL #define NEWPANEL - #elif ENABLED(CR10_stockdisplay) + #elif ENABLED(CR10_STOCKDISPLAY) - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #ifndef ST7920_DELAY_1 #define ST7920_DELAY_1 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_2 #define ST7920_DELAY_2 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_3 #define ST7920_DELAY_3 DELAY_2_NOP - + #endif #elif ENABLED (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) #define U8GLIB_SH1106 #define REPRAP_DISCOUNT_SMART_CONTROLLER #define NEWPANEL - #define REVERSE_MENU_DIRECTION #elif ENABLED(MKS_MINIPANEL) - #define MINIPANEL - #endif diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1ec1a82a384d..f882d2768521 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1494,7 +1494,7 @@ #define U8GLIB_SH1106 #endif -//#define CR10_stockdisplay +//#define CR10_STOCKDISPLAY // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER #define MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index b0a000b3504a..14e7991be44c 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1149,10 +1149,13 @@ static_assert(1 >= 0 && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) + #if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + + 1 + #endif + #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) + 1 #endif #if ENABLED(LCD_FOR_MELZI) diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 2bf293c40326..3fea7842c105 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -129,21 +129,12 @@ #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #endif -/*---------------MKS OLED patch_4-----------------------*/ -#if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) - -#ifdef LCD_PINS_D5 -#undef LCD_PINS_D5 -#define LCD_PINS_D5 -1 -#endif -#ifdef LCD_PINS_D6 -#undef LCD_PINS_D6 -#define LCD_PINS_D6 -1 -#endif -#define LCD_PINS_RST 27 -#define LCD_PINS_DC 25 +#if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + #define LCD_PINS_D5 -1 + #define LCD_PINS_D6 -1 + #define LCD_PINS_RST 27 + #define LCD_PINS_DC 25 #endif -/*---------------MKS OLED patch_4-----------------------*/ // // Augmentation for auto-assigning RAMPS plugs // @@ -273,15 +264,15 @@ #define LCD_PINS_D6 44 #define LCD_PINS_D7 64 #else -#if ENABLED(CR10_stockdisplay) - #define LCD_PINS_RS 27 //16 - #define LCD_PINS_ENABLE 29 //17 - #define LCD_PINS_D4 25 //23 - #define LCD_PINS_D5 -1 //25 - #define LCD_PINS_D6 -1 //27 - #define LCD_PINS_D7 -1 //29 +#if ENABLED(CR10_STOCKDISPLAY) + #define LCD_PINS_RS 27 + #define LCD_PINS_ENABLE 29 + #define LCD_PINS_D4 25 + #define LCD_PINS_D5 -1 + #define LCD_PINS_D6 -1 + #define LCD_PINS_D7 -1 #if DISABLED(NEWPANEL) - #define BEEPER_PIN 37 //33 + #define BEEPER_PIN 37 // Buttons are attached to a shift register // Not wired yet //#define SHIFT_CLK 38 @@ -314,16 +305,15 @@ #define BEEPER_PIN 37 -#if ENABLED(CR10_stockdisplay) - #define BTN_EN1 17 //31 - #define BTN_EN2 23 //33 - #define BTN_ENC 35 //35 -#else - #define BTN_EN1 31 - #define BTN_EN2 33 - #define BTN_ENC 35 -#endif - + #if ENABLED(CR10_STOCKDISPLAY) + #define BTN_EN1 17 //31 + #define BTN_EN2 23 //33 + #define BTN_ENC 35 //35 + #else + #define BTN_EN1 31 + #define BTN_EN2 33 + #define BTN_ENC 35 + #endif #define SD_DETECT_PIN 49 #define KILL_PIN 41 @@ -390,10 +380,10 @@ #define LCD_BACKLIGHT_PIN 33 #elif ENABLED(MINIPANEL) #if ENABLED(MKS_MINIPANEL) - #define BEEPER_PIN 37 //42 + #define BEEPER_PIN 37 // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 27 //44 - #define DOGLCD_CS 25 //66 + #define DOGLCD_A0 27 + #define DOGLCD_CS 25 // GLCD features //#define LCD_CONTRAST 190 // Uncomment screen orientation @@ -401,11 +391,10 @@ //#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_270 // The encoder and click button - #define BTN_EN1 31 //40 - #define BTN_EN2 33 //63 - #define BTN_ENC 35 //59 - - #else + #define BTN_EN1 31 + #define BTN_EN2 33 + #define BTN_ENC 35 + #else #define BEEPER_PIN 42 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 44 @@ -461,4 +450,4 @@ #endif #endif // NEWPANEL - #endif // ULTRA_LCD +#endif // ULTRA_LCD diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 863a74597fda..455938ede94a 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -180,12 +180,12 @@ //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #elif ENABLED(U8GLIB_SH1106) - #if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) - U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 + #if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 #else // Generic support for SH1106 OLED I2C LCDs //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes - U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes //bunnyhack + U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #endif #elif ENABLED(MINIPANEL) // The MINIPanel display From db378e39fa154c5b11ec7ee72a46b6a07655791a Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 11:04:48 -0400 Subject: [PATCH 10/29] more cleanup, per requests --- Marlin/Configuration.h | 38 +++++++++++++++++++------------------- Marlin/Marlin_main.cpp | 12 ++++-------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f882d2768521..b4de8f6b9704 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -771,8 +771,8 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 300 -#define Y_BED_SIZE 300 +#define X_BED_SIZE 200 +#define Y_BED_SIZE 200 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -1224,7 +1224,7 @@ * you must uncomment the following option or it won't work. * */ -#define SDSUPPORT +//#define SDSUPPORT /** * SD CARD: SPI SPEED @@ -1234,14 +1234,14 @@ */ //#define SPI_SPEED SPI_HALF_SPEED //#define SPI_SPEED SPI_QUARTER_SPEED -#define SPI_SPEED SPI_EIGHTH_SPEED +//#define SPI_SPEED SPI_EIGHTH_SPEED /** * SD CARD: ENABLE CRC * * Use CRC checks and retries on the SD communication. */ -#define SD_CHECK_AND_RETRY +//#define SD_CHECK_AND_RETRY // // ENCODER SETTINGS @@ -1364,10 +1364,6 @@ // //#define REPRAP_DISCOUNT_SMART_CONTROLLER -// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller - -//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 - // // GADGETS3D G3D LCD/SD Controller // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel @@ -1388,11 +1384,6 @@ // //#define MINIPANEL -// MKS Mini Panel with graphic -// controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 -// -//#define MKS_MINIPANEL - // // RepRapWorld REPRAPWORLD_KEYPAD v1.1 // http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 @@ -1494,11 +1485,6 @@ #define U8GLIB_SH1106 #endif -//#define CR10_STOCKDISPLAY - -// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER -#define MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER - // // CONTROLLER TYPE: Shift register panels // @@ -1512,6 +1498,20 @@ // //#define OLED_PANEL_TINYBOY2 +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller + +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// MKS Mini Panel with graphic +// controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 +// +//#define MKS_MINIPANEL +//#define CR10_STOCKDISPLAY + +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +#define MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER + + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ff7976c41da5..1cda1fa6de05 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -13561,17 +13561,13 @@ void setup() { pe_deactivate_magnet(1); #endif #endif - - - /*---------------MKS OLED patch_3-----------------------*/ #if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) - pinMode(LCD_PINS_DC, OUTPUT); - pinMode(LCD_PINS_RST, OUTPUT); - digitalWrite(LCD_PINS_RST , LOW); + SET_OUTPUT(LCD_PINS_DC); + SET_OUTPUT(LCD_PINS_RST); + WRITE(LCD_PINS_RST, LOW); delay(1000); - digitalWrite(LCD_PINS_RST , HIGH); + WRITE(LCD_PINS_RST, HIGH); #endif -/*---------------MKS OLED patch_3-----------------------*/ } /** * The main Marlin program loop From a26cad4aafbc40040f754af932ba0d1eb540a976 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 11:07:24 -0400 Subject: [PATCH 11/29] cleanup --- Marlin/Configuration.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b4de8f6b9704..ecf65603f22d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1667,4 +1667,5 @@ // Display filament width on the LCD status line. Status messages will expire after 5 seconds. //#define FILAMENT_LCD_DISPLAY #endif + #endif // CONFIGURATION_H From 9f90e8a4f0503a4a9f17fc2096554572893e440a Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 12:18:10 -0400 Subject: [PATCH 12/29] Display name changes to match reprap and descriptions added per the standard, --- Marlin/Conditionals_LCD.h | 4 ++-- Marlin/Configuration.h | 28 ++++++++++++++++++++++------ Marlin/Marlin_main.cpp | 2 +- Marlin/SanityCheck.h | 6 +++--- Marlin/pins_RAMPS.h | 4 ++-- Marlin/ultralcd_impl_DOGM.h | 2 +- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index b438c975006b..d7fa5b2e050d 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -120,13 +120,13 @@ #ifndef ST7920_DELAY_3 #define ST7920_DELAY_3 DELAY_2_NOP #endif - #elif ENABLED (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + #elif ENABLED (MKS_12864OLED) #define U8GLIB_SH1106 #define REPRAP_DISCOUNT_SMART_CONTROLLER #define NEWPANEL - #elif ENABLED(MKS_MINIPANEL) + #elif ENABLED(MKS_MINI_12864) #define MINIPANEL #endif diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ecf65603f22d..354d4b1064ed 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1498,19 +1498,35 @@ // //#define OLED_PANEL_TINYBOY2 +// // Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller - +// +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// 2 line display. +// //#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 -// MKS Mini Panel with graphic -// controller and SD support - https://www.aliexpress.com/item/3d-printer-Reprap-LCD-MKS-MINI12864LCD-mini-12864-smart-display-Reprapdiscount-controller-Full-Graphic-for-mother/32808856549.html?spm=a2g0s.9042311.0.0.T02Q88 // -//#define MKS_MINIPANEL +// MKS Mini Panel with graphic controller and SD support +// +//http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// +// this is a ramps-compatible version for CR-10 owners who want to replace the Creality board, but retain the display +// //#define CR10_STOCKDISPLAY // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER -#define MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER - +// +//http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED //============================================================================= //=============================== Extra Features ============================== diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1cda1fa6de05..0f100ee37c4e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -13561,7 +13561,7 @@ void setup() { pe_deactivate_magnet(1); #endif #endif -#if defined (MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) +#if defined (MKS_12864OLED) SET_OUTPUT(LCD_PINS_DC); SET_OUTPUT(LCD_PINS_RST); WRITE(LCD_PINS_RST, LOW); diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 14e7991be44c..c1632c9d2b3c 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1146,13 +1146,13 @@ static_assert(1 >= 0 static_assert(1 >= 0 #if ENABLED(ULTIMAKERCONTROLLER) \ && DISABLED(SAV_3DGLCD) && DISABLED(miniVIKI) && DISABLED(VIKI2) \ - && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + #if ENABLED(MKS_12864OLED) + 1 #endif #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 3fea7842c105..edf44d2e3ebe 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -129,7 +129,7 @@ #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #endif -#if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) +#if ENABLED(MKS_12864OLED) #define LCD_PINS_D5 -1 #define LCD_PINS_D6 -1 #define LCD_PINS_RST 27 @@ -379,7 +379,7 @@ #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 #elif ENABLED(MINIPANEL) - #if ENABLED(MKS_MINIPANEL) + #if ENABLED(MKS_MINI_12864) #define BEEPER_PIN 37 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 27 diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 455938ede94a..ea45282014dd 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -180,7 +180,7 @@ //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #elif ENABLED(U8GLIB_SH1106) - #if ENABLED(MKS_OLED13_128x64_FULL_GRAPHICS_CONTROLLER) + #if ENABLED(MKS_12864OLED) U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 #else // Generic support for SH1106 OLED I2C LCDs From a68d68ac4c920d4d3f44d4bc45e796e9799459fb Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 12:41:28 -0400 Subject: [PATCH 13/29] sorry for the many commits Just easier to see on the github site --- Marlin/Configuration.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 354d4b1064ed..a3b67536949c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1502,6 +1502,7 @@ // Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller // // https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// // 2 line display. // //#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 @@ -1511,6 +1512,9 @@ // //http://reprap.org/wiki/MKS_MINI_12864 // +// Be aware that MKS/makebase/makeboard install the EXP1 and EXP1 headers reversed on all their products. +// Flipping the socket housing or cutting the cable's key may be needed when mixing brands. +// //#define MKS_MINI_12864 // From 96800aef4940fd621c73b4fb5923afc20e609c89 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 17:05:40 -0400 Subject: [PATCH 14/29] SanityCheck conflict fix Oops! --- Marlin/SanityCheck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index c1632c9d2b3c..841a6948f725 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1149,7 +1149,7 @@ static_assert(1 >= 0 && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_12864OLED) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI) && DISABLED(MKS_12864OLED) + 1 #endif #if ENABLED(MKS_12864OLED) From 2980dc5d6f216ef6d43e1a6a511a3dfeece9900b Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 17:18:59 -0400 Subject: [PATCH 15/29] sanitycheck.h added comment to display counter, --- Marlin/SanityCheck.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 841a6948f725..e538f29a33f7 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1138,6 +1138,7 @@ static_assert(1 >= 0 * Note: BQ_LCD_SMART_CONTROLLER => REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER * SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER + * MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER * miniVIKI => ULTIMAKERCONTROLLER * VIKI2 => ULTIMAKERCONTROLLER * ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER From f6cffaf9a0248d5dc075d0227ed42f6ebff32e88 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 20:54:40 -0400 Subject: [PATCH 16/29] comment correction --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a3b67536949c..01fcb202b61a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1512,7 +1512,7 @@ // //http://reprap.org/wiki/MKS_MINI_12864 // -// Be aware that MKS/makebase/makeboard install the EXP1 and EXP1 headers reversed on all their products. +// Be aware that MKS/makebase/makeboard install the 8 pin EXP1 and EXP2 headers reversed on all their products. // Flipping the socket housing or cutting the cable's key may be needed when mixing brands. // //#define MKS_MINI_12864 From f77ff2765ba47a3d570f6cbe4ac2deb3a58cae48 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Thu, 5 Oct 2017 21:20:22 -0400 Subject: [PATCH 17/29] Remove WIP comments --- Marlin/pins_RAMPS.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index edf44d2e3ebe..b15495020a34 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -306,9 +306,9 @@ #define BEEPER_PIN 37 #if ENABLED(CR10_STOCKDISPLAY) - #define BTN_EN1 17 //31 - #define BTN_EN2 23 //33 - #define BTN_ENC 35 //35 + #define BTN_EN1 17 + #define BTN_EN2 23 + #define BTN_ENC 35 #else #define BTN_EN1 31 #define BTN_EN2 33 From 46c72c00978983febead8b5b528bea676ba01480 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 09:24:32 -0400 Subject: [PATCH 18/29] working on sanitycheck.h conflict --- Marlin/SanityCheck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index e538f29a33f7..8b088f99d85e 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1150,7 +1150,7 @@ static_assert(1 >= 0 && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI) && DISABLED(MKS_12864OLED) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_12864OLED) + 1 #endif #if ENABLED(MKS_12864OLED) From 068d805932f234025051d75fde1686c52b030e2b Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 10:57:49 -0400 Subject: [PATCH 19/29] another try to fix conflict --- Marlin/SanityCheck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 8b088f99d85e..e538f29a33f7 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1150,7 +1150,7 @@ static_assert(1 >= 0 && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(MKS_12864OLED) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI) && DISABLED(MKS_12864OLED) + 1 #endif #if ENABLED(MKS_12864OLED) From 4836971533f832682399a5fd4e6730ca07fb73a9 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 11:18:57 -0400 Subject: [PATCH 20/29] fix pins-ramps indents and if then. --- Marlin/SanityCheck.h | 4 +-- Marlin/pins_RAMPS.h | 76 +++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index e538f29a33f7..bad5ef9a896a 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -1154,8 +1154,8 @@ static_assert(1 >= 0 + 1 #endif #if ENABLED(MKS_12864OLED) - + 1 - #endif + + 1 + #endif #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) + 1 #endif diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index b15495020a34..ef144de90eab 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -379,43 +379,45 @@ #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 #elif ENABLED(MINIPANEL) - #if ENABLED(MKS_MINI_12864) - #define BEEPER_PIN 37 - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 27 - #define DOGLCD_CS 25 - // GLCD features - //#define LCD_CONTRAST 190 - // Uncomment screen orientation - //#define LCD_SCREEN_ROT_90 - //#define LCD_SCREEN_ROT_180 - //#define LCD_SCREEN_ROT_270 - // The encoder and click button - #define BTN_EN1 31 - #define BTN_EN2 33 - #define BTN_ENC 35 - #else - #define BEEPER_PIN 42 - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 44 - #define DOGLCD_CS 66 - // GLCD features - //#define LCD_CONTRAST 190 - // Uncomment screen orientation - //#define LCD_SCREEN_ROT_90 - //#define LCD_SCREEN_ROT_180 - //#define LCD_SCREEN_ROT_270 - // The encoder and click button - #define BTN_EN1 40 - #define BTN_EN2 63 - #define BTN_ENC 59 - #endif - // not connected to a pin - #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 - #define SDSS 53 - - #define KILL_PIN 64 - #define SD_DETECT_PIN 49 + #define BEEPER_PIN 42 + // Pins for DOGM SPI LCD Support + #define DOGLCD_A0 44 + #define DOGLCD_CS 66 + // GLCD features + //#define LCD_CONTRAST 190 + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 + // The encoder and click button + #define BTN_EN1 40 + #define BTN_EN2 63 + #define BTN_ENC 59 + // not connected to a pin + #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + #define SDSS 53 + #define KILL_PIN 64 + #define SD_DETECT_PIN 49 + #elif ENABLED(MKS_MINI_12864) + #define BEEPER_PIN 37 + // Pins for DOGM SPI LCD Support + #define DOGLCD_A0 27 + #define DOGLCD_CS 25 + // GLCD features + //#define LCD_CONTRAST 190 + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 + // The encoder and click button + #define BTN_EN1 31 + #define BTN_EN2 33 + #define BTN_ENC 35 + // not connected to a pin + #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + #define SDSS 53 + #define KILL_PIN 64 + #define SD_DETECT_PIN 49 #else From 5013e7dc15a1b3931fa06d3e17d38ef77b5cc293 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 11:23:33 -0400 Subject: [PATCH 21/29] removed ifndef statements The ones I was told to add earlier. :-\ --- Marlin/Conditionals_LCD.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index d7fa5b2e050d..5f120faa7c3b 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -110,17 +110,11 @@ #elif ENABLED(CR10_STOCKDISPLAY) - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #ifndef ST7920_DELAY_1 + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER #define ST7920_DELAY_1 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_2 #define ST7920_DELAY_2 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_3 #define ST7920_DELAY_3 DELAY_2_NOP - #endif - #elif ENABLED (MKS_12864OLED) + #elif ENABLED (MKS_12864OLED) #define U8GLIB_SH1106 #define REPRAP_DISCOUNT_SMART_CONTROLLER From 122f5aac669763d0773336c78114dd6aa99a4cd7 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 11:27:04 -0400 Subject: [PATCH 22/29] removed comment --- Marlin/Configuration.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 01fcb202b61a..25ff59fc837f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1512,8 +1512,6 @@ // //http://reprap.org/wiki/MKS_MINI_12864 // -// Be aware that MKS/makebase/makeboard install the 8 pin EXP1 and EXP2 headers reversed on all their products. -// Flipping the socket housing or cutting the cable's key may be needed when mixing brands. // //#define MKS_MINI_12864 From c84c5378f303882671603339003d169a06348961 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 11:35:13 -0400 Subject: [PATCH 23/29] display selections cleanup --- Marlin/Configuration.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 25ff59fc837f..27653c680e70 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1500,7 +1500,6 @@ // // Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller -// // https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html // // 2 line display. @@ -1509,22 +1508,22 @@ // // MKS Mini Panel with graphic controller and SD support -// -//http://reprap.org/wiki/MKS_MINI_12864 +// http://reprap.org/wiki/MKS_MINI_12864 // // //#define MKS_MINI_12864 // // Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html // -// this is a ramps-compatible version for CR-10 owners who want to replace the Creality board, but retain the display +// this is a ramps-compatible version for CR-10 owners who want to replace the Melzi Creality board, but retain the display // //#define CR10_STOCKDISPLAY -// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER // -//http://reprap.org/wiki/MKS_12864OLED +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED // // Tiny, but very sharp OLED display // From ba55ef2e5d87ac366c0861b50c2cfb0d16ba46fc Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 14:47:19 -0400 Subject: [PATCH 24/29] more display cleanup --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 27653c680e70..1de121a9f7ad 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1507,7 +1507,7 @@ //#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 // -// MKS Mini Panel with graphic controller and SD support +// MKS MINI12864 with graphic controller and SD support // http://reprap.org/wiki/MKS_MINI_12864 // // From 6a96b3a5a05412080863b66a3e42b12ff363b103 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 14:56:17 -0400 Subject: [PATCH 25/29] reverting a revertion. --- Marlin/Conditionals_LCD.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 5f120faa7c3b..c5c09572236f 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -111,10 +111,17 @@ #elif ENABLED(CR10_STOCKDISPLAY) #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #define ST7920_DELAY_1 DELAY_2_NOP - #define ST7920_DELAY_2 DELAY_2_NOP - #define ST7920_DELAY_3 DELAY_2_NOP - #elif ENABLED (MKS_12864OLED) + #ifndef ST7920_DELAY_1 + #define ST7920_DELAY_1 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_2 + #define ST7920_DELAY_2 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_3 + #define ST7920_DELAY_3 DELAY_2_NOP + #endif + + #elif ENABLED (MKS_12864OLED) #define U8GLIB_SH1106 #define REPRAP_DISCOUNT_SMART_CONTROLLER From 9bc8c05b931b3a0ab22d7b5a5060c3809bfad0ae Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 15:47:41 -0400 Subject: [PATCH 26/29] display description addition --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1de121a9f7ad..018cca172db0 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1517,7 +1517,7 @@ // Factory display for Creality CR-10 // https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html // -// this is a ramps-compatible version for CR-10 owners who want to replace the Melzi Creality board, but retain the display +// this is a a RAMPS-compaitible version, but with a single 10-pin connector instead of 2, for CR-10 owners who want to replace the Melzi Creality board, but retain the display // //#define CR10_STOCKDISPLAY From faa1db8829ec31c9fc12de8f383733261d62d778 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 19:08:41 -0400 Subject: [PATCH 27/29] MKS_12864OLED cleanup Works Not sure about the reset I removed in marlin_main, but the display seems to work fine without it. --- Marlin/Marlin_main.cpp | 2 ++ Marlin/pins_RAMPS.h | 2 +- Marlin/ultralcd_impl_DOGM.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 0f100ee37c4e..dad4acfc047d 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -13561,6 +13561,7 @@ void setup() { pe_deactivate_magnet(1); #endif #endif + /* #if defined (MKS_12864OLED) SET_OUTPUT(LCD_PINS_DC); SET_OUTPUT(LCD_PINS_RST); @@ -13568,6 +13569,7 @@ void setup() { delay(1000); WRITE(LCD_PINS_RST, HIGH); #endif +*/ } /** * The main Marlin program loop diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index ef144de90eab..adff4df2f10d 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -132,7 +132,7 @@ #if ENABLED(MKS_12864OLED) #define LCD_PINS_D5 -1 #define LCD_PINS_D6 -1 - #define LCD_PINS_RST 27 + #define LCD_PINS_RS 27 #define LCD_PINS_DC 25 #endif // diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index ea45282014dd..1bcc287ae5dc 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -181,7 +181,8 @@ U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #elif ENABLED(U8GLIB_SH1106) #if ENABLED(MKS_12864OLED) - U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 + // U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 + U8GLIB_SH1106_128X64 u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS, LCD_PINS_DC); #else // Generic support for SH1106 OLED I2C LCDs //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes From 29e35d8daaee9e6bf82c36e6e79f42901d767a08 Mon Sep 17 00:00:00 2001 From: jmdearras Date: Fri, 6 Oct 2017 20:59:45 -0400 Subject: [PATCH 28/29] encoder stuff?? --- Marlin/Conditionals_LCD.h | 63 ++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 8bc5e7d58e0c..d7fa5b2e050d 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -110,17 +110,16 @@ #elif ENABLED(CR10_STOCKDISPLAY) - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #ifndef ST7920_DELAY_1 - #define ST7920_DELAY_1 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_2 - #define ST7920_DELAY_2 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_3 - #define ST7920_DELAY_3 DELAY_2_NOP - #endif - + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #ifndef ST7920_DELAY_1 + #define ST7920_DELAY_1 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_2 + #define ST7920_DELAY_2 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_3 + #define ST7920_DELAY_3 DELAY_2_NOP + #endif #elif ENABLED (MKS_12864OLED) #define U8GLIB_SH1106 @@ -211,35 +210,23 @@ #define ENCODER_FEEDRATE_DEADZONE 4 - #define STD_ENCODER_PULSES_PER_STEP 1 - #define STD_ENCODER_STEPS_PER_MENU_ITEM 2 - - #elif ENABLED(G3D_PANEL) - - #define STD_ENCODER_PULSES_PER_STEP 2 - #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 - - #elif ENABLED(miniVIKI) || ENABLED(VIKI2) \ - || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ - || ENABLED(OLED_PANEL_TINYBOY2) \ - || ENABLED(BQ_LCD_SMART_CONTROLLER) \ - || ENABLED(LCD_I2C_PANELOLU2) \ - || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) - #define STD_ENCODER_PULSES_PER_STEP 4 - #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 + #ifndef ENCODER_PULSES_PER_STEP + #define ENCODER_PULSES_PER_STEP 1 + #endif + #ifndef ENCODER_STEPS_PER_MENU_ITEM + #define ENCODER_STEPS_PER_MENU_ITEM 2 + #endif #endif - #ifndef STD_ENCODER_PULSES_PER_STEP - #define STD_ENCODER_PULSES_PER_STEP 5 - #endif - #ifndef STD_ENCODER_STEPS_PER_MENU_ITEM - #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 - #endif - #ifndef ENCODER_PULSES_PER_STEP - #define ENCODER_PULSES_PER_STEP STD_ENCODER_PULSES_PER_STEP - #endif - #ifndef ENCODER_STEPS_PER_MENU_ITEM - #define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM + // Set encoder detents for well-known controllers + #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(OLED_PANEL_TINYBOY2) \ + || ENABLED(BQ_LCD_SMART_CONTROLLER) || ENABLED(LCD_I2C_PANELOLU2) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #ifndef ENCODER_PULSES_PER_STEP + #define ENCODER_PULSES_PER_STEP 4 + #endif + #ifndef ENCODER_STEPS_PER_MENU_ITEM + #define ENCODER_STEPS_PER_MENU_ITEM 1 + #endif #endif // Shift register panels From 77b78e192c45da5fcba66a72e8791392ea6d6d8f Mon Sep 17 00:00:00 2001 From: jmdearras Date: Mon, 9 Oct 2017 10:21:35 -0400 Subject: [PATCH 29/29] update all --- Marlin/Conditionals_LCD.h | 125 ++++++----- Marlin/Configuration.h | 16 +- Marlin/Marlin_main.cpp | 18 +- Marlin/SanityCheck.h | 53 +++-- Marlin/cardreader.h | 4 +- .../AlephObjects/TAZ4/Configuration.h | 29 +++ .../AliExpress/CL-260/Configuration.h | 29 +++ .../Anet/A6/Configuration.h | 29 +++ .../Anet/A8/Configuration.h | 29 +++ .../BQ/Hephestos/Configuration.h | 29 +++ .../BQ/Hephestos_2/Configuration.h | 29 +++ .../BQ/WITBOX/Configuration.h | 29 +++ .../Cartesio/Configuration.h | 29 +++ .../Creality/CR-10/Configuration.h | 31 ++- .../Felix/Configuration.h | 29 +++ .../Felix/DUAL/Configuration.h | 29 +++ .../Folger Tech/i3-2020/Configuration.h | 29 +++ .../Geeetech/GT2560/Configuration.h | 29 +++ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 29 +++ .../Infitary/i3-M508/Configuration.h | 29 +++ .../Malyan/M150/Configuration.h | 29 +++ .../RepRapWorld/Megatronics/Configuration.h | 29 +++ .../RigidBot/Configuration.h | 29 +++ .../SCARA/Configuration.h | 29 +++ .../Sanguinololu/Configuration.h | 29 +++ .../Velleman/K8200/Configuration.h | 29 +++ .../Velleman/K8400/Configuration.h | 29 +++ .../Velleman/K8400/Dual-head/Configuration.h | 29 +++ .../adafruit/ST7565/Configuration.h | 29 +++ .../FLSUN/auto_calibrate/Configuration.h | 29 +++ .../delta/FLSUN/kossel_mini/Configuration.h | 29 +++ .../delta/generic/Configuration.h | 29 +++ .../delta/kossel_mini/Configuration.h | 29 +++ .../delta/kossel_pro/Configuration.h | 29 +++ .../delta/kossel_xl/Configuration.h | 29 +++ .../gCreate/gMax1.5+/Configuration.h | 29 +++ .../makibox/Configuration.h | 29 +++ .../tvrrug/Round2/Configuration.h | 29 +++ .../wt150/Configuration.h | 29 +++ Marlin/pins_RAMPS.h | 206 ++++++++++-------- Marlin/ultralcd_impl_DOGM.h | 17 +- Marlin/ultralcd_impl_HD44780.h | 7 +- 42 files changed, 1233 insertions(+), 201 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index d7fa5b2e050d..937974d560d6 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -34,18 +34,10 @@ #define DOGLCD #define ULTIPANEL - #define NEWPANEL #define DEFAULT_LCD_CONTRAST 90 #define LCD_CONTRAST_MIN 60 #define LCD_CONTRAST_MAX 140 - #elif ENABLED(MAKRPANEL) || ENABLED(MINIPANEL) - - #define DOGLCD - #define ULTIPANEL - #define NEWPANEL - #define DEFAULT_LCD_CONTRAST 17 - #elif ENABLED(ANET_KEYPAD_LCD) #define REPRAPWORLD_KEYPAD @@ -53,7 +45,9 @@ #define ADC_KEYPAD #define ADC_KEY_NUM 8 #define ULTIPANEL + // this helps to implement ADC_KEYPAD menus + #define ENCODER_PULSES_PER_STEP 1 #define ENCODER_STEPS_PER_MENU_ITEM 1 #define REVERSE_MENU_DIRECTION @@ -90,7 +84,6 @@ #define U8GLIB_SSD1306 #define ULTIPANEL - #define NEWPANEL #define REVERSE_ENCODER_DIRECTION #define REVERSE_MENU_DIRECTION @@ -99,37 +92,42 @@ #define LCD_I2C_TYPE_PCA8574 #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander #define ULTIPANEL - #define NEWPANEL #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #define DOGLCD #define U8GLIB_ST7920 #define ULTIPANEL - #define NEWPANEL #elif ENABLED(CR10_STOCKDISPLAY) - - #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - #ifndef ST7920_DELAY_1 - #define ST7920_DELAY_1 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_2 - #define ST7920_DELAY_2 DELAY_2_NOP - #endif - #ifndef ST7920_DELAY_3 - #define ST7920_DELAY_3 DELAY_2_NOP - #endif - #elif ENABLED (MKS_12864OLED) - - #define U8GLIB_SH1106 - #define REPRAP_DISCOUNT_SMART_CONTROLLER - #define NEWPANEL + + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #ifndef ST7920_DELAY_1 + #define ST7920_DELAY_1 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_2 + #define ST7920_DELAY_2 DELAY_2_NOP + #endif + #ifndef ST7920_DELAY_3 + #define ST7920_DELAY_3 DELAY_2_NOP + #endif + + #elif ENABLED(MKS_12864OLED) + + #define REPRAP_DISCOUNT_SMART_CONTROLLER + #define U8GLIB_SH1106 #elif ENABLED(MKS_MINI_12864) + #define MINIPANEL - #endif + #endif + + #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL) + #define DOGLCD + #define ULTIPANEL + #define DEFAULT_LCD_CONTRAST 17 + #endif // Generic support for SSD1306 / SH1106 OLED based LCDs. #if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106) @@ -138,16 +136,18 @@ #endif #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106) + #define ULTIMAKERCONTROLLER - #endif - #if ENABLED (MAKEBOARD_MINI_2_LINE_DISPLAY_1602) + #elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) + #define REPRAP_DISCOUNT_SMART_CONTROLLER #define LCD_WIDTH 16 #define LCD_HEIGHT 2 + #endif -#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI) + #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI) #define DOGLCD #define U8GLIB_ST7920 #define REPRAP_DISCOUNT_SMART_CONTROLLER @@ -158,7 +158,6 @@ || ENABLED(G3D_PANEL) \ || ENABLED(RIGIDBOT_PANEL) #define ULTIPANEL - #define NEWPANEL #endif #if ENABLED(REPRAPWORLD_KEYPAD) @@ -180,7 +179,6 @@ #define LCD_I2C_TYPE_PCF8575 #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander #define ULTIPANEL - #define NEWPANEL #elif ENABLED(LCD_I2C_PANELOLU2) @@ -190,7 +188,6 @@ #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD #define ULTIPANEL - #define NEWPANEL #elif ENABLED(LCD_I2C_VIKI) @@ -206,27 +203,38 @@ #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later) #define ULTIPANEL - #define NEWPANEL #define ENCODER_FEEDRATE_DEADZONE 4 - #ifndef ENCODER_PULSES_PER_STEP - #define ENCODER_PULSES_PER_STEP 1 - #endif - #ifndef ENCODER_STEPS_PER_MENU_ITEM - #define ENCODER_STEPS_PER_MENU_ITEM 2 - #endif + #define STD_ENCODER_PULSES_PER_STEP 1 + #define STD_ENCODER_STEPS_PER_MENU_ITEM 2 + + #elif ENABLED(G3D_PANEL) + + #define STD_ENCODER_PULSES_PER_STEP 2 + #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 + + #elif ENABLED(miniVIKI) || ENABLED(VIKI2) \ + || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ + || ENABLED(OLED_PANEL_TINYBOY2) \ + || ENABLED(BQ_LCD_SMART_CONTROLLER) \ + || ENABLED(LCD_I2C_PANELOLU2) \ + || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #define STD_ENCODER_PULSES_PER_STEP 4 + #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 #endif - // Set encoder detents for well-known controllers - #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(OLED_PANEL_TINYBOY2) \ - || ENABLED(BQ_LCD_SMART_CONTROLLER) || ENABLED(LCD_I2C_PANELOLU2) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) - #ifndef ENCODER_PULSES_PER_STEP - #define ENCODER_PULSES_PER_STEP 4 - #endif - #ifndef ENCODER_STEPS_PER_MENU_ITEM - #define ENCODER_STEPS_PER_MENU_ITEM 1 - #endif + #ifndef STD_ENCODER_PULSES_PER_STEP + #define STD_ENCODER_PULSES_PER_STEP 5 + #endif + #ifndef STD_ENCODER_STEPS_PER_MENU_ITEM + #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 + #endif + #ifndef ENCODER_PULSES_PER_STEP + #define ENCODER_PULSES_PER_STEP STD_ENCODER_PULSES_PER_STEP + #endif + #ifndef ENCODER_STEPS_PER_MENU_ITEM + #define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM #endif // Shift register panels @@ -237,7 +245,6 @@ #if ENABLED(SAV_3DLCD) #define SR_LCD_2W_NL // Non latching 2 wire shift register #define ULTIPANEL - #define NEWPANEL #endif #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display @@ -250,7 +257,7 @@ #endif #if ENABLED(ULTIPANEL) - #define NEWPANEL //enable this if you have a click-encoder panel + #define NEWPANEL // Disable this if you actually have no click-encoder panel #define ULTRA_LCD #ifndef LCD_WIDTH #define LCD_WIDTH 20 @@ -258,14 +265,12 @@ #ifndef LCD_HEIGHT #define LCD_HEIGHT 4 #endif - #else // no panel but just LCD - #if ENABLED(ULTRA_LCD) - #ifndef LCD_WIDTH - #define LCD_WIDTH 16 - #endif - #ifndef LCD_HEIGHT - #define LCD_HEIGHT 2 - #endif + #elif ENABLED(ULTRA_LCD) // no panel but just LCD + #ifndef LCD_WIDTH + #define LCD_WIDTH 16 + #endif + #ifndef LCD_HEIGHT + #define LCD_HEIGHT 2 #endif #endif diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 171f92d9a7dc..b45785c030dd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1507,32 +1507,30 @@ // Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller // https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html // -// 2 line display. -// //#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 // -// MKS MINI12864 with graphic controller and SD support +// MKS MINI12864 with graphic controller and SD support // http://reprap.org/wiki/MKS_MINI_12864 // -// //#define MKS_MINI_12864 // -// Factory display for Creality CR-10 +// Factory display for Creality CR-10 // https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html // -// this is a a RAMPS-compaitible version, but with a single 10-pin connector instead of 2, for CR-10 owners who want to replace the Melzi Creality board, but retain the display -// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// //#define CR10_STOCKDISPLAY // -// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER // http://reprap.org/wiki/MKS_12864OLED // // Tiny, but very sharp OLED display // -//#define MKS_12864OLED +#define MKS_12864OLED //============================================================================= //=============================== Extra Features ============================== diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 984d35c05f47..cc91fd9f0fdd 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -13583,16 +13583,14 @@ void setup() { pe_deactivate_magnet(1); #endif #endif - /* -#if defined (MKS_12864OLED) - SET_OUTPUT(LCD_PINS_DC); - SET_OUTPUT(LCD_PINS_RST); - WRITE(LCD_PINS_RST, LOW); - delay(1000); - WRITE(LCD_PINS_RST, HIGH); -#endif -*/ -} + #if ENABLED(MKS_12864OLED) + SET_OUTPUT(LCD_PINS_DC); + OUT_WRITE(LCD_PINS_RS, LOW); + delay(1000); + WRITE(LCD_PINS_RS, HIGH); + #endif +} + /** * The main Marlin program loop * diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index bad5ef9a896a..2bd786cfdae5 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -959,28 +959,28 @@ static_assert(1 >= 0 #error "TEMP_4_PIN not defined for this board." #endif #elif TEMP_SENSOR_4 != 0 - #error "TEMP_SENSOR_4 shouldn't be set with only 4 extruders." + #error "TEMP_SENSOR_4 shouldn't be set with only 4 HOTENDS." #endif #elif TEMP_SENSOR_3 != 0 - #error "TEMP_SENSOR_3 shouldn't be set with only 3 extruders." + #error "TEMP_SENSOR_3 shouldn't be set with only 3 HOTENDS." #elif TEMP_SENSOR_4 != 0 - #error "TEMP_SENSOR_4 shouldn't be set with only 3 extruders." + #error "TEMP_SENSOR_4 shouldn't be set with only 3 HOTENDS." #endif #elif TEMP_SENSOR_2 != 0 - #error "TEMP_SENSOR_2 shouldn't be set with only 2 extruders." + #error "TEMP_SENSOR_2 shouldn't be set with only 2 HOTENDS." #elif TEMP_SENSOR_3 != 0 - #error "TEMP_SENSOR_3 shouldn't be set with only 2 extruders." + #error "TEMP_SENSOR_3 shouldn't be set with only 2 HOTENDS." #elif TEMP_SENSOR_4 != 0 - #error "TEMP_SENSOR_4 shouldn't be set with only 2 extruders." + #error "TEMP_SENSOR_4 shouldn't be set with only 2 HOTENDS." #endif #elif TEMP_SENSOR_1 != 0 && DISABLED(TEMP_SENSOR_1_AS_REDUNDANT) - #error "TEMP_SENSOR_1 shouldn't be set with only 1 extruder." + #error "TEMP_SENSOR_1 shouldn't be set with only 1 HOTEND." #elif TEMP_SENSOR_2 != 0 - #error "TEMP_SENSOR_2 shouldn't be set with only 1 extruder." + #error "TEMP_SENSOR_2 shouldn't be set with only 1 HOTEND." #elif TEMP_SENSOR_3 != 0 - #error "TEMP_SENSOR_3 shouldn't be set with only 1 extruder." + #error "TEMP_SENSOR_3 shouldn't be set with only 1 HOTEND." #elif TEMP_SENSOR_4 != 0 - #error "TEMP_SENSOR_4 shouldn't be set with only 1 extruder." + #error "TEMP_SENSOR_4 shouldn't be set with only 1 HOTEND." #endif #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) && TEMP_SENSOR_1 == 0 @@ -1146,20 +1146,32 @@ static_assert(1 >= 0 */ static_assert(1 >= 0 #if ENABLED(ULTIMAKERCONTROLLER) \ - && DISABLED(SAV_3DGLCD) && DISABLED(miniVIKI) && DISABLED(VIKI2) \ - && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE) && DISABLED(MKS_12864OLED) + && DISABLED(SAV_3DGLCD) \ + && DISABLED(miniVIKI) \ + && DISABLED(VIKI2) \ + && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \ + && DISABLED(PANEL_ONE) \ + && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI) && DISABLED(MKS_12864OLED) + #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \ + && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \ + && DISABLED(LCD_FOR_MELZI) \ + && DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) + && DISABLED(MKS_12864OLED) + 1 #endif - #if ENABLED(MKS_12864OLED) + #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \ + && DISABLED(BQ_LCD_SMART_CONTROLLER) + 1 #endif - #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) + #if ENABLED(LCD_FOR_MELZI) + 1 #endif - #if ENABLED(LCD_FOR_MELZI) + #if ENABLED(MKS_12864OLED) + + 1 + #endif + #if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) + 1 #endif #if ENABLED(CARTESIO_UI) @@ -1186,10 +1198,15 @@ static_assert(1 >= 0 #if ENABLED(G3D_PANEL) + 1 #endif - #if ENABLED(MINIPANEL) + #if ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864) + + 1 + #endif + #if ENABLED(MKS_MINI_12864) + 1 #endif - #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) && DISABLED(ANET_KEYPAD_LCD) + #if ENABLED(REPRAPWORLD_KEYPAD) \ + && DISABLED(CARTESIO_UI) \ + && DISABLED(ANET_KEYPAD_LCD) + 1 #endif #if ENABLED(RIGIDBOT_PANEL) diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h index c9bea6036b4f..75674a8e5996 100644 --- a/Marlin/cardreader.h +++ b/Marlin/cardreader.h @@ -120,10 +120,10 @@ class CardReader { char **sortshort, **sortnames; #else char sortshort[SDSORT_LIMIT][FILENAME_LENGTH]; - char sortnames[SDSORT_LIMIT][FILENAME_LENGTH]; + char sortnames[SDSORT_LIMIT][LONG_FILENAME_LENGTH]; #endif #elif DISABLED(SDSORT_USES_STACK) - char sortnames[SDSORT_LIMIT][FILENAME_LENGTH]; + char sortnames[SDSORT_LIMIT][LONG_FILENAME_LENGTH]; #endif // Folder sorting uses an isDir array when caching items. diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h index 82200bd9c79c..8ebc786e80bd 100644 --- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h @@ -1523,6 +1523,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/AliExpress/CL-260/Configuration.h b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h index c08e5428010c..0332358652de 100644 --- a/Marlin/example_configurations/AliExpress/CL-260/Configuration.h +++ b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Anet/A6/Configuration.h b/Marlin/example_configurations/Anet/A6/Configuration.h index 61b514c4fd04..32bfa88e7b31 100644 --- a/Marlin/example_configurations/Anet/A6/Configuration.h +++ b/Marlin/example_configurations/Anet/A6/Configuration.h @@ -1662,6 +1662,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Anet/A8/Configuration.h b/Marlin/example_configurations/Anet/A8/Configuration.h index 31e256f55ec6..e1cb6c79ef6a 100644 --- a/Marlin/example_configurations/Anet/A8/Configuration.h +++ b/Marlin/example_configurations/Anet/A8/Configuration.h @@ -1511,6 +1511,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration.h b/Marlin/example_configurations/BQ/Hephestos/Configuration.h index ee415121759f..0e036cfd5b98 100644 --- a/Marlin/example_configurations/BQ/Hephestos/Configuration.h +++ b/Marlin/example_configurations/BQ/Hephestos/Configuration.h @@ -1494,6 +1494,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h index d6ce97dd4926..dcb3ef4d6bf3 100644 --- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h @@ -1504,6 +1504,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration.h b/Marlin/example_configurations/BQ/WITBOX/Configuration.h index f21a580b8d17..12c894247d21 100644 --- a/Marlin/example_configurations/BQ/WITBOX/Configuration.h +++ b/Marlin/example_configurations/BQ/WITBOX/Configuration.h @@ -1494,6 +1494,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index b4303517ff93..0566ad435a04 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -1502,6 +1502,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration.h b/Marlin/example_configurations/Creality/CR-10/Configuration.h index 5806e468fc3f..d055f11ebb6a 100755 --- a/Marlin/example_configurations/Creality/CR-10/Configuration.h +++ b/Marlin/example_configurations/Creality/CR-10/Configuration.h @@ -1391,7 +1391,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // MakerLab Mini Panel with graphic @@ -1513,6 +1513,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index fcaf37b8b50b..0705f0ce01b5 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -1485,6 +1485,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index c44165fc92e0..789e2e928c2a 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -1485,6 +1485,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h index d75336e8d3b2..4029178d35da 100644 --- a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h +++ b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h @@ -1508,6 +1508,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h index 2e0a7993d18b..bcad9e410a82 100644 --- a/Marlin/example_configurations/Geeetech/GT2560/Configuration.h +++ b/Marlin/example_configurations/Geeetech/GT2560/Configuration.h @@ -1518,6 +1518,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h index d312ce50a87f..c19d6eae4da2 100644 --- a/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration.h index 5ccf56a302be..b35310ac1905 100644 --- a/Marlin/example_configurations/Infitary/i3-M508/Configuration.h +++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration.h @@ -1507,6 +1507,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Malyan/M150/Configuration.h b/Marlin/example_configurations/Malyan/M150/Configuration.h index 8bede2a2e101..af5126b011a5 100644 --- a/Marlin/example_configurations/Malyan/M150/Configuration.h +++ b/Marlin/example_configurations/Malyan/M150/Configuration.h @@ -1531,6 +1531,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index f5be35ebe753..25f75dfb485f 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index b4bb4f0dd5d3..9f61f3d3e27e 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index fc4fb4d1ffb5..4af177ba2f13 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -1515,6 +1515,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Sanguinololu/Configuration.h b/Marlin/example_configurations/Sanguinololu/Configuration.h index 81e57133f1d9..adef8ef49248 100644 --- a/Marlin/example_configurations/Sanguinololu/Configuration.h +++ b/Marlin/example_configurations/Sanguinololu/Configuration.h @@ -1533,6 +1533,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration.h b/Marlin/example_configurations/Velleman/K8200/Configuration.h index d833d6cc3a25..e3c2f8c72259 100644 --- a/Marlin/example_configurations/Velleman/K8200/Configuration.h +++ b/Marlin/example_configurations/Velleman/K8200/Configuration.h @@ -1536,6 +1536,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + #endif // K8200_VM8201 //============================================================================= diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Configuration.h index 77eed969b6be..d94931ac0ffd 100644 --- a/Marlin/example_configurations/Velleman/K8400/Configuration.h +++ b/Marlin/example_configurations/Velleman/K8400/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h index 6da2a78195c5..ca96327421ef 100644 --- a/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 0f79ff42fc8d..3865af225ee8 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -1503,6 +1503,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index d294bc3dac66..6fea3cdc6433 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -1631,6 +1631,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index d78c82423872..f77beb8862d8 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -1624,6 +1624,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index e8accf616e4a..0f2f387c13c1 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -1619,6 +1619,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 1e351e31aef3..a87006f96afc 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -1622,6 +1622,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index d238919cf8dc..a67de77568e4 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -1622,6 +1622,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 5e2d2bc3ee90..161403c81cc7 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -1631,6 +1631,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h index 9d640540e978..734604c2a047 100644 --- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h @@ -1517,6 +1517,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 8b59a91d2160..afb61143cfd9 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -1506,6 +1506,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index af581d43009f..7b3ee2913d5c 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -1498,6 +1498,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 2a0e649846dd..93556dd838f1 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -1508,6 +1508,35 @@ // //#define OLED_PANEL_TINYBOY2 +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED + //============================================================================= //=============================== Extra Features ============================== //============================================================================= diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index adff4df2f10d..b0f66d0161ce 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -129,12 +129,6 @@ #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #endif -#if ENABLED(MKS_12864OLED) - #define LCD_PINS_D5 -1 - #define LCD_PINS_D6 -1 - #define LCD_PINS_RS 27 - #define LCD_PINS_DC 25 -#endif // // Augmentation for auto-assigning RAMPS plugs // @@ -243,62 +237,92 @@ // // Průša i3 MK2 Multiplexer Support // -#define E_MUX0_PIN 40 // Z_CS_PIN -#define E_MUX1_PIN 42 // E0_CS_PIN -#define E_MUX2_PIN 44 // E1_CS_PIN +#ifndef E_MUX0_PIN + #define E_MUX0_PIN 40 // Z_CS_PIN +#endif +#ifndef E_MUX1_PIN + #define E_MUX1_PIN 42 // E0_CS_PIN +#endif +#ifndef E_MUX2_PIN + #define E_MUX2_PIN 44 // E1_CS_PIN +#endif + +////////////////////////// +// LCDs and Controllers // +////////////////////////// -// -// LCD / Controller -// #if ENABLED(ULTRA_LCD) + // + // LCD Display output pins + // #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) + #define LCD_PINS_RS 49 // CS chip select /SS chip slave select #define LCD_PINS_ENABLE 51 // SID (MOSI) #define LCD_PINS_D4 52 // SCK (CLK) clock + #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE) + #define LCD_PINS_RS 40 #define LCD_PINS_ENABLE 42 #define LCD_PINS_D4 65 #define LCD_PINS_D5 66 #define LCD_PINS_D6 44 #define LCD_PINS_D7 64 + #else -#if ENABLED(CR10_STOCKDISPLAY) - #define LCD_PINS_RS 27 - #define LCD_PINS_ENABLE 29 - #define LCD_PINS_D4 25 - #define LCD_PINS_D5 -1 - #define LCD_PINS_D6 -1 - #define LCD_PINS_D7 -1 - #if DISABLED(NEWPANEL) - #define BEEPER_PIN 37 - // Buttons are attached to a shift register - // Not wired yet - //#define SHIFT_CLK 38 - //#define SHIFT_LD 42 - //#define SHIFT_OUT 40 - //#define SHIFT_EN 17 + + #if ENABLED(CR10_STOCKDISPLAY) + + #define LCD_PINS_RS 27 + #define LCD_PINS_ENABLE 29 + #define LCD_PINS_D4 25 + + #if DISABLED(NEWPANEL) + #define BEEPER_PIN 37 + #endif + + #else + + #if ENABLED(MKS_12864OLED) + #define LCD_PINS_DC 25 // Set as output on init + #define LCD_PINS_RS 27 // Pull low for 1s to init + // DOGM SPI LCD Support + #define DOGLCD_CS 16 + #define DOGLCD_MOSI 17 + #define DOGLCD_SCK 23 + #define DOGLCD_A0 LCD_PINS_DC + #else + #define LCD_PINS_RS 16 + #define LCD_PINS_ENABLE 17 + #define LCD_PINS_D4 23 + #define LCD_PINS_D5 25 + #define LCD_PINS_D6 27 + #endif + + #define LCD_PINS_D7 29 + + #if DISABLED(NEWPANEL) + #define BEEPER_PIN 33 + #endif + #endif - #else - #define LCD_PINS_RS 16 - #define LCD_PINS_ENABLE 17 - #define LCD_PINS_D4 23 - #define LCD_PINS_D5 25 - #define LCD_PINS_D6 27 - #define LCD_PINS_D7 29 + #if DISABLED(NEWPANEL) - #define BEEPER_PIN 33 // Buttons are attached to a shift register // Not wired yet - //#define SHIFT_CLK 38 - //#define SHIFT_LD 42 - //#define SHIFT_OUT 40 - //#define SHIFT_EN 17 + //#define SHIFT_CLK 38 + //#define SHIFT_LD 42 + //#define SHIFT_OUT 40 + //#define SHIFT_EN 17 #endif - #endif + #endif + // + // LCD Display input pins + // #if ENABLED(NEWPANEL) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) @@ -306,14 +330,14 @@ #define BEEPER_PIN 37 #if ENABLED(CR10_STOCKDISPLAY) - #define BTN_EN1 17 - #define BTN_EN2 23 - #define BTN_ENC 35 + #define BTN_EN1 17 + #define BTN_EN2 23 #else - #define BTN_EN1 31 - #define BTN_EN2 33 - #define BTN_ENC 35 + #define BTN_EN1 31 + #define BTN_EN2 33 #endif + + #define BTN_ENC 35 #define SD_DETECT_PIN 49 #define KILL_PIN 41 @@ -334,104 +358,112 @@ #define BTN_EN2 43 #define BTN_ENC 32 #define LCD_SDSS 53 - #define SD_DETECT_PIN -1 #define KILL_PIN 41 #elif ENABLED(LCD_I2C_VIKI) #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42. #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13. - #define BTN_ENC -1 + #define LCD_SDSS 53 #define SD_DETECT_PIN 49 #elif ENABLED(VIKI2) || ENABLED(miniVIKI) - #define BEEPER_PIN 33 - - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 44 #define DOGLCD_CS 45 + #define DOGLCD_A0 44 #define LCD_SCREEN_ROT_180 + #define BEEPER_PIN 33 + #define STAT_LED_RED_PIN 32 + #define STAT_LED_BLUE_PIN 35 + #define BTN_EN1 22 #define BTN_EN2 7 #define BTN_ENC 39 #define SDSS 53 #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board - #define KILL_PIN 31 - #define STAT_LED_RED_PIN 32 - #define STAT_LED_BLUE_PIN 35 - #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) + + #define DOGLCD_CS 29 + #define DOGLCD_A0 27 + + #define BEEPER_PIN 23 + #define LCD_BACKLIGHT_PIN 33 + #define BTN_EN1 35 #define BTN_EN2 37 #define BTN_ENC 31 - #define SD_DETECT_PIN 49 + #define LCD_SDSS 53 + #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #define BEEPER_PIN 23 - #define DOGLCD_CS 29 + + #elif ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 + #define DOGLCD_A0 27 - #define LCD_BACKLIGHT_PIN 33 - #elif ENABLED(MINIPANEL) - #define BEEPER_PIN 42 - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 44 - #define DOGLCD_CS 66 + #define DOGLCD_CS 25 + // GLCD features //#define LCD_CONTRAST 190 // Uncomment screen orientation //#define LCD_SCREEN_ROT_90 //#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_270 - // The encoder and click button - #define BTN_EN1 40 - #define BTN_EN2 63 - #define BTN_ENC 59 + + #define BEEPER_PIN 37 // not connected to a pin #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + + #define BTN_EN1 31 + #define BTN_EN2 33 + #define BTN_ENC 35 + #define SDSS 53 - #define KILL_PIN 64 #define SD_DETECT_PIN 49 - #elif ENABLED(MKS_MINI_12864) - #define BEEPER_PIN 37 - // Pins for DOGM SPI LCD Support - #define DOGLCD_A0 27 - #define DOGLCD_CS 25 + #define KILL_PIN 64 + + #elif ENABLED(MINIPANEL) + + #define BEEPER_PIN 42 + // not connected to a pin + #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + + #define DOGLCD_A0 44 + #define DOGLCD_CS 66 + // GLCD features //#define LCD_CONTRAST 190 // Uncomment screen orientation //#define LCD_SCREEN_ROT_90 //#define LCD_SCREEN_ROT_180 //#define LCD_SCREEN_ROT_270 - // The encoder and click button - #define BTN_EN1 31 - #define BTN_EN2 33 - #define BTN_ENC 35 - // not connected to a pin - #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 + + #define BTN_EN1 40 + #define BTN_EN2 63 + #define BTN_ENC 59 + #define SDSS 53 - #define KILL_PIN 64 #define SD_DETECT_PIN 49 + #define KILL_PIN 64 #else // Beeper on AUX-4 #define BEEPER_PIN 33 - // buttons are directly attached using AUX-2 + // Buttons are directly attached using AUX-2 #if ENABLED(REPRAPWORLD_KEYPAD) - #define BTN_EN1 64 - #define BTN_EN2 59 - #define BTN_ENC 63 #define SHIFT_OUT 40 #define SHIFT_CLK 44 #define SHIFT_LD 42 + #define BTN_EN1 64 + #define BTN_EN2 59 + #define BTN_ENC 63 #elif ENABLED(PANEL_ONE) #define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN2 63 // AUX2 PIN 4 @@ -445,8 +477,6 @@ #if ENABLED(G3D_PANEL) #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #else - //#define SD_DETECT_PIN -1 // Ramps doesn't use this #endif #endif diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index efa1eb196ccd..04a07688e91c 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -182,15 +182,14 @@ // Generic support for SSD1306 OLED I2C LCDs //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes +#elif ENABLED(MKS_12864OLED) + // MKS 128x64 (SH1106) OLED I2C LCD + U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 8 stripes + //U8GLIB_SH1106_128X64_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes #elif ENABLED(U8GLIB_SH1106) - #if ENABLED(MKS_12864OLED) - // U8GLIB_SH1106_128X64 u8g(23, 17, 16, 25); // SW SPI Com: SCK = 23, MOSI = 17, CS = 16, A0 = 25 - U8GLIB_SH1106_128X64 u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS, LCD_PINS_DC); - #else // Generic support for SH1106 OLED I2C LCDs //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes - U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes - #endif + U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes #elif ENABLED(MINIPANEL) // The MINIPanel display //U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0); // 8 stripes @@ -425,12 +424,12 @@ FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, if (!axis_homed[axis]) u8g.print('?'); else { - #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) + #if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) if (!axis_known_position[axis]) u8g.print(' '); else #endif - lcd_printPGM(pstr); + lcd_printPGM(pstr); } } } @@ -925,7 +924,7 @@ static void lcd_implementation_status_screen() { uint8_t n = LCD_WIDTH - (START_COL) - 1; if (longFilename[0]) { filename = longFilename; - longFilename[n] = '\0'; + longFilename[n] = '\0'; // cutoff at screen edge } if (isDir) lcd_print(LCD_STR_FOLDER[0]); diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index b1b4cbe2bf81..74429b408512 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -597,12 +597,12 @@ FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, if (!axis_homed[axis]) lcd.write('?'); else { - #if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) + #if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING) if (!axis_known_position[axis]) lcd.write(' '); else #endif - lcd_printPGM(pstr); + lcd_printPGM(pstr); } } } @@ -987,7 +987,6 @@ static void lcd_implementation_status_screen() { static void lcd_implementation_drawmenu_sd(const bool sel, const uint8_t row, const char* const pstr, const char* filename, char* const longFilename, const uint8_t concat, const char post_char) { UNUSED(pstr); - char c; uint8_t n = LCD_WIDTH - concat; lcd.setCursor(0, row); lcd.print(sel ? '>' : ' '); @@ -995,7 +994,7 @@ static void lcd_implementation_status_screen() { filename = longFilename; longFilename[n] = '\0'; } - while ((c = *filename) && n > 0) { + while (char c = *filename) { n -= charset_mapper(c); filename++; }