From 6ee2af5e2d6009871f3ca37a4eea3f7e8d876667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Brandst=C3=A4tter-M=C3=BCller?=
 <hannes.mueller@gmail.com>
Date: Sun, 21 Oct 2018 10:23:20 +0200
Subject: [PATCH] Simplify pins_TRIGORILLA_14.h (#12162)

---
 Marlin/src/pins/pins_TRIGORILLA_14.h | 40 ++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/pins/pins_TRIGORILLA_14.h b/Marlin/src/pins/pins_TRIGORILLA_14.h
index 3244cf278e..afadbe0d55 100644
--- a/Marlin/src/pins/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/pins_TRIGORILLA_14.h
@@ -28,20 +28,44 @@
   #define BOARD_NAME "Anycubic RAMPS 1.4"
 #endif
 
-// Remap MOSFET pins to common usages
-#if HOTENDS > 1
-  #define RAMPS_D9_PIN     45   // EEB, EEF
+// Labeled pins
+#define TRIGORILLA_HEATER_BED_PIN  8
+#define TRIGORILLA_HEATER_0_PIN   10
+#define TRIGORILLA_HEATER_1_PIN   45   // Anycubic Kossel: Unused
+
+#define TRIGORILLA_FAN0_PIN        9   // Anycubic Kossel: Usually the part cooling fan
+#define TRIGORILLA_FAN1_PIN        7   // Anycubic Kossel: Unused
+#define TRIGORILLA_FAN2_PIN       44   // Anycubic Kossel: Hotend fan
+
+// Remap MOSFET pins to common usages:
+
+#define RAMPS_D10_PIN    TRIGORILLA_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   TRIGORILLA_HEATER_1_PIN
   #if !TEMP_SENSOR_BED
-    #define RAMPS_D8_PIN    9   // EEF
+    // EEF
+    #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN
+  #else
+    // EEB
+    #define RAMPS_D8_PIN TRIGORILLA_HEATER_BED_PIN
+    #define FAN_PIN      TRIGORILLA_FAN0_PIN    // Override pin 4 in pins_RAMPS.h
   #endif
 #elif TEMP_SENSOR_BED
-  #define FAN1_PIN          7   // EFB
+  // EFB (Anycubic Kossel default)
+  #define RAMPS_D9_PIN   TRIGORILLA_FAN0_PIN
+  #define RAMPS_D8_PIN   TRIGORILLA_HEATER_BED_PIN
 #else
-  #define FAN2_PIN         44   // EFF
+  // EFF
+  #define RAMPS_D9_PIN   TRIGORILLA_FAN1_PIN
+  #define RAMPS_D8_PIN   TRIGORILLA_FAN0_PIN
 #endif
 
-// D44 - Typical Extruder Fan on Anycubic Delta devices
-#define ORIG_E0_AUTO_FAN_PIN 44
+#if HOTENDS > 1 || TEMP_SENSOR_BED      // EEF, EEB, EFB
+  #define FAN1_PIN       TRIGORILLA_FAN1_PIN
+#endif
+#define FAN2_PIN         TRIGORILLA_FAN2_PIN
+#define ORIG_E0_AUTO_FAN_PIN TRIGORILLA_FAN2_PIN  // Used in Anycubic Kossel example config
 
 #include "pins_RAMPS.h"