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

Anet 1.0 alternative graphical LCD wiring (#20022)

Browse Source
This commit is contained in:
Darren Horrocks 2020-11-07 08:42:14 +00:00 committed by Scott Lahteine
parent 45e0dd1966
commit d81c1961c2
6 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Configuration.h
View File

@ -2095,9 +2095,10 @@
// //
// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6 // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h). Enable one of these.
// //
//#define ANET_FULL_GRAPHICS_LCD //#define ANET_FULL_GRAPHICS_LCD
//#define ANET_FULL_GRAPHICS_LCD_ALT_WIRING
// //
// AZSMZ 12864 LCD with SD // AZSMZ 12864 LCD with SD

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

@ -235,7 +235,7 @@
#define BOARD_ST7920_DELAY_2 DELAY_NS(125) #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125) #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER) #elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING, BQ_LCD_SMART_CONTROLLER)
#define IS_RRD_FG_SC 1 #define IS_RRD_FG_SC 1

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

@ -2220,7 +2220,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
+ COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \ + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
+ COUNT_ENABLED(VIKI2, miniVIKI) \ + COUNT_ENABLED(VIKI2, miniVIKI) \
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \ + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
+ ENABLED(ANET_FULL_GRAPHICS_LCD) \ + COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) \
+ ENABLED(AZSMZ_12864) \ + ENABLED(AZSMZ_12864) \
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \ + ENABLED(BQ_LCD_SMART_CONTROLLER) \
+ ENABLED(CARTESIO_UI) \ + ENABLED(CARTESIO_UI) \

5
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -215,9 +215,10 @@
#define EXPA2_10_PIN P0_17 #define EXPA2_10_PIN P0_17
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
#if ENABLED(ANET_FULL_GRAPHICS_LCD) #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
#error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue." #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue."
/** /**

5
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -233,7 +233,10 @@
* EXP2 EXP1 * EXP2 EXP1
*/ */
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD) #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
#error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue." #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
/** /**

54
Marlin/src/pins/sanguino/pins_ANET_10.h
View File

@ -145,13 +145,16 @@
* *
* Only the following displays are supported: * Only the following displays are supported:
* ZONESTAR_LCD * ZONESTAR_LCD
* ANET_FULL_GRAPHICS_LCD * ANET_FULL_GRAPHICS_LCD(_ALT_WIRING)?
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/ */
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#define LCD_SDSS 28 #define LCD_SDSS 28
#if HAS_ADC_BUTTONS #if HAS_ADC_BUTTONS
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch #define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28 #define LCD_PINS_RS 28
#define LCD_PINS_ENABLE 29 #define LCD_PINS_ENABLE 29
@ -160,26 +163,49 @@
#define LCD_PINS_D6 16 #define LCD_PINS_D6 16
#define LCD_PINS_D7 17 #define LCD_PINS_D7 17
#define ADC_KEYPAD_PIN 1 #define ADC_KEYPAD_PIN 1
#elif IS_RRD_FG_SC #elif IS_RRD_FG_SC
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb // display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748 // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
#define BEEPER_PIN 17 #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#define LCD_PINS_RS 27 #define SERVO0_PIN 30
#define LCD_PINS_ENABLE 28 #define BEEPER_PIN 27
#define LCD_PINS_D4 30 #define LCD_PINS_RS 29
#define BTN_EN1 11 #define LCD_PINS_ENABLE 16
#define BTN_EN2 10 #define LCD_PINS_D4 11
#define BTN_ENC 16 #define BTN_EN1 28
#define BOARD_ST7920_DELAY_1 DELAY_NS(0) #define BTN_EN2 10
#define BOARD_ST7920_DELAY_2 DELAY_NS(63) #define BTN_ENC 17
#define BOARD_ST7920_DELAY_3 DELAY_NS(125) #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
#define STD_ENCODER_PULSES_PER_STEP 4 #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1 #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
#else
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
#define BEEPER_PIN 17
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 30
#define BTN_EN1 11
#define BTN_EN2 10
#define BTN_ENC 16
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#define BOARD_ST7920_DELAY_2 DELAY_NS(63)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
#endif #endif
#else #else
#define SERVO0_PIN 27 #define SERVO0_PIN 27
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN SERVO0_PIN
#endif #endif
/** /**