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

Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_granty_fix_15017

Browse Source
This commit is contained in:
Scott Lahteine
2019-08-23 23:45:37 -05:00
parent 9d8e3d4d6f f2ad1ceb13
commit 09ee5a5da1
640 changed files with 36424 additions and 4761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/mega/pins_CHEAPTRONIC.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Cheaptronic v1.0"
#define BOARD_INFO_NAME "Cheaptronic v1.0"
//
// Limit Switches
//

2
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
View File

@ -31,7 +31,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Cheaptronic v2.0"
#define BOARD_INFO_NAME "Cheaptronic v2.0"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_CNCONTROLS_11.h
View File

@ -6,7 +6,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "CN Controls V11"
#define BOARD_INFO_NAME "CN Controls V11"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_CNCONTROLS_12.h
View File

@ -6,7 +6,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "CN Controls V12"
#define BOARD_INFO_NAME "CN Controls V12"
//
// Limit Switches

86
Marlin/src/pins/mega/pins_CNCONTROLS_15.h Normal file
View File

@ -0,0 +1,86 @@
/**
* CNControls V15 for HMS434 pin assignments
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_INFO_NAME "CN Controls V15"
//
// Servos
//
#define SERVO0_PIN 6
//
// Limit Switches
//
#define X_STOP_PIN 34
#define Y_STOP_PIN 39
#define Z_STOP_PIN 62
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 49
#endif
//
// Steppers
//
#define X_STEP_PIN 14
#define X_DIR_PIN 25
#define X_ENABLE_PIN 26
#define Y_STEP_PIN 11
#define Y_DIR_PIN 12
#define Y_ENABLE_PIN 15
#define Z_STEP_PIN 24
#define Z_DIR_PIN 27
#define Z_ENABLE_PIN 28
#define E0_STEP_PIN 64
#define E0_DIR_PIN 65
#define E0_ENABLE_PIN 63
//
// Temperature Sensors
// Analog Inputs
//
#define TEMP_0_PIN 2 // Analog Input
#define TEMP_BED_PIN 4 // Analog Input
#define TEMP_CHAMBER_PIN 5 // Analog Input
//
// Heaters
//
#define HEATER_0_PIN 4
#define HEATER_BED_PIN 32
#define HEATER_CHAMBER_PIN 33
//
// Fans
//
#define FAN0_PIN 8
#define ORIG_E0_AUTO_FAN_PIN 30
#define ORIG_E1_AUTO_FAN_PIN 30
#define ORIG_E2_AUTO_FAN_PIN 30
#define ORIG_E3_AUTO_FAN_PIN 30
//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
//
// Misc. Functions
//
#define SDSS 53
#define SD_DETECT_PIN 40
// Common I/O
#define FIL_RUNOUT_PIN 9
//#define FIL_RUNOUT_PIN 29 // encoder sensor
//#define PWM_1_PIN 12
//#define PWM_2_PIN 13
//#define SPARE_IO 17
#define BEEPER_PIN 13
#define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 10 // 31

2
Marlin/src/pins/mega/pins_EINSTART-S.h
View File

@ -30,7 +30,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Einstart-S"
#define BOARD_INFO_NAME "Einstart-S"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_ELEFU_3.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Elefu Ra v3"
#define BOARD_INFO_NAME "Elefu Ra v3"
//
// Limit Switches

4
Marlin/src/pins/mega/pins_GT2560_REV_A.h
View File

@ -31,8 +31,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "GT2560 Rev.A"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "GT2560 Rev.A"
#endif
#define DEFAULT_MACHINE_NAME "Prusa i3 Pro B"

2
Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
View File

@ -25,7 +25,7 @@
* Geeetech GT2560 Revision A+ board pin assignments
*/
#define BOARD_NAME "GT2560 Rev.A+"
#define BOARD_INFO_NAME "GT2560 Rev.A+"
#include "pins_GT2560_REV_A.h"

4
Marlin/src/pins/mega/pins_GT2560_V3.h
View File

@ -29,8 +29,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "GT2560 V3.0"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "GT2560 V3.0"
#endif
//

2
Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
View File

@ -25,7 +25,7 @@
* GT2560 V3.0 pin assignment (for Mecreator 2)
*****************************************************************/
#define BOARD_NAME "GT2560 V3.0 (MC2)"
#define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
#define X_MIN_PIN 22
#define X_MAX_PIN 24

2
Marlin/src/pins/mega/pins_LEAPFROG.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Leapfrog"
#define BOARD_INFO_NAME "Leapfrog"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View File

@ -31,7 +31,7 @@
#error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Mega Controller"
#define BOARD_INFO_NAME "Mega Controller"
//
// Servos

2
Marlin/src/pins/mega/pins_MEGATRONICS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Megatronics"
#define BOARD_INFO_NAME "Megatronics"
//
// Limit Switches
//

54
Marlin/src/pins/mega/pins_MEGATRONICS_2.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Megatronics v2.0"
#define BOARD_INFO_NAME "Megatronics v2.0"
//
// Limit Switches
//
@ -115,32 +115,38 @@
#define PS_ON_PIN 12
#define CASE_LIGHT_PIN 2
//
// LCD / Controller
//
#define BEEPER_PIN 64
#define LCD_PINS_RS 14
#define LCD_PINS_ENABLE 15
#define LCD_PINS_D4 30
#define LCD_PINS_D5 31
#define LCD_PINS_D6 32
#define LCD_PINS_D7 33
// Buttons are directly attached using keypad
#define BTN_EN1 61
#define BTN_EN2 59
#define BTN_ENC 43
// Buttons that are attached using shift register of reprapworld keypad v1.1
#define SHIFT_CLK 63
#define SHIFT_LD 42
#define SHIFT_OUT 17
#define SHIFT_EN 17
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 3 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 16 // Pullup!
#define SPINDLE_DIR_PIN 11
//
// LCD / Controller
//
#define BEEPER_PIN 64
#if HAS_SPI_LCD
#define LCD_PINS_RS 14
#define LCD_PINS_ENABLE 15
#define LCD_PINS_D4 30
#define LCD_PINS_D5 31
#define LCD_PINS_D6 32
#define LCD_PINS_D7 33
#if ENABLED(NEWPANEL)
// Buttons are directly attached using keypad
#define BTN_EN1 61
#define BTN_EN2 59
#define BTN_ENC 43
#else
// Buttons attached to shift register of reprapworld keypad v1.1
#define SHIFT_CLK 63
#define SHIFT_LD 42
#define SHIFT_OUT 17
#define SHIFT_EN 17
#endif
#endif // HAS_SPI_LCD

6
Marlin/src/pins/mega/pins_MEGATRONICS_3.h
View File

@ -30,11 +30,11 @@
#endif
#if MB(MEGATRONICS_32)
#define BOARD_NAME "Megatronics v3.2"
#define BOARD_INFO_NAME "Megatronics v3.2"
#elif MB(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1"
#define BOARD_INFO_NAME "Megatronics v3.1"
#else
#define BOARD_NAME "Megatronics v3.0"
#define BOARD_INFO_NAME "Megatronics v3.0"
#endif
//

2
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
View File

@ -41,7 +41,7 @@
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Mightyboard"
#define BOARD_INFO_NAME "Mightyboard"
#define DEFAULT_MACHINE_NAME "MB Replicator"
//

2
Marlin/src/pins/mega/pins_MINITRONICS.h
View File

@ -38,7 +38,7 @@
#error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Minitronics v1.0/1.1"
#define BOARD_INFO_NAME "Minitronics v1.0/1.1"
//
// Limit Switches
//

4
Marlin/src/pins/mega/pins_OVERLORD.h
View File

@ -31,8 +31,8 @@
#error "Overlord Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "OVERLORD"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "OVERLORD"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Limit Switches

2
Marlin/src/pins/mega/pins_SILVER_GATE.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select 'Silvergate' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Silver Gate"
#define BOARD_INFO_NAME "Silver Gate"
#define X_STEP_PIN 43
#define X_DIR_PIN 44

20
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Wanhao i3 Mini 0ne+"
#define BOARD_INFO_NAME "Wanhao i3 Mini 0ne+"
#define DEFAULT_MACHINE_NAME "i3 Mini"
#define BOARD_WEBSITE_URL "https://tinyurl.com/yyxw7se7"
@ -92,20 +92,20 @@
#define KILL_PIN 64
//
// LCD / Controller
// LCD / Controller (Integrated MINIPANEL)
//
#if HAS_SPI_LCD
#if ENABLED(MINIPANEL)
#define DOGLCD_A0 40
#define DOGLCD_CS 41
#define LCD_BACKLIGHT_PIN 65 // Backlight LED on A11/D65
#define LCD_RESET_PIN 27
#define LCD_CONTRAST 255
#define BTN_EN1 2
#define BTN_EN2 3
#define BTN_ENC 5
#if ENABLED(NEWPANEL)
#define BTN_EN1 2
#define BTN_EN2 3
#define BTN_ENC 5
#endif
// This display has adjustable contrast
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 255
#define LCD_CONTRAST_INIT LCD_CONTRAST_MAX
#endif