From c6ecfc1429845099c67e655dbb657a2c50eb5bcb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 Apr 2018 19:27:11 -0500 Subject: [PATCH] [1.1.x] Split TRIGORILLA into 1.3 and 1.4 (#10468) --- Marlin/Makefile | 2 + Marlin/SanityCheck.h | 5 ++- Marlin/boards.h | 3 +- Marlin/pins.h | 10 +++-- Marlin/pins_TRIGORILLA_13.h | 40 +++++++++++++++++++ ...pins_TRIGORILLA.h => pins_TRIGORILLA_14.h} | 10 +---- 6 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 Marlin/pins_TRIGORILLA_13.h rename Marlin/{pins_TRIGORILLA.h => pins_TRIGORILLA_14.h} (82%) diff --git a/Marlin/Makefile b/Marlin/Makefile index dff2e63d9..dfa65b760 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -193,6 +193,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),503) else ifeq ($(HARDWARE_MOTHERBOARD),431) # TriGorilla Anycubic version 1.3 based on RAMPS EFB else ifeq ($(HARDWARE_MOTHERBOARD),343) +# TriGorilla Anycubic version 1.4 based on RAMPS EFB +else ifeq ($(HARDWARE_MOTHERBOARD),443) # Creality: Ender-4, CR-8 else ifeq ($(HARDWARE_MOTHERBOARD),243) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 260ac46f8..2393f725f 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -272,9 +272,12 @@ #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH. Please update your configuration." #endif -#define BOARD_MKS_13 -47 +#define BOARD_MKS_13 -47 +#define BOARD_TRIGORILLA -343 #if MB(MKS_13) #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration." +#elif MB(BOARD_TRIGORILLA) + #error "BOARD_TRIGORILLA has been renamed BOARD_TRIGORILLA_13. Please update your configuration." #endif /** diff --git a/Marlin/boards.h b/Marlin/boards.h index f9cf242b6..a7aceff08 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -76,7 +76,8 @@ #define BOARD_RUMBA 80 // Rumba #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 343 // TriGorilla Anycubic version 1.3 based on RAMPS EFB +#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/pins.h b/Marlin/pins.h index 593888fe7..9cad2557a 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -134,8 +134,12 @@ #include "pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 #elif MB(MAKEBOARD_MINI) #include "pins_MAKEBOARD_MINI.h" // ATmega2560 -#elif MB(TRIGORILLA) - #include "pins_TRIGORILLA.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 @@ -177,8 +181,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/pins_TRIGORILLA_13.h b/Marlin/pins_TRIGORILLA_13.h new file mode 100644 index 000000000..e876da467 --- /dev/null +++ b/Marlin/pins_TRIGORILLA_13.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 . + * + */ + +/** + * Arduino Mega with RAMPS v1.3 for Anycubic + */ + +#ifndef BOARD_NAME + #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 E1_STEP_PIN +#undef E1_DIR_PIN +#undef E1_ENABLE_PIN +#undef E1_CS_PIN diff --git a/Marlin/pins_TRIGORILLA.h b/Marlin/pins_TRIGORILLA_14.h similarity index 82% rename from Marlin/pins_TRIGORILLA.h rename to Marlin/pins_TRIGORILLA_14.h index 527c166c5..3903e1dba 100644 --- a/Marlin/pins_TRIGORILLA.h +++ b/Marlin/pins_TRIGORILLA_14.h @@ -22,9 +22,6 @@ /** * Arduino Mega with RAMPS v1.4 for Anycubic - * - * Defines RAMPS_D44_PIN 44 - * Defines FAN_PIN RAMPS_D44_PIN or -1 */ #ifndef BOARD_NAME @@ -35,12 +32,7 @@ #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 +#define FAN2_PIN 44 #undef E1_STEP_PIN #undef E1_DIR_PIN