Skip to content

Commit 4bd104d

Browse files
ellenspPragma8123
authored andcommitted
🎨 Update GT2560 V41b (MarlinFirmware#26351)
1 parent 10e7945 commit 4bd104d

File tree

2 files changed

+30
-31
lines changed

2 files changed

+30
-31
lines changed

Marlin/src/core/boards.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
#define BOARD_ZONESTAR_ZM3E4V2 5064 // Zonestar ZM3E4 V2 (STM32F103VC)
397397
#define BOARD_ERYONE_ERY32_MINI 5065 // Eryone Ery32 mini (STM32F103VE)
398398
#define BOARD_PANDA_PI_V29 5066 // Panda Pi V2.9 - Standalone (STM32F103RC)
399-
#define BOARD_SOVOL_V131 5067 // Sovol V1.3.1 (GD32F103RET6)
399+
#define BOARD_SOVOL_V131 5067 // Sovol V1.3.1 (GD32F103RE)
400400
#define BOARD_TRIGORILLA_V006 5068 // Trigorilla V0.0.6 (GD32F103RE)
401401
#define BOARD_KEDI_CONTROLLER_V1_2 5069 // EDUTRONICS Kedi Controller V1.2 (STM32F103RC)
402402

Marlin/src/pins/mega/pins_GT2560_V41b.h

+29-30
Original file line numberDiff line numberDiff line change
@@ -204,45 +204,44 @@
204204
* (LCM_D5) 21 | 5 6 | GND
205205
* (LCM_D4) 16 | 7 8 | 17 (LCM_EN)
206206
* (EC_PRESS) 19 | 9 10 | GND
207-
* (RESET) |11 12 | 19 (BEEP)
207+
* (RESET) |11 12 | 18 (BEEP)
208208
* ------
209209
* H2
210210
*/
211211

212-
#define LCM_D4 16 // Used as BTN_EN1 for YHCB2004 LCD Module
213-
#define LCM_D5 21 // YHCB2004_SCK_PIN
214-
#define LCM_D6 5 // YHCB2004_SS_PIN
215-
#define LCM_D7 36 // YHCB2004_MOSI_PIN
216-
#define LCM_EN 17 // BTN_EN2
217-
#define EC_PRESS 19 // BTN_ENC
218-
#define BEEP 18
212+
//#define H2_01_PIN 5V
213+
//#define H2_02_PIN GND
214+
#define H2_03_PIN 36 // LCM_D7
215+
#define H2_04_PIN 5 // LCM_D6
216+
#define H2_05_PIN 21 // LCM_D5
217+
//#define H2_06_PIN GND
218+
#define H2_07_PIN 16 // LCM_D4
219+
#define H2_08_PIN 17 // LCM_EN
220+
#define H2_09_PIN 19 // EC_PRESS
221+
//#define H2_10_PIN GND
222+
//#define H2_11_PIN RESET
223+
#define H2_12_PIN 18 // BEEP
219224

220-
#define BEEPER_PIN BEEP
221225
#define LCM_RS 20 // Pin named and connected to 10k pull-up resistor but unused
222226

223227
#if ENABLED(YHCB2004)
224-
#define YHCB2004_SS_PIN LCM_D6
225-
#define YHCB2004_SCK_PIN LCM_D5
226-
#define YHCB2004_MOSI_PIN LCM_D7
228+
#define YHCB2004_SS_PIN H2_04_PIN
229+
#define YHCB2004_SCK_PIN H2_05_PIN
230+
#define YHCB2004_MOSI_PIN H2_03_PIN
227231
#define YHCB2004_MISO_PIN LCM_RS // Unused on V4.1b board
232+
#define BTN_EN1 H2_07_PIN
233+
#define BTN_EN2 H2_08_PIN
234+
#define BTN_ENC H2_09_PIN
235+
#define BEEPER_PIN H2_12_PIN
236+
#elif ENABLED(CR10_STOCKDISPLAY) // Firmware compatible with stock GT 128x64 12pin LCD for the V41b
237+
#define LCD_PINS_RS H2_04_PIN // DOGLCD_CS
238+
#define LCD_PINS_D4 H2_05_PIN // DOGLCD_SCK
239+
#define LCD_PINS_EN H2_03_PIN // DOGLCD_MOSI
240+
#define BTN_EN1 H2_07_PIN
241+
#define BTN_EN2 H2_08_PIN
242+
#define BTN_ENC H2_09_PIN
243+
#define BEEPER_PIN H2_12_PIN
228244
#elif HAS_WIRED_LCD
229245
#error "GT2560 V4.1b requires an adapter for common LCDs."
230-
/* Cannot use because V4.1b board has not LCD_PINS_RS wired to display connector
231-
#define LCD_PINS_RS 20
232-
#define LCD_PINS_EN 17
233-
#define LCD_PINS_D4 16
234-
#define LCD_PINS_D5 21
235-
#define LCD_PINS_D6 5
236-
#define LCD_PINS_D7 36
237-
//*/
238-
#endif
239-
240-
#if ENABLED(YHCB2004)
241-
#define BTN_EN1 LCM_D4
242-
#define BTN_EN2 LCM_EN
243-
#define BTN_ENC EC_PRESS
244-
#elif IS_NEWPANEL
245-
#define BTN_EN1 42
246-
#define BTN_EN2 40
247-
#define BTN_ENC 19
246+
/* Cannot use because V4.1b board has not LCD_PINS_RS wired to display connector */
248247
#endif

0 commit comments

Comments
 (0)