Skip to content

Commit 5d1ede0

Browse files
ellenspellensp
authored
✨ CTC_A10S_A13 (MarlinFirmware#26514)
1 parent 2203505 commit 5d1ede0

File tree

7 files changed

+102
-40
lines changed

7 files changed

+102
-40
lines changed

‎Marlin/Configuration.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3029,14 +3029,14 @@
30293029
//#define ENDER2_STOCKDISPLAY
30303030

30313031
//
3032-
// ANET and Tronxy Graphical Controller
3033-
//
3034-
// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
3035-
// A clone of the RepRapDiscount full graphics display but with
3036-
// different pins/wiring (see pins_ANET_10.h). Enable one of these.
3032+
// ANET and Tronxy 128×64 Full Graphics Controller as used on Anet A6
30373033
//
30383034
//#define ANET_FULL_GRAPHICS_LCD
3039-
//#define ANET_FULL_GRAPHICS_LCD_ALT_WIRING
3035+
3036+
//
3037+
// GUCOCO CTC 128×64 Full Graphics Controller as used on GUCOCO CTC A10S
3038+
//
3039+
//#define CTC_A10S_A13
30403040

30413041
//
30423042
// AZSMZ 12864 LCD with SD

‎Marlin/src/inc/Changes.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,8 @@
671671
#error "LARGE_MOVE_ITEMS is obsolete. Instead define MANUAL_MOVE_DISTANCE_MM and MANUAL_MOVE_DISTANCE_IN."
672672
#elif defined(SDIO_SUPPORT)
673673
#error "SDIO_SUPPORT is now ONBOARD_SDIO."
674+
#elif defined(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
675+
#error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING is now CTC_A10S_A13."
674676
#endif
675677

676678
// L64xx stepper drivers have been removed

‎Marlin/src/inc/Conditionals_LCD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@
779779
#define LCD_ST7920_DELAY_2 125
780780
#define LCD_ST7920_DELAY_3 125
781781

782-
#elif ANY(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
782+
#elif ANY(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13)
783783

784784
#define IS_RRD_FG_SC 1
785785
#define LCD_ST7920_DELAY_1 150

‎Marlin/src/inc/SanityCheck.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2636,7 +2636,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
26362636
+ COUNT_ENABLED(VIKI2, miniVIKI) \
26372637
+ ENABLED(WYH_L12864) \
26382638
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
2639-
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) \
2639+
+ COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, CTC_A10S_A13) \
26402640
+ ENABLED(AZSMZ_12864) \
26412641
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
26422642
+ ENABLED(CARTESIO_UI) \

‎Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@
221221
#define EXP2_08_PIN -1
222222

223223
#if HAS_WIRED_LCD
224-
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
225-
#error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
224+
#if ENABLED(CTC_A10S_A13)
225+
#error "CTC_A10S_A13 only applies to the ANET 1.0 board."
226226

227227
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
228228

‎Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@
289289

290290
#elif HAS_WIRED_LCD
291291

292-
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
292+
#if ENABLED(CTC_A10S_A13)
293293
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
294-
#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.)"
294+
#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.)"
295295
#endif
296296

297297
/**
@@ -300,7 +300,7 @@
300300
*
301301
* !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
302302
*
303-
* The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
303+
* The CTC_A10S_A13 connector plug:
304304
*
305305
* BEFORE AFTER
306306
* ------ ------

‎Marlin/src/pins/sanguino/pins_ANET_10.h

Lines changed: 87 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -158,28 +158,52 @@
158158
#define SDSS 31
159159
#define LED_PIN -1
160160

161+
/**
162+
* Connector pinouts
163+
*
164+
* ------ ------ ----
165+
* (SDA) D17 | 1 2 | (A1) D30 3V3 | 1 2 | D4 (SS) J3_RX |1 2| J3_TX
166+
* (SCL) D16 | 3 4 | (A2) D29 GND | 3 4 | RESET (TXO) D9 |3 4| D8 (RX0) D8
167+
* D11 | 5 6 (A3) D28 (MOSI) D5 | 5 6 D7 (SCK) USB_RX |5 6| USB_TX
168+
* D10 | 7 8 | (A4) D27 D10 5V | 7 8 | D6 (MISO) ----
169+
* 5V | 9 10 | GND J3_RX | 9 10 | J3_TX
170+
* ------ ------
171+
* LCD J3 USB_BLE
172+
*/
173+
174+
#define EXP1_01_PIN 17
175+
#define EXP1_02_PIN 30
176+
#define EXP1_03_PIN 16
177+
#define EXP1_04_PIN 29
178+
#define EXP1_05_PIN 11
179+
#define EXP1_06_PIN 28
180+
#define EXP1_07_PIN 10
181+
#define EXP1_08_PIN 27
182+
#define EXP1_09_PIN -1 // 5V
183+
#define EXP1_10_PIN -1 // GND
184+
161185
/**
162186
* LCD / Controller
163187
*
164188
* Only the following displays are supported:
165189
* ZONESTAR_LCD
166-
* ANET_FULL_GRAPHICS_LCD(_ALT_WIRING)?
190+
* CTC_A10S_A13G
167191
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
168192
*/
169193

170194
#if HAS_WIRED_LCD
171195

172-
#define LCD_SDSS 28
196+
#define LCD_SDSS EXP1_06_PIN
173197

174198
#if HAS_ADC_BUTTONS
175199

176-
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch
177-
#define LCD_PINS_RS 28
178-
#define LCD_PINS_EN 29
179-
#define LCD_PINS_D4 10
180-
#define LCD_PINS_D5 11
181-
#define LCD_PINS_D6 16
182-
#define LCD_PINS_D7 17
200+
#define SERVO0_PIN EXP1_08_PIN // free for BLTouch/3D-Touch
201+
#define LCD_PINS_RS EXP1_06_PIN
202+
#define LCD_PINS_EN EXP1_04_PIN
203+
#define LCD_PINS_D4 EXP1_07_PIN
204+
#define LCD_PINS_D5 EXP1_05_PIN
205+
#define LCD_PINS_D6 EXP1_03_PIN
206+
#define LCD_PINS_D7 EXP1_01_PIN
183207
#define ADC_KEYPAD_PIN 1
184208

185209
#elif IS_RRD_FG_SC
@@ -188,36 +212,72 @@
188212
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
189213
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
190214

191-
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
192-
#define SERVO0_PIN 30
193-
#define BEEPER_PIN 27
194-
#define LCD_PINS_RS 29
195-
#define LCD_PINS_EN 16
196-
#define LCD_PINS_D4 11
197-
#define BTN_EN1 28
198-
#define BTN_EN2 10
199-
#define BTN_ENC 17
215+
#if ENABLED(CTC_A10S_A13G)
216+
217+
/**
218+
* CTC_A10S_A13 pinout
219+
*
220+
* ------
221+
* GND | 1 2 | 5V
222+
* BEEPER | 3 4 | BTN_EN2
223+
* BTN_EN1 5 6 | LCD_D4
224+
* LCD_RS | 7 8 | LCD_EN
225+
* SERVO0 | 9 10 | BTN_ENC
226+
* ------
227+
* LCD
228+
*/
229+
#define SERVO0_PIN EXP1_02_PIN
230+
231+
#define BEEPER_PIN EXP1_08_PIN
232+
233+
#define BTN_ENC EXP1_01_PIN
234+
#define BTN_EN1 EXP1_06_PIN
235+
#define BTN_EN2 EXP1_07_PIN
236+
237+
#define LCD_PINS_RS EXP1_04_PIN
238+
#define LCD_PINS_EN EXP1_03_PIN
239+
#define LCD_PINS_D4 EXP1_05_PIN
240+
200241
#define BOARD_ST7920_DELAY_1 250
201242
#define BOARD_ST7920_DELAY_2 250
202243
#define BOARD_ST7920_DELAY_3 250
244+
203245
#else
204-
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
205-
#define BEEPER_PIN 17
206-
#define LCD_PINS_RS 27
207-
#define LCD_PINS_EN 28
208-
#define LCD_PINS_D4 30
209-
#define BTN_EN1 11
210-
#define BTN_EN2 10
211-
#define BTN_ENC 16
246+
247+
/**
248+
* ANET_FULL_GRAPHICS_LCD pinouts
249+
*
250+
* ------ ------
251+
* GND | 1 2 | 5V - | 1 2 | -
252+
* LCD_RS | 3 4 | BTN_EN2 - | 3 4 | 5V
253+
* LCD_EN 5 6 | BTN_EN1 - 5 6 | -
254+
* SERVO0 | 7 8 | BTN_ENC RESET | 7 8 | GND
255+
* LCD_D4 | 9 10 | BEEPER_PIN - | 9 10 | 3V3
256+
* ------ ------
257+
* LCD J3
258+
*/
259+
#define SERVO0_PIN EXP1_04_PIN // Free for BLTouch/3D-Touch
260+
261+
#define BEEPER_PIN EXP1_01_PIN
262+
263+
#define BTN_ENC EXP1_03_PIN
264+
#define BTN_EN1 EXP1_05_PIN
265+
#define BTN_EN2 EXP1_07_PIN
266+
267+
#define LCD_PINS_RS EXP1_08_PIN
268+
#define LCD_PINS_EN EXP1_06_PIN
269+
#define LCD_PINS_D4 EXP1_02_PIN
270+
212271
#define BOARD_ST7920_DELAY_1 125
213272
#define BOARD_ST7920_DELAY_2 63
214273
#define BOARD_ST7920_DELAY_3 125
274+
215275
#endif
216276

217277
#endif
218278

219279
#else
220-
#define SERVO0_PIN 27
280+
#define SERVO0_PIN EXP1_08_PIN
221281
#endif
222282

223283
#ifndef FIL_RUNOUT_PIN

0 commit comments

Comments
 (0)