Merge upstream changes from Marlin 2.1.1

Marlin/src/pins/ramps/pins_TRIGORILLA_14.h

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
@@ -38,60 +38,78 @@
 #endif
 
 //
-// Custom Limit Switches
+// PWM FETS
+//
+#if EITHER(FET_ORDER_EEF, FET_ORDER_EEB)
+  #define MOSFET_B_PIN                        45  // HEATER1
+#elif FET_ORDER_EFB
+  #define MOSFET_B_PIN                         9  // FAN0
+#else
+  #define MOSFET_B_PIN                         7  // FAN1
+#endif
+
+#if FET_ORDER_EEB
+  #define MOSFET_C_PIN                         8  // BED
+#elif FET_ORDER_EFB
+  #if DISABLED(ANYCUBIC_LCD_CHIRON)
+    #define MOSFET_C_PIN                       8
+  #else
+    #define MOSFET_C_PIN                      45
+  #endif
+#else                                             // EEF, EFF
+  #define MOSFET_C_PIN                         9
+#endif
+
+#if FET_ORDER_EEB
+  #define FAN_PIN                              9  // Override pin 4 in pins_RAMPS.h
+#endif
+
+//
+// Heaters / Fans
+//
+#if ANY(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFB)
+#define FAN1_PIN                             7
+#endif
+#define FAN2_PIN                              44
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                     44  // Used in Anycubic Kossel example config
+#endif
+#if ENABLED(ANYCUBIC_LCD_I3MEGA)
+  #define CONTROLLER_FAN_PIN                   7
+#endif
+
+//
+// AnyCubic standard pin mappings
+//
+//  On most printers, endstops are NOT all wired to the appropriate pins on the Trigorilla board.
+//  For instance, on a Chiron, Y axis goes to an aux connector.
+//  There are also other things that have been wired in creative ways.
+//  To enable PIN definitions for a specific printer model, #define the appropriate symbol after
+//  MOTHERBOARD in Configuration.h
+
+//
+// Limit Switches
 //
 //#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
+
 #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
   #define X_MAX_PIN                           43
-  #define Y_MIN_PIN                           19
-#endif
-
-// Labeled pins
-#define TG_HEATER_BED_PIN                      8
-#define TG_HEATER_0_PIN                       10
-#define TG_HEATER_1_PIN                       45  // Anycubic Kossel: Unused
-
-#define TG_FAN0_PIN                            9  // Anycubic Kossel: Usually the part cooling fan
-#define TG_FAN1_PIN                            7  // Anycubic Kossel: Unused
-#define TG_FAN2_PIN                           44  // Anycubic Kossel: Hotend fan
-#define CONTROLLER_FAN_PIN  		              TG_FAN1_PIN
-#define FIL_RUNOUT_PIN                        19
-#define BEEPER_PIN                            31
-#define SDSS                                  53
-#define LED_PIN                               13
-#define SD_DETECT_PIN                         49
-// Remap MOSFET pins to common usages:
-
-#define RAMPS_D10_PIN            TG_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
-
-#if HOTENDS > 1                                   // EEF and EEB
-  #define RAMPS_D9_PIN           TG_HEATER_1_PIN
-  #if !TEMP_SENSOR_BED
-    // EEF
-    #define RAMPS_D8_PIN             TG_FAN0_PIN
-  #else
-    // EEB
-    #define RAMPS_D8_PIN       TG_HEATER_BED_PIN
-    #define FAN_PIN                  TG_FAN0_PIN  // Override pin 4 in pins_RAMPS.h
+  #define Y_STOP_PIN                          19
+#elif EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
+  #define Y_STOP_PIN                          42
+  #define Z2_MIN_PIN                          43
+  #ifndef Z_MIN_PROBE_PIN
+    #define Z_MIN_PROBE_PIN                    2
   #endif
-#elif TEMP_SENSOR_BED
-  // EFB (Anycubic Kossel default)
-  #define RAMPS_D9_PIN               TG_FAN0_PIN
-  #define RAMPS_D8_PIN         TG_HEATER_BED_PIN
-#else
-  // EFF
-  #define RAMPS_D9_PIN               TG_FAN1_PIN
-  #define RAMPS_D8_PIN               TG_FAN0_PIN
-#endif
-
-#if HOTENDS > 1 || TEMP_SENSOR_BED                // EEF, EEB, EFB
-  #define FAN1_PIN                   TG_FAN1_PIN
-#endif
-#define FAN2_PIN                TG_FAN2_PIN
-
-#ifdef POWER_OUTAGE_TEST
-  #define OUTAGETEST_PIN       79
-  #define OUTAGECON_PIN        58
+  #ifndef FIL_RUNOUT_PIN
+    #if ENABLED(ANYCUBIC_LCD_CHIRON)
+      #define FIL_RUNOUT_PIN                  33
+    #else
+      #define FIL_RUNOUT_PIN                  19
+    #endif
+  #endif
+  #define BEEPER_PIN                          31
+  #define SD_DETECT_PIN                       49
 #endif
 
 #include "pins_RAMPS.h"
@@ -100,17 +118,17 @@
 // AnyCubic made the following changes to 1.1.0-RC8
 // If these are appropriate for your LCD let us know.
 //
-#if 0 && HAS_SPI_LCD
+#if 0 && HAS_WIRED_LCD
 
   // LCD Display output pins
-  #if BOTH(NEWPANEL, PANEL_ONE)
+  #if BOTH(IS_NEWPANEL, PANEL_ONE)
     #undef LCD_PINS_D6
     #define LCD_PINS_D6                       57
   #endif
 
   // LCD Display input pins
-  #if ENABLED(NEWPANEL)
-    #if ANY(VIKI2, miniVIKI)
+  #if IS_NEWPANEL
+    #if EITHER(VIKI2, miniVIKI)
       #undef DOGLCD_A0
       #define DOGLCD_A0                       23
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -126,4 +144,4 @@
     #define DOGLCD_A0                         42
   #endif
 
-#endif // HAS_SPI_LCD
+#endif // HAS_WIRED_LCD