bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #10460 from thinkyhead/bf2_trigorilla_14

Browse Source 
[2.0.x] Split TRIGORILLA into 1.3 and 1.4
This commit is contained in:
Scott Lahteine
2018-04-20 18:25:40 -05:00
committed by GitHub
parent f0cbf3d432 186d71b361
commit a0dac95d25
7 changed files with 334 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/core/boards.h
View File

@ -61,7 +61,7 @@
#define BOARD_MKS_BASE 40 // MKS BASE v1.0
#define BOARD_MKS_BASE_15 405 // MKS v1.5 with Allegro A4982 stepper drivers
#define BOARD_MKS_BASE_HEROIC 41 // MKS BASE 1.0 with Heroic HR4982 stepper drivers
#define BOARD_MKS_GEN_13 47 // MKS v1.3 or 1.4
#define BOARD_MKS_GEN_13 47 // MKS GEN v1.3 or 1.4
#define BOARD_MKS_GEN_L 53 // MKS GEN L
#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica)
#define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like)
@ -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
//
@ -124,6 +125,7 @@
#define BOARD_MELZI_TRONXY 505 // Tronxy X5S
#define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1
#define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone)
//
// Other ATmega644P, ATmega644, ATmega1284P
@ -140,7 +142,6 @@
#define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board
#define BOARD_SETHI 20 // Sethi 3D_1
#define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone)
//
// Teensyduino - AT90USB1286, AT90USB1286P
@ -152,7 +153,7 @@
#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646)
#define BOARD_BRAINWAVE_PRO 85 // Brainwave Pro (AT90USB1286)
#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286)
#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: HARDWARE_MOTHERBOARD=84 make
#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286)
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
//

5
Marlin/src/inc/SanityCheck.h
View File

@ -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
/**

10
Marlin/src/pins/pins.h
View File

@ -136,8 +136,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
@ -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

4
Marlin/src/pins/pins_SANGUINOLOLU_11.h
View File

@ -114,7 +114,7 @@
#endif
#if MB(AZTEEG_X1) || MB(STB_11) || MB(CREALITY_ENDER) || ENABLED(IS_MELZI)
#if MB(AZTEEG_X1) || MB(STB_11) || ENABLED(IS_MELZI)
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
@ -187,7 +187,7 @@
#define DOGLCD_CS 17
#define LCD_BACKLIGHT_PIN 28 // PA3
#elif MB(CREALITY_ENDER)
#elif ENABLED(IS_MELZI)
#define BEEPER_PIN 27
#define DOGLCD_CS 28

40
Marlin/src/pins/pins_TRIGORILLA_13.h Normal file
View File

@ -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.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

10
Marlin/src/pins/pins_TRIGORILLA.h → Marlin/src/pins/pins_TRIGORILLA_14.h
View File

@ -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