andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #10460 from thinkyhead/bf2_trigorilla_14 

[2.0.x] Split TRIGORILLA into 1.3 and 1.4
pull/1/head
Scott Lahteine 7 years ago
committed by GitHub
parent
f0cbf3d432 186d71b361
commit
a0dac95d25
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 309 additions and 290 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 391
      Marlin/Makefile
  2. 9
      Marlin/src/core/boards.h
  3. 3
      Marlin/src/inc/SanityCheck.h
  4. 10
      Marlin/src/pins/pins.h
  5. 4
      Marlin/src/pins/pins_SANGUINOLOLU_11.h
  6. 40
      Marlin/src/pins/pins_TRIGORILLA_13.h
  7. 10
      Marlin/src/pins/pins_TRIGORILLA_14.h

391
Marlin/Makefile
View File

@ -113,320 +113,297 @@ endif
# HARDWARE_VARIANT = "arduino", "Sanguino", "Gen7", ... # HARDWARE_VARIANT = "arduino", "Sanguino", "Gen7", ...
# MCU = "atmega1280", "Mega2560", "atmega2560", "atmega644p", ... # MCU = "atmega1280", "Mega2560", "atmega2560", "atmega644p", ...
#Gen7 ifeq ($(HARDWARE_MOTHERBOARD),0)
ifeq ($(HARDWARE_MOTHERBOARD),10)
HARDWARE_VARIANT ?= Gen7 # No motherboard selected
MCU ?= atmega644
F_CPU ?= 20000000 #
else ifeq ($(HARDWARE_MOTHERBOARD),11) # RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560
HARDWARE_VARIANT ?= Gen7 #
MCU ?= atmega644p
F_CPU ?= 20000000
else ifeq ($(HARDWARE_MOTHERBOARD),12)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega644p
F_CPU ?= 20000000
else ifeq ($(HARDWARE_MOTHERBOARD),13)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega1284p
F_CPU ?= 20000000
#RAMPS # MEGA/RAMPS up to 1.2
else ifeq ($(HARDWARE_MOTHERBOARD),3) else ifeq ($(HARDWARE_MOTHERBOARD),3)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560 # RAMPS 1.3 (Power outputs: Hotend, Fan, Bed)
else ifeq ($(HARDWARE_MOTHERBOARD),33) else ifeq ($(HARDWARE_MOTHERBOARD),33)
HARDWARE_VARIANT ?= arduino # RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Bed)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),34) else ifeq ($(HARDWARE_MOTHERBOARD),34)
HARDWARE_VARIANT ?= arduino # RAMPS 1.3 (Power outputs: Hotend, Fan0, Fan1)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),35) else ifeq ($(HARDWARE_MOTHERBOARD),35)
HARDWARE_VARIANT ?= arduino # RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),36) else ifeq ($(HARDWARE_MOTHERBOARD),36)
HARDWARE_VARIANT ?= arduino # RAMPS 1.3 (Power outputs: Spindle, Controller Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),38) else ifeq ($(HARDWARE_MOTHERBOARD),38)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560 # RAMPS 1.4 (Power outputs: Hotend, Fan, Bed)
else ifeq ($(HARDWARE_MOTHERBOARD),43) else ifeq ($(HARDWARE_MOTHERBOARD),43)
HARDWARE_VARIANT ?= arduino # RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Bed)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),44) else ifeq ($(HARDWARE_MOTHERBOARD),44)
HARDWARE_VARIANT ?= arduino # RAMPS 1.4 (Power outputs: Hotend, Fan0, Fan1)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),45) else ifeq ($(HARDWARE_MOTHERBOARD),45)
HARDWARE_VARIANT ?= arduino # RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),46) else ifeq ($(HARDWARE_MOTHERBOARD),46)
HARDWARE_VARIANT ?= arduino # RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),48) else ifeq ($(HARDWARE_MOTHERBOARD),48)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
#RAMPS equivalents # RAMPS Plus 3DYMY (Power outputs: Hotend, Fan, Bed)
else ifeq ($(HARDWARE_MOTHERBOARD),143) else ifeq ($(HARDWARE_MOTHERBOARD),143)
HARDWARE_VARIANT ?= arduino # RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Bed)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),144) else ifeq ($(HARDWARE_MOTHERBOARD),144)
HARDWARE_VARIANT ?= arduino # RAMPS Plus 3DYMY (Power outputs: Hotend, Fan0, Fan1)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),145) else ifeq ($(HARDWARE_MOTHERBOARD),145)
HARDWARE_VARIANT ?= arduino # RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),146) else ifeq ($(HARDWARE_MOTHERBOARD),146)
HARDWARE_VARIANT ?= arduino # RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),148) else ifeq ($(HARDWARE_MOTHERBOARD),148)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560 #
# RAMPS Derivatives - ATmega1280, ATmega2560
#
# 3Drag Controller
else ifeq ($(HARDWARE_MOTHERBOARD),77) else ifeq ($(HARDWARE_MOTHERBOARD),77)
HARDWARE_VARIANT ?= arduino # Velleman K8200 Controller (derived from 3Drag Controller)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),78) else ifeq ($(HARDWARE_MOTHERBOARD),78)
HARDWARE_VARIANT ?= arduino # Velleman K8400 Controller (derived from 3Drag Controller)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),79) else ifeq ($(HARDWARE_MOTHERBOARD),79)
HARDWARE_VARIANT ?= arduino # 2PrintBeta BAM&DICE with STK drivers
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),401) else ifeq ($(HARDWARE_MOTHERBOARD),401)
HARDWARE_VARIANT ?= arduino # 2PrintBeta BAM&DICE Due with STK drivers
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),402) else ifeq ($(HARDWARE_MOTHERBOARD),402)
HARDWARE_VARIANT ?= arduino # MKS BASE v1.0
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),40) else ifeq ($(HARDWARE_MOTHERBOARD),40)
HARDWARE_VARIANT ?= arduino # MKS v1.5 with Allegro A4982 stepper drivers
MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),405)
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
else ifeq ($(HARDWARE_MOTHERBOARD),41) else ifeq ($(HARDWARE_MOTHERBOARD),41)
HARDWARE_VARIANT ?= arduino # MKS GEN v1.3 or 1.4
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),47) else ifeq ($(HARDWARE_MOTHERBOARD),47)
HARDWARE_VARIANT ?= arduino # MKS GEN L
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),53) else ifeq ($(HARDWARE_MOTHERBOARD),53)
HARDWARE_VARIANT ?= arduino # zrib V2.0 control board (Chinese knock off RAMPS replica)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),504) else ifeq ($(HARDWARE_MOTHERBOARD),504)
HARDWARE_VARIANT ?= arduino # Felix 2.0+ Electronics Board (RAMPS like)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),37) else ifeq ($(HARDWARE_MOTHERBOARD),37)
HARDWARE_VARIANT ?= arduino # Invent-A-Part RigidBoard
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),42) else ifeq ($(HARDWARE_MOTHERBOARD),42)
HARDWARE_VARIANT ?= arduino # Invent-A-Part RigidBoard V2
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),52) else ifeq ($(HARDWARE_MOTHERBOARD),52)
HARDWARE_VARIANT ?= arduino # Sainsmart 2-in-1 board
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),49) else ifeq ($(HARDWARE_MOTHERBOARD),49)
HARDWARE_VARIANT ?= arduino # Ultimaker
MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),7)
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
else ifeq ($(HARDWARE_MOTHERBOARD),71)
MCU ?= atmega1280
# Azteeg X3
else ifeq ($(HARDWARE_MOTHERBOARD),67)
# Azteeg X3 Pro
else ifeq ($(HARDWARE_MOTHERBOARD),68)
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
else ifeq ($(HARDWARE_MOTHERBOARD),72) else ifeq ($(HARDWARE_MOTHERBOARD),72)
HARDWARE_VARIANT ?= arduino # Rumba
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),80) else ifeq ($(HARDWARE_MOTHERBOARD),80)
HARDWARE_VARIANT ?= arduino # bq ZUM Mega 3D
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),503) else ifeq ($(HARDWARE_MOTHERBOARD),503)
HARDWARE_VARIANT ?= arduino # MakeBoard Mini v2.1.2 is a control board sold by MicroMake
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),431) else ifeq ($(HARDWARE_MOTHERBOARD),431)
HARDWARE_VARIANT ?= arduino # TriGorilla Anycubic version 1.3 based on RAMPS EFB
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),343) else ifeq ($(HARDWARE_MOTHERBOARD),343)
HARDWARE_VARIANT ?= arduino # TriGorilla Anycubic version 1.4 based on RAMPS EFB
MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),443)
# Creality: Ender-4, CR-8
else ifeq ($(HARDWARE_MOTHERBOARD),243) else ifeq ($(HARDWARE_MOTHERBOARD),243)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
#Other ATmega1280, ATmega2560 #
# Other ATmega1280, ATmega2560
#
# Cartesio CN Controls V11
else ifeq ($(HARDWARE_MOTHERBOARD),111) else ifeq ($(HARDWARE_MOTHERBOARD),111)
HARDWARE_VARIANT ?= arduino # Cartesio CN Controls V12
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),112) else ifeq ($(HARDWARE_MOTHERBOARD),112)
HARDWARE_VARIANT ?= arduino # Cheaptronic v1.0
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),2) else ifeq ($(HARDWARE_MOTHERBOARD),2)
HARDWARE_VARIANT ?= arduino # Cheaptronic v2.0
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),21) else ifeq ($(HARDWARE_MOTHERBOARD),21)
HARDWARE_VARIANT ?= arduino # Makerbot Mightyboard Revision E
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),200) else ifeq ($(HARDWARE_MOTHERBOARD),200)
HARDWARE_VARIANT ?= arduino # Megatronics
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),70) else ifeq ($(HARDWARE_MOTHERBOARD),70)
HARDWARE_VARIANT ?= arduino # Megatronics v2.0
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),701) else ifeq ($(HARDWARE_MOTHERBOARD),701)
HARDWARE_VARIANT ?= arduino # Megatronics v3.0
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),703) else ifeq ($(HARDWARE_MOTHERBOARD),703)
HARDWARE_VARIANT ?= arduino # Megatronics v3.1
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),704) else ifeq ($(HARDWARE_MOTHERBOARD),704)
HARDWARE_VARIANT ?= arduino # Rambo
MCU ?= atmega2560 else ifeq ($(HARDWARE_MOTHERBOARD),301)
# Mini-Rambo
else ifeq ($(HARDWARE_MOTHERBOARD),302) else ifeq ($(HARDWARE_MOTHERBOARD),302)
HARDWARE_VARIANT ?= arduino # Mini-Rambo 1.0a
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),303) else ifeq ($(HARDWARE_MOTHERBOARD),303)
HARDWARE_VARIANT ?= arduino # Einsy Rambo
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),304) else ifeq ($(HARDWARE_MOTHERBOARD),304)
HARDWARE_VARIANT ?= arduino # Einsy Retro
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),305) else ifeq ($(HARDWARE_MOTHERBOARD),305)
HARDWARE_VARIANT ?= arduino # Elefu Ra Board (v3)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),21) else ifeq ($(HARDWARE_MOTHERBOARD),21)
HARDWARE_VARIANT ?= arduino # Leapfrog
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),999) else ifeq ($(HARDWARE_MOTHERBOARD),999)
HARDWARE_VARIANT ?= arduino # Mega controller
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),310) else ifeq ($(HARDWARE_MOTHERBOARD),310)
HARDWARE_VARIANT ?= arduino # abee Scoovo X9H
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),321) else ifeq ($(HARDWARE_MOTHERBOARD),321)
HARDWARE_VARIANT ?= arduino # Geeetech GT2560 Rev. A
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),74) else ifeq ($(HARDWARE_MOTHERBOARD),74)
HARDWARE_VARIANT ?= arduino # Geeetech GT2560 Rev. A+ (with auto level probe)
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),75) else ifeq ($(HARDWARE_MOTHERBOARD),75)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
#Gen6 #
else ifeq ($(HARDWARE_MOTHERBOARD),5) # ATmega1281, ATmega2561
HARDWARE_VARIANT ?= Gen6 #
MCU ?= atmega644p
else ifeq ($(HARDWARE_MOTHERBOARD),51) else ifeq ($(HARDWARE_MOTHERBOARD),702)
HARDWARE_VARIANT ?= Gen6 MCU ?= atmega1281
MCU ?= atmega644p else ifeq ($(HARDWARE_MOTHERBOARD),25)
MCU ?= atmega1281
#
# Sanguinololu and Derivatives - ATmega644P, ATmega1284P
#
#Sanguinololu # Sanguinololu < 1.2
else ifeq ($(HARDWARE_MOTHERBOARD),6) else ifeq ($(HARDWARE_MOTHERBOARD),6)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p MCU ?= atmega644p
# Sanguinololu 1.2 and above
else ifeq ($(HARDWARE_MOTHERBOARD),62) else ifeq ($(HARDWARE_MOTHERBOARD),62)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p MCU ?= atmega644p
# Melzi
else ifeq ($(HARDWARE_MOTHERBOARD),63) else ifeq ($(HARDWARE_MOTHERBOARD),63)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p MCU ?= atmega644p
else ifeq ($(HARDWARE_MOTHERBOARD),64) # Melzi with ATmega1284 (MaKr3d version)
else ifeq ($(HARDWARE_MOTHERBOARD),66)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),65) # Melzi Creality3D board (for CR-10 etc)
else ifeq ($(HARDWARE_MOTHERBOARD),89)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),66) # Melzi Malyan M150 board
else ifeq ($(HARDWARE_MOTHERBOARD),92)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),69) # Tronxy X5S
else ifeq ($(HARDWARE_MOTHERBOARD),505)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),89) # STB V1.1
else ifeq ($(HARDWARE_MOTHERBOARD),64)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),92) # Azteeg X1
else ifeq ($(HARDWARE_MOTHERBOARD),65)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),505) # Anet 1.0 (Melzi clone)
else ifeq ($(HARDWARE_MOTHERBOARD),69)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega1284p MCU ?= atmega1284p
else ifeq ($(HARDWARE_MOTHERBOARD),601)
#
# Other ATmega644P, ATmega644, ATmega1284P
#
# Gen3 Monolithic Electronics
else ifeq ($(HARDWARE_MOTHERBOARD),22)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
# Gen3+
else ifeq ($(HARDWARE_MOTHERBOARD),9)
HARDWARE_VARIANT ?= Sanguino HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
# Gen6
else ifeq ($(HARDWARE_MOTHERBOARD),5)
HARDWARE_VARIANT ?= Gen6
MCU ?= atmega644p
# Gen6 deluxe
else ifeq ($(HARDWARE_MOTHERBOARD),51)
HARDWARE_VARIANT ?= Gen6
MCU ?= atmega644p
# Gen7 custom (Alfons3 Version)
else ifeq ($(HARDWARE_MOTHERBOARD),10)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega644
F_CPU ?= 20000000
# Gen7 v1.1, v1.2
else ifeq ($(HARDWARE_MOTHERBOARD),11)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega644p
F_CPU ?= 20000000
# Gen7 v1.3
else ifeq ($(HARDWARE_MOTHERBOARD),12)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega644p
F_CPU ?= 20000000
# Gen7 v1.4
else ifeq ($(HARDWARE_MOTHERBOARD),13)
HARDWARE_VARIANT ?= Gen7
MCU ?= atmega1284p MCU ?= atmega1284p
F_CPU ?= 20000000
# Alpha OMCA board
else ifeq ($(HARDWARE_MOTHERBOARD),90)
HARDWARE_VARIANT ?= SanguinoA
MCU ?= atmega644
# Final OMCA board
else ifeq ($(HARDWARE_MOTHERBOARD),91)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
# Sethi 3D_1
else ifeq ($(HARDWARE_MOTHERBOARD),20)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
#Ultimaker #
else ifeq ($(HARDWARE_MOTHERBOARD),7) # Teensyduino - AT90USB1286, AT90USB1286P
HARDWARE_VARIANT ?= arduino #
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),71)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega1280
#ATmega1281, ATmega2561
else ifeq ($(HARDWARE_MOTHERBOARD),702)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega1281
else ifeq ($(HARDWARE_MOTHERBOARD),25)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega1281
#Teensylu # Teensylu
else ifeq ($(HARDWARE_MOTHERBOARD),8) else ifeq ($(HARDWARE_MOTHERBOARD),8)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
# Printrboard (AT90USB1286)
else ifeq ($(HARDWARE_MOTHERBOARD),81) else ifeq ($(HARDWARE_MOTHERBOARD),81)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
# Printrboard Revision F (AT90USB1286)
else ifeq ($(HARDWARE_MOTHERBOARD),811) else ifeq ($(HARDWARE_MOTHERBOARD),811)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
# Brainwave (AT90USB646)
else ifeq ($(HARDWARE_MOTHERBOARD),82) else ifeq ($(HARDWARE_MOTHERBOARD),82)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb646 MCU ?= at90usb646
# Brainwave Pro (AT90USB1286)
else ifeq ($(HARDWARE_MOTHERBOARD),83) else ifeq ($(HARDWARE_MOTHERBOARD),83)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
# SAV Mk-I (AT90USB1286)
else ifeq ($(HARDWARE_MOTHERBOARD),84) else ifeq ($(HARDWARE_MOTHERBOARD),84)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
# Teensy++2.0 (AT90USB1286)
else ifeq ($(HARDWARE_MOTHERBOARD),85)
HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286
# 5DPrint D8 Driver Board
else ifeq ($(HARDWARE_MOTHERBOARD),88) else ifeq ($(HARDWARE_MOTHERBOARD),88)
HARDWARE_VARIANT ?= Teensy HARDWARE_VARIANT ?= Teensy
MCU ?= at90usb1286 MCU ?= at90usb1286
#Gen3+
else ifeq ($(HARDWARE_MOTHERBOARD),9)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
#Gen3 Monolithic Electronics
else ifeq ($(HARDWARE_MOTHERBOARD),22)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
#Megatronics
else ifeq ($(HARDWARE_MOTHERBOARD),70)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
#Alpha OMCA board
else ifeq ($(HARDWARE_MOTHERBOARD),90)
HARDWARE_VARIANT ?= SanguinoA
MCU ?= atmega644
#Final OMCA board
else ifeq ($(HARDWARE_MOTHERBOARD),91)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
#Sethi 3D_1
else ifeq ($(HARDWARE_MOTHERBOARD),20)
HARDWARE_VARIANT ?= Sanguino
MCU ?= atmega644p
#Rambo
else ifeq ($(HARDWARE_MOTHERBOARD),301)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
#Azteeg
else ifeq ($(HARDWARE_MOTHERBOARD),67)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
else ifeq ($(HARDWARE_MOTHERBOARD),68)
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
endif endif
# Be sure to regenerate speed_lookuptable.h with create_speed_lookuptable.py # Be sure to regenerate speed_lookuptable.h with create_speed_lookuptable.py
@ -434,6 +411,10 @@ endif
# Set to 16Mhz if not yet set. # Set to 16Mhz if not yet set.
F_CPU ?= 16000000 F_CPU ?= 16000000
# Set to arduino, ATmega2560 if not yet set.
HARDWARE_VARIANT ?= arduino
MCU ?= atmega2560
# Arduino contained the main source code for the Arduino # Arduino contained the main source code for the Arduino
# Libraries, the "hardware variant" are for boards # Libraries, the "hardware variant" are for boards
# that derives from that, and their source are present in # that derives from that, and their source are present in

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 40 // MKS BASE v1.0
#define BOARD_MKS_BASE_15 405 // MKS v1.5 with Allegro A4982 stepper drivers #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_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_MKS_GEN_L 53 // MKS GEN L
#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) #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) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like)
@ -76,7 +76,8 @@
#define BOARD_RUMBA 80 // Rumba #define BOARD_RUMBA 80 // Rumba
#define BOARD_BQ_ZUM_MEGA_3D 503 // bq ZUM Mega 3D #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_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 #define BOARD_RAMPS_ENDER_4 243 // Creality: Ender-4, CR-8
// //
@ -124,6 +125,7 @@
#define BOARD_MELZI_TRONXY 505 // Tronxy X5S #define BOARD_MELZI_TRONXY 505 // Tronxy X5S
#define BOARD_STB_11 64 // STB V1.1 #define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1 #define BOARD_AZTEEG_X1 65 // Azteeg X1
#define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone)
// //
// Other ATmega644P, ATmega644, ATmega1284P // Other ATmega644P, ATmega644, ATmega1284P
@ -140,7 +142,6 @@
#define BOARD_OMCA_A 90 // Alpha OMCA board #define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board #define BOARD_OMCA 91 // Final OMCA board
#define BOARD_SETHI 20 // Sethi 3D_1 #define BOARD_SETHI 20 // Sethi 3D_1
#define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone)
// //
// Teensyduino - AT90USB1286, AT90USB1286P // Teensyduino - AT90USB1286, AT90USB1286P
@ -152,7 +153,7 @@
#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646) #define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646)
#define BOARD_BRAINWAVE_PRO 85 // Brainwave Pro (AT90USB1286) #define BOARD_BRAINWAVE_PRO 85 // Brainwave Pro (AT90USB1286)
#define BOARD_SAV_MKI 83 // SAV Mk-I (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 #define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
// //

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

@ -273,8 +273,11 @@
#endif #endif
#define BOARD_MKS_13 -47 #define BOARD_MKS_13 -47
#define BOARD_TRIGORILLA -343
#if MB(MKS_13) #if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration." #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 #endif
/** /**

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

@ -136,8 +136,12 @@
#include "pins_BQ_ZUM_MEGA_3D.h" // ATmega2560 #include "pins_BQ_ZUM_MEGA_3D.h" // ATmega2560
#elif MB(MAKEBOARD_MINI) #elif MB(MAKEBOARD_MINI)
#include "pins_MAKEBOARD_MINI.h" // ATmega2560 #include "pins_MAKEBOARD_MINI.h" // ATmega2560
#elif MB(TRIGORILLA) #elif MB(TRIGORILLA_13)
#include "pins_TRIGORILLA.h" // ATmega2560 #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 // Other ATmega1280, ATmega2560
@ -179,8 +183,6 @@
#include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 #include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560
#elif MB(GT2560_REV_A_PLUS) #elif MB(GT2560_REV_A_PLUS)
#include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
#elif MB(RAMPS_ENDER_4)
#include "pins_RAMPS_ENDER_4.h" // ATmega2560
// //
// ATmega1281, ATmega2561 // ATmega1281, ATmega2561

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

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

40
Marlin/src/pins/pins_TRIGORILLA_13.h
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 * Arduino Mega with RAMPS v1.4 for Anycubic
*
* Defines RAMPS_D44_PIN 44
* Defines FAN_PIN RAMPS_D44_PIN or -1
*/ */
#ifndef BOARD_NAME #ifndef BOARD_NAME
@ -35,12 +32,7 @@
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#undef FAN_PIN #define FAN2_PIN 44
#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_STEP_PIN
#undef E1_DIR_PIN #undef E1_DIR_PIN
Write Preview
Loading…
Cancel
Save