Skip to content

Commit 02178bd

Browse files
thinkyheadthinkyhead
committed
🔧 Trigorilla / Chiron updates
Followup to c3f34e4
1 parent 8bc6f77 commit 02178bd

File tree

2 files changed

+65
-56
lines changed

2 files changed

+65
-56
lines changed

‎Marlin/src/pins/ramps/pins_RAMPS.h‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@
9797
#define Z_MAX_PIN -1
9898
#endif
9999
#ifndef I_STOP_PIN
100-
#define I_STOP_PIN 18
100+
#define I_STOP_PIN 18 // Z-
101101
#endif
102102
#ifndef J_STOP_PIN
103-
#define J_STOP_PIN 19
103+
#define J_STOP_PIN 19 // Z+
104104
#endif
105105
#endif
106106

@@ -109,26 +109,26 @@
109109
//
110110
#ifndef X_STOP_PIN
111111
#ifndef X_MIN_PIN
112-
#define X_MIN_PIN 3
112+
#define X_MIN_PIN 3 // X-
113113
#endif
114114
#ifndef X_MAX_PIN
115-
#define X_MAX_PIN 2
115+
#define X_MAX_PIN 2 // X+
116116
#endif
117117
#endif
118118
#ifndef Y_STOP_PIN
119119
#ifndef Y_MIN_PIN
120-
#define Y_MIN_PIN 14
120+
#define Y_MIN_PIN 14 // Y-
121121
#endif
122122
#ifndef Y_MAX_PIN
123-
#define Y_MAX_PIN 15
123+
#define Y_MAX_PIN 15 // Y+
124124
#endif
125125
#endif
126126
#ifndef Z_STOP_PIN
127127
#ifndef Z_MIN_PIN
128-
#define Z_MIN_PIN 18
128+
#define Z_MIN_PIN 18 // Z-
129129
#endif
130130
#ifndef Z_MAX_PIN
131-
#define Z_MAX_PIN 19
131+
#define Z_MAX_PIN 19 // Z+
132132
#endif
133133
#endif
134134

@@ -689,8 +689,6 @@
689689

690690
#if IS_RRD_SC
691691

692-
#define BEEPER_PIN EXP1_01_PIN
693-
694692
#if ENABLED(CR10_STOCKDISPLAY)
695693
#define BTN_EN1 EXP1_03_PIN
696694
#define BTN_EN2 EXP1_05_PIN
@@ -745,7 +743,9 @@
745743
#define DOGLCD_A0 AUX2_07_PIN
746744
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
747745

748-
#define BEEPER_PIN EXP2_05_PIN
746+
#ifndef BEEPER_PIN
747+
#define BEEPER_PIN EXP2_05_PIN
748+
#endif
749749
#define STAT_LED_RED_PIN AUX4_03_PIN
750750
#define STAT_LED_BLUE_PIN EXP1_02_PIN
751751

@@ -763,7 +763,9 @@
763763
#define DOGLCD_CS EXP1_08_PIN
764764
#define DOGLCD_A0 EXP1_07_PIN
765765

766-
#define BEEPER_PIN EXP1_05_PIN
766+
#ifndef BEEPER_PIN
767+
#define BEEPER_PIN EXP1_05_PIN
768+
#endif
767769
#define LCD_BACKLIGHT_PIN EXP2_05_PIN
768770

769771
#define BTN_EN1 EXP1_02_PIN
@@ -778,7 +780,6 @@
778780

779781
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
780782

781-
#define BEEPER_PIN EXP1_01_PIN
782783
#define BTN_ENC EXP1_02_PIN
783784
#ifndef SD_DETECT_PIN
784785
#define SD_DETECT_PIN EXP2_07_PIN
@@ -832,7 +833,9 @@
832833

833834
#elif ENABLED(MINIPANEL)
834835

835-
#define BEEPER_PIN AUX2_08_PIN
836+
#ifndef BEEPER_PIN
837+
#define BEEPER_PIN AUX2_08_PIN
838+
#endif
836839
#define LCD_BACKLIGHT_PIN AUX2_10_PIN
837840

838841
#define DOGLCD_A0 AUX2_07_PIN
@@ -857,8 +860,6 @@
857860

858861
#elif ENABLED(G3D_PANEL)
859862

860-
#define BEEPER_PIN EXP1_01_PIN
861-
862863
#ifndef SD_DETECT_PIN
863864
#define SD_DETECT_PIN EXP2_07_PIN
864865
#endif
@@ -876,7 +877,9 @@
876877

877878
#else
878879

879-
#define BEEPER_PIN EXP2_05_PIN
880+
#ifndef BEEPER_PIN
881+
#define BEEPER_PIN EXP2_05_PIN
882+
#endif
880883

881884
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
882885
#define BTN_EN1 AUX2_03_PIN
@@ -891,6 +894,10 @@
891894
#endif
892895
#endif // IS_NEWPANEL
893896

897+
#ifndef BEEPER_PIN
898+
#define BEEPER_PIN EXP1_01_PIN // Most common mapping
899+
#endif
900+
894901
#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
895902

896903
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS

‎Marlin/src/pins/ramps/pins_TRIGORILLA_14.h‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
/**
5757
* Trigorilla Plugs (oriented with stepper plugs at the top)
5858
*
59+
* SENSORS : GND GND GND GND
60+
* A12 A15 A14 A13
61+
* (D66 D69 D68 D67)
62+
*
5963
* AUX : D42 GND 5V (Chiron Y-STOP)
6064
* D43 GND 5V (Chiron Z-STOP)
6165
*
@@ -70,6 +74,34 @@
7074
* 5V 5V 5V 5V 5V 5V
7175
*/
7276

77+
/** Expansion Headers
78+
* ------ ------
79+
* 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK)
80+
* 17 | 3 4 | 16 31 | 3 4 | 53
81+
* 23 5 6 | 25 33 5 6 | 51 (MOSI)
82+
* 27 | 7 8 | 29 49 | 7 8 | 41
83+
* (GND) | 9 10 | (5V) (GND) | 9 10 | RESET
84+
* ------ ------
85+
* EXP1 EXP2
86+
*/
87+
#define EXP1_01_PIN 37
88+
#define EXP1_02_PIN 35
89+
#define EXP1_03_PIN 17
90+
#define EXP1_04_PIN 16
91+
#define EXP1_05_PIN 23
92+
#define EXP1_06_PIN 25
93+
#define EXP1_07_PIN 27
94+
#define EXP1_08_PIN 29
95+
96+
#define EXP2_01_PIN 50 // MISO
97+
#define EXP2_02_PIN 52 // SCK
98+
#define EXP2_03_PIN 31
99+
#define EXP2_04_PIN 53
100+
#define EXP2_05_PIN 33
101+
#define EXP2_06_PIN 51 // MOSI
102+
#define EXP2_07_PIN 49
103+
#define EXP2_08_PIN 41
104+
73105
//
74106
// AnyCubic pin mappings
75107
//
@@ -80,12 +112,12 @@
80112

81113
//#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
82114
#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
83-
#define X_MAX_PIN 43
84-
#define Y_STOP_PIN 19
115+
#define X_MAX_PIN 43 // AUX (2)
116+
#define Y_STOP_PIN 19 // Z+
85117
#elif EITHER(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA)
86118
// Chiron uses AUX header for Y and Z endstops
87-
#define Y_STOP_PIN 42 // AUX
88-
#define Z_STOP_PIN 43 // AUX
119+
#define Y_STOP_PIN 42 // AUX (1)
120+
#define Z_STOP_PIN 43 // AUX (2)
89121
#define Z2_MIN_PIN 18 // Z-
90122

91123
#ifndef Z_MIN_PROBE_PIN
@@ -101,7 +133,7 @@
101133

102134
#if ENABLED(TRIGORILLA_MAPPING_CHIRON)
103135
#if ENABLED(ANYCUBIC_LCD_CHIRON) && !defined(FIL_RUNOUT_PIN)
104-
#define FIL_RUNOUT_PIN 33 // Chiron LCD Adapter only
136+
#define FIL_RUNOUT_PIN EXP2_05_PIN // Chiron Standard Adapter
105137
#endif
106138
#define HEATER_BED_PIN MOSFET_B_PIN // HEATER1
107139
#endif
@@ -125,8 +157,10 @@
125157
#endif
126158

127159
#if EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
128-
#define BEEPER_PIN 31
129-
#define SD_DETECT_PIN 49
160+
#ifndef BEEPER_PIN
161+
#define BEEPER_PIN EXP2_03_PIN // Chiron Standard Adapter
162+
#endif
163+
#define SD_DETECT_PIN EXP2_07_PIN // Chiron Standard Adapter
130164
#endif
131165

132166
#if HAS_TMC_UART
@@ -145,35 +179,3 @@
145179
#endif
146180

147181
#include "pins_RAMPS.h"
148-
149-
//
150-
// AnyCubic made the following changes to 1.1.0-RC8
151-
// If these are appropriate for your LCD let us know.
152-
//
153-
#if 0 && HAS_WIRED_LCD
154-
155-
// LCD Display output pins
156-
#if BOTH(IS_NEWPANEL, PANEL_ONE)
157-
#undef LCD_PINS_D6
158-
#define LCD_PINS_D6 57
159-
#endif
160-
161-
// LCD Display input pins
162-
#if IS_NEWPANEL
163-
#if EITHER(VIKI2, miniVIKI)
164-
#undef DOGLCD_A0
165-
#define DOGLCD_A0 23
166-
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
167-
#undef BEEPER_PIN
168-
#define BEEPER_PIN 33
169-
#undef LCD_BACKLIGHT_PIN
170-
#define LCD_BACKLIGHT_PIN 67
171-
#endif
172-
#elif ENABLED(MINIPANEL)
173-
#undef BEEPER_PIN
174-
#define BEEPER_PIN 33
175-
#undef DOGLCD_A0
176-
#define DOGLCD_A0 42
177-
#endif
178-
179-
#endif // HAS_WIRED_LCD

0 commit comments

Comments
 (0)