Skip to content

Commit

Permalink
🔧 Trigorilla / Chiron updates
Browse files Browse the repository at this point in the history 
Followup to c3f34e4
  • Loading branch information
@thinkyhead
thinkyhead committed May 17, 2023
1 parent 8bc6f77 commit 02178bd
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 56 deletions.
41 changes: 24 additions & 17 deletions Marlin/src/pins/ramps/pins_RAMPS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
#define Z_MAX_PIN -1
#endif
#ifndef I_STOP_PIN
#define I_STOP_PIN 18
#define I_STOP_PIN 18 // Z-
#endif
#ifndef J_STOP_PIN
#define J_STOP_PIN 19
#define J_STOP_PIN 19 // Z+
#endif
#endif

Expand All @@ -109,26 +109,26 @@
//
#ifndef X_STOP_PIN
#ifndef X_MIN_PIN
#define X_MIN_PIN 3
#define X_MIN_PIN 3 // X-
#endif
#ifndef X_MAX_PIN
#define X_MAX_PIN 2
#define X_MAX_PIN 2 // X+
#endif
#endif
#ifndef Y_STOP_PIN
#ifndef Y_MIN_PIN
#define Y_MIN_PIN 14
#define Y_MIN_PIN 14 // Y-
#endif
#ifndef Y_MAX_PIN
#define Y_MAX_PIN 15
#define Y_MAX_PIN 15 // Y+
#endif
#endif
#ifndef Z_STOP_PIN
#ifndef Z_MIN_PIN
#define Z_MIN_PIN 18
#define Z_MIN_PIN 18 // Z-
#endif
#ifndef Z_MAX_PIN
#define Z_MAX_PIN 19
#define Z_MAX_PIN 19 // Z+
#endif
#endif

Expand Down Expand Up @@ -689,8 +689,6 @@

#if IS_RRD_SC

#define BEEPER_PIN EXP1_01_PIN

#if ENABLED(CR10_STOCKDISPLAY)
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
Expand Down Expand Up @@ -745,7 +743,9 @@
#define DOGLCD_A0 AUX2_07_PIN
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270

#define BEEPER_PIN EXP2_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_05_PIN
#endif
#define STAT_LED_RED_PIN AUX4_03_PIN
#define STAT_LED_BLUE_PIN EXP1_02_PIN

Expand All @@ -763,7 +763,9 @@
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN

#define BEEPER_PIN EXP1_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_05_PIN
#endif
#define LCD_BACKLIGHT_PIN EXP2_05_PIN

#define BTN_EN1 EXP1_02_PIN
Expand All @@ -778,7 +780,6 @@

#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)

#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
Expand Down Expand Up @@ -832,7 +833,9 @@

#elif ENABLED(MINIPANEL)

#define BEEPER_PIN AUX2_08_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN AUX2_08_PIN
#endif
#define LCD_BACKLIGHT_PIN AUX2_10_PIN

#define DOGLCD_A0 AUX2_07_PIN
Expand All @@ -857,8 +860,6 @@

#elif ENABLED(G3D_PANEL)

#define BEEPER_PIN EXP1_01_PIN

#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
Expand All @@ -876,7 +877,9 @@

#else

#define BEEPER_PIN EXP2_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_05_PIN
#endif

#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
#define BTN_EN1 AUX2_03_PIN
Expand All @@ -891,6 +894,10 @@
#endif
#endif // IS_NEWPANEL

#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_01_PIN // Most common mapping
#endif

#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED

#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
Expand Down
80 changes: 41 additions & 39 deletions Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
/**
* Trigorilla Plugs (oriented with stepper plugs at the top)
*
* SENSORS : GND GND GND GND
* A12 A15 A14 A13
* (D66 D69 D68 D67)
*
* AUX : D42 GND 5V (Chiron Y-STOP)
* D43 GND 5V (Chiron Z-STOP)
*
Expand All @@ -70,6 +74,34 @@
* 5V 5V 5V 5V 5V 5V
*/

/** Expansion Headers
* ------ ------
* 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK)
* 17 | 3 4 | 16 31 | 3 4 | 53
* 23 5 6 | 25 33 5 6 | 51 (MOSI)
* 27 | 7 8 | 29 49 | 7 8 | 41
* (GND) | 9 10 | (5V) (GND) | 9 10 | RESET
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN 37
#define EXP1_02_PIN 35
#define EXP1_03_PIN 17
#define EXP1_04_PIN 16
#define EXP1_05_PIN 23
#define EXP1_06_PIN 25
#define EXP1_07_PIN 27
#define EXP1_08_PIN 29

#define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 31
#define EXP2_04_PIN 53
#define EXP2_05_PIN 33
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49
#define EXP2_08_PIN 41

//
// AnyCubic pin mappings
//
Expand All @@ -80,12 +112,12 @@

//#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
#define X_MAX_PIN 43
#define Y_STOP_PIN 19
#define X_MAX_PIN 43 // AUX (2)
#define Y_STOP_PIN 19 // Z+
#elif EITHER(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA)
// Chiron uses AUX header for Y and Z endstops
#define Y_STOP_PIN 42 // AUX
#define Z_STOP_PIN 43 // AUX
#define Y_STOP_PIN 42 // AUX (1)
#define Z_STOP_PIN 43 // AUX (2)
#define Z2_MIN_PIN 18 // Z-

#ifndef Z_MIN_PROBE_PIN
Expand All @@ -101,7 +133,7 @@

#if ENABLED(TRIGORILLA_MAPPING_CHIRON)
#if ENABLED(ANYCUBIC_LCD_CHIRON) && !defined(FIL_RUNOUT_PIN)
#define FIL_RUNOUT_PIN 33 // Chiron LCD Adapter only
#define FIL_RUNOUT_PIN EXP2_05_PIN // Chiron Standard Adapter
#endif
#define HEATER_BED_PIN MOSFET_B_PIN // HEATER1
#endif
Expand All @@ -125,8 +157,10 @@
#endif

#if EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
#define BEEPER_PIN 31
#define SD_DETECT_PIN 49
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_03_PIN // Chiron Standard Adapter
#endif
#define SD_DETECT_PIN EXP2_07_PIN // Chiron Standard Adapter
#endif

#if HAS_TMC_UART
Expand All @@ -145,35 +179,3 @@
#endif

#include "pins_RAMPS.h"

//
// AnyCubic made the following changes to 1.1.0-RC8
// If these are appropriate for your LCD let us know.
//
#if 0 && HAS_WIRED_LCD

// LCD Display output pins
#if BOTH(IS_NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D6
#define LCD_PINS_D6 57
#endif

// LCD Display input pins
#if IS_NEWPANEL
#if EITHER(VIKI2, miniVIKI)
#undef DOGLCD_A0
#define DOGLCD_A0 23
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#undef BEEPER_PIN
#define BEEPER_PIN 33
#undef LCD_BACKLIGHT_PIN
#define LCD_BACKLIGHT_PIN 67
#endif
#elif ENABLED(MINIPANEL)
#undef BEEPER_PIN
#define BEEPER_PIN 33
#undef DOGLCD_A0
#define DOGLCD_A0 42
#endif

#endif // HAS_WIRED_LCD

0 comments on commit 02178bd

Please sign in to comment.