0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

✨ CTC_A10S_A13 (#26514)

Browse source
This commit is contained in:
ellensp 2023-12-31 22:54:26 +13:00 committed by GitHub
parent 2203505182
commit 5d1ede08aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 102 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/Configuration.h
View file

@ -3029,14 +3029,14 @@
//#define ENDER2_STOCKDISPLAY
//
// ANET and Tronxy Graphical Controller
//
// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). Enable one of these.
// ANET and Tronxy 128×64 Full Graphics Controller as used on Anet A6
//
//#define ANET_FULL_GRAPHICS_LCD
//#define ANET_FULL_GRAPHICS_LCD_ALT_WIRING
//
// GUCOCO CTC 128×64 Full Graphics Controller as used on GUCOCO CTC A10S
//
//#define CTC_A10S_A13
//
// AZSMZ 12864 LCD with SD

2
Marlin/src/inc/Changes.h
View file

@ -671,6 +671,8 @@
#error "LARGE_MOVE_ITEMS is obsolete. Instead define MANUAL_MOVE_DISTANCE_MM and MANUAL_MOVE_DISTANCE_IN."
#elif defined(SDIO_SUPPORT)
#error "SDIO_SUPPORT is now ONBOARD_SDIO."
#elif defined(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING is now CTC_A10S_A13."
#endif
// L64xx stepper drivers have been removed

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

@ -779,7 +779,7 @@
#define LCD_ST7920_DELAY_2 125
#define LCD_ST7920_DELAY_3 125
#elif ANY(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#elif ANY(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13)
#define IS_RRD_FG_SC 1
#define LCD_ST7920_DELAY_1 150

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

@ -2636,7 +2636,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
+ COUNT_ENABLED(VIKI2, miniVIKI) \
+ ENABLED(WYH_L12864) \
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) \
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \
+ ENABLED(AZSMZ_12864) \
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
+ ENABLED(CARTESIO_UI) \

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View file

@ -221,8 +221,8 @@
#define EXP2_08_PIN -1
#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(CTC_A10S_A13)
#error "CTC_A10S_A13 only applies to the ANET 1.0 board."
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -289,9 +289,9 @@
#elif HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#if ENABLED(CTC_A10S_A13)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#error "CAUTION! CTC_A10S_A13 requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
/**
@ -300,7 +300,7 @@
*
* !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
*
* The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
* The CTC_A10S_A13 connector plug:
*
* BEFORE AFTER
* ------ ------

114
Marlin/src/pins/sanguino/pins_ANET_10.h
View file

@ -158,28 +158,52 @@
#define SDSS 31
#define LED_PIN -1
/**
* Connector pinouts
*
* ------ ------ ----
* (SDA) D17 | 1 2 | (A1) D30 3V3 | 1 2 | D4 (SS) J3_RX |1 2| J3_TX
* (SCL) D16 | 3 4 | (A2) D29 GND | 3 4 | RESET (TXO) D9 |3 4| D8 (RX0) D8
* D11 | 5 6 (A3) D28 (MOSI) D5 | 5 6 D7 (SCK) USB_RX |5 6| USB_TX
* D10 | 7 8 | (A4) D27 D10 5V | 7 8 | D6 (MISO) ----
* 5V | 9 10 | GND J3_RX | 9 10 | J3_TX
* ------ ------
* LCD J3 USB_BLE
*/
#define EXP1_01_PIN 17
#define EXP1_02_PIN 30
#define EXP1_03_PIN 16
#define EXP1_04_PIN 29
#define EXP1_05_PIN 11
#define EXP1_06_PIN 28
#define EXP1_07_PIN 10
#define EXP1_08_PIN 27
#define EXP1_09_PIN -1 // 5V
#define EXP1_10_PIN -1 // GND
/**
* LCD / Controller
*
* Only the following displays are supported:
* ZONESTAR_LCD
* ANET_FULL_GRAPHICS_LCD(_ALT_WIRING)?
* CTC_A10S_A13G
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/
#if HAS_WIRED_LCD
#define LCD_SDSS 28
#define LCD_SDSS EXP1_06_PIN
#if HAS_ADC_BUTTONS
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28
#define LCD_PINS_EN 29
#define LCD_PINS_D4 10
#define LCD_PINS_D5 11
#define LCD_PINS_D6 16
#define LCD_PINS_D7 17
#define SERVO0_PIN EXP1_08_PIN // free for BLTouch/3D-Touch
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_EN EXP1_04_PIN
#define LCD_PINS_D4 EXP1_07_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN 1
#elif IS_RRD_FG_SC
@ -188,36 +212,72 @@
// 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
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#define SERVO0_PIN 30
#define BEEPER_PIN 27
#define LCD_PINS_RS 29
#define LCD_PINS_EN 16
#define LCD_PINS_D4 11
#define BTN_EN1 28
#define BTN_EN2 10
#define BTN_ENC 17
#if ENABLED(CTC_A10S_A13G)
/**
* CTC_A10S_A13 pinout
*
* ------
* GND | 1 2 | 5V
* BEEPER | 3 4 | BTN_EN2
* BTN_EN1 5 6 | LCD_D4
* LCD_RS | 7 8 | LCD_EN
* SERVO0 | 9 10 | BTN_ENC
* ------
* LCD
*/
#define SERVO0_PIN EXP1_02_PIN
#define BEEPER_PIN EXP1_08_PIN
#define BTN_ENC EXP1_01_PIN
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_07_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define BOARD_ST7920_DELAY_1 250
#define BOARD_ST7920_DELAY_2 250
#define BOARD_ST7920_DELAY_3 250
#else
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
#define BEEPER_PIN 17
#define LCD_PINS_RS 27
#define LCD_PINS_EN 28
#define LCD_PINS_D4 30
#define BTN_EN1 11
#define BTN_EN2 10
#define BTN_ENC 16
/**
* ANET_FULL_GRAPHICS_LCD pinouts
*
* ------ ------
* GND | 1 2 | 5V - | 1 2 | -
* LCD_RS | 3 4 | BTN_EN2 - | 3 4 | 5V
* LCD_EN 5 6 | BTN_EN1 - 5 6 | -
* SERVO0 | 7 8 | BTN_ENC RESET | 7 8 | GND
* LCD_D4 | 9 10 | BEEPER_PIN - | 9 10 | 3V3
* ------ ------
* LCD J3
*/
#define SERVO0_PIN EXP1_04_PIN // Free for BLTouch/3D-Touch
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_03_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_07_PIN
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_EN EXP1_06_PIN
#define LCD_PINS_D4 EXP1_02_PIN
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 63
#define BOARD_ST7920_DELAY_3 125
#endif
#endif
#else
#define SERVO0_PIN 27
#define SERVO0_PIN EXP1_08_PIN
#endif
#ifndef FIL_RUNOUT_PIN