From 2be5fe5ddf6d7bfbe7c685ae4efcd3ee74fd619b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 2 Apr 2018 22:11:38 -0500
Subject: [PATCH] Split TRIGORILLA into 1.3 and 1.4

---
 Marlin/src/core/boards.h             |  1 +
 Marlin/src/pins/pins.h               |  6 +++--
 Marlin/src/pins/pins_TRIGORILLA_13.h | 16 +++--------
 Marlin/src/pins/pins_TRIGORILLA_14.h | 40 ++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/pins/pins_TRIGORILLA_14.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 8382b4517..27737840e 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -77,6 +77,7 @@
 #define BOARD_BQ_ZUM_MEGA_3D    503   // bq ZUM Mega 3D
 #define BOARD_MAKEBOARD_MINI    431   // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
 #define BOARD_TRIGORILLA_13     343   // TriGorilla Anycubic version 1.3 based on RAMPS EFB
+#define BOARD_TRIGORILLA_14     443   // TriGorilla Anycubic version 1.4 based on RAMPS EFB
 #define BOARD_RAMPS_ENDER_4     243   // Creality: Ender-4, CR-8
 
 //
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index dad6397cc..71496e77e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -138,6 +138,10 @@
   #include "pins_MAKEBOARD_MINI.h"    // ATmega2560
 #elif MB(TRIGORILLA_13)
   #include "pins_TRIGORILLA_13.h"     // ATmega2560
+#elif MB(TRIGORILLA_14)
+  #include "pins_TRIGORILLA_14.h"     // ATmega2560
+#elif MB(RAMPS_ENDER_4)
+  #include "pins_RAMPS_ENDER_4.h"     // ATmega2560
 
 //
 // Other ATmega1280, ATmega2560
@@ -179,8 +183,6 @@
   #include "pins_GT2560_REV_A.h"      // ATmega1280, ATmega2560
 #elif MB(GT2560_REV_A_PLUS)
   #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
-#elif MB(RAMPS_ENDER_4)
-  #include "pins_RAMPS_ENDER_4.h"     // ATmega2560
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/pins_TRIGORILLA_13.h b/Marlin/src/pins/pins_TRIGORILLA_13.h
index 527c166c5..e876da467 100644
--- a/Marlin/src/pins/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/pins_TRIGORILLA_13.h
@@ -21,27 +21,19 @@
  */
 
 /**
- * Arduino Mega with RAMPS v1.4 for Anycubic
- *
- * Defines RAMPS_D44_PIN 44
- * Defines FAN_PIN RAMPS_D44_PIN or -1
+ * Arduino Mega with RAMPS v1.3 for Anycubic
  */
 
 #ifndef BOARD_NAME
-  #define BOARD_NAME "Anycubic RAMPS 1.4"
+  #define BOARD_NAME "Anycubic RAMPS 1.3"
 #endif
 
 #define IS_RAMPS_EFB
+#define RAMPS_D9_PIN       44
+#define ORIG_E0_AUTO_FAN_PIN RAMPS_D9_PIN
 
 #include "pins_RAMPS_13.h"
 
-#undef FAN_PIN
-#define RAMPS_D44_PIN      44
-#define FAN_PIN            RAMPS_D44_PIN
-
-#undef ORIG_E0_AUTO_FAN_PIN
-#define ORIG_E0_AUTO_FAN_PIN RAMPS_D44_PIN
-
 #undef E1_STEP_PIN
 #undef E1_DIR_PIN
 #undef E1_ENABLE_PIN
diff --git a/Marlin/src/pins/pins_TRIGORILLA_14.h b/Marlin/src/pins/pins_TRIGORILLA_14.h
new file mode 100644
index 000000000..3903e1dba
--- /dev/null
+++ b/Marlin/src/pins/pins_TRIGORILLA_14.h
@@ -0,0 +1,40 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ *
+ */
+
+/**
+ * Arduino Mega with RAMPS v1.4 for Anycubic
+ */
+
+#ifndef BOARD_NAME
+  #define BOARD_NAME "Anycubic RAMPS 1.4"
+#endif
+
+#define IS_RAMPS_EFB
+
+#include "pins_RAMPS_13.h"
+
+#define FAN2_PIN           44
+
+#undef E1_STEP_PIN
+#undef E1_DIR_PIN
+#undef E1_ENABLE_PIN
+#undef E1_CS_PIN