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/esp32/pins_ESP32.h
View File

@ -29,7 +29,7 @@
"Oops! Select an ESP32 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "Espressif ESP32"
#define BOARD_INFO_NAME "Espressif ESP32"
//
// I2S (steppers & other output-only pins)

6
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -45,8 +45,8 @@
* 7 | 11
*/
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS 1.4"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.4"
#endif
#define E2END 0xFFF // 4KB
@ -437,7 +437,7 @@
#endif
#if DISABLED(NEWPANEL)
// Buttons are attached to a shift register
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42

2
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
View File

@ -29,7 +29,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "AZSMZ MINI"
#define BOARD_INFO_NAME "AZSMZ MINI"
//
// Servos

2
Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
View File

@ -25,7 +25,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "BIGTREE SKR 1.1"
#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
//
// Limit Switches

2
Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
View File

@ -25,7 +25,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "BIGTREE SKR 1.3"
#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
// Ignore temp readings during development.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000

4
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
View File

@ -34,8 +34,8 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "BIQU Thunder B300 V1.0"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
#endif
//

2
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
View File

@ -34,7 +34,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "BIQU BQ111-A4"
#define BOARD_INFO_NAME "BIQU BQ111-A4"
//
// Limit Switches

2
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
View File

@ -25,7 +25,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "GMARSH X6 REV1"
#define BOARD_INFO_NAME "GMARSH X6 REV1"
// Ignore temp readings during develpment.
//#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE

8
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View File

@ -29,11 +29,11 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "MKS SBASE"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS SBASE"
#endif
#ifndef BOARD_WEBSITE_URL
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
#endif
#define LED_PIN P1_18 // Used as a status indicator
@ -42,7 +42,7 @@
#define LED4_PIN P1_21
//
// Servo pin
// Servos
//
#define SERVO0_PIN P1_23 // J8-3 (low jitter)
#define SERVO1_PIN P2_12 // J8-4

6
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -29,11 +29,11 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "MKS SGen-L"
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"
#define BOARD_INFO_NAME "MKS SGen-L"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
//
// Servo pin
// Servos
//
#define SERVO0_PIN P1_23 // SERVO P1.23
#define SERVO1_PIN P2_00 // SERVO P2.0

34
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@ -40,7 +40,7 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "Re-ARM RAMPS 1.4"
#define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
//
// Servos
@ -128,17 +128,33 @@
// P2_08 E1-Step
// P2_13 E1-Dir
#define X_SERIAL_TX_PIN P2_13
#define X_SERIAL_RX_PIN P2_13
#ifndef X_SERIAL_TX_PIN
#define X_SERIAL_TX_PIN P0_01
#endif
#ifndef X_SERIAL_RX_PIN
#define X_SERIAL_RX_PIN P0_01
#endif
#define Y_SERIAL_TX_PIN P0_00
#define Y_SERIAL_RX_PIN P0_00
#ifndef Y_SERIAL_TX_PIN
#define Y_SERIAL_TX_PIN P0_00
#endif
#ifndef Y_SERIAL_RX_PIN
#define Y_SERIAL_RX_PIN P0_00
#endif
#define Z_SERIAL_TX_PIN P0_01
#define Z_SERIAL_RX_PIN P0_01
#ifndef Z_SERIAL_TX_PIN
#define Z_SERIAL_TX_PIN P2_13
#endif
#ifndef Z_SERIAL_RX_PIN
#define Z_SERIAL_RX_PIN P2_13
#endif
#define E0_SERIAL_TX_PIN P2_08
#define E0_SERIAL_RX_PIN P2_08
#ifndef E0_SERIAL_TX_PIN
#define E0_SERIAL_TX_PIN P2_08
#endif
#ifndef E0_SESIAL_RX_PIN
#define E0_SERIAL_RX_PIN P2_08
#endif
#endif

15
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
View File

@ -29,13 +29,17 @@
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#endif
#define BOARD_NAME "Selena Compact"
#define BOARD_WEBSITE_URL "https://github.com/Ales2-k/Selena"
#define BOARD_INFO_NAME "Selena Compact"
#define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
//
// Servos
//
#define SERVO0_PIN P1_23
//
// Limit Switches
//
#define X_MIN_PIN P1_28
#define X_MAX_PIN P1_25
#define Y_MIN_PIN P2_11
@ -108,8 +112,3 @@
#define SD_DETECT_PIN -1
#endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
//
// Servo
//
#define SERVO0_PIN P1_23

17
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
View File

@ -29,19 +29,23 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "Azteeg X5 GT"
#define BOARD_WEBSITE_URL "https://tinyurl.com/yx8tdqa3"
#define BOARD_INFO_NAME "Azteeg X5 GT"
#define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
//
// Set CPU
// Custom CPU Speed 120MHz
//
#undef F_CPU
#define F_CPU 120000000
//
// Servos
//
#define SERVO0_PIN P1_23
//
// Limit Switches
//
#define X_MIN_PIN P1_24
#define X_MAX_PIN P1_27
#define Y_MIN_PIN P1_25
@ -128,8 +132,3 @@
#define STAT_LED_RED_PIN P1_19
#define STAT_LED_BLUE_PIN P1_20
#endif
//
// Servo
//
#define SERVO0_PIN P1_23

6
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View File

@ -29,10 +29,10 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Azteeg X5 MINI"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Azteeg X5 MINI"
#endif
#define BOARD_WEBSITE_URL "http://www.panucatt.com/azteeg_X5_mini_reprap_3d_printer_controller_p/ax5mini.htm"
#define BOARD_WEBSITE_URL "tiny.cc/x5_mini"
//
// LED

2
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
View File

@ -29,7 +29,7 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "Azteeg X5 MINI WIFI"
#define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
//
// DIGIPOT slave addresses

2
Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
View File

@ -29,7 +29,7 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "Cohesion3D Mini"
#define BOARD_INFO_NAME "Cohesion3D Mini"
//
// Servos

2
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
View File

@ -29,7 +29,7 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "Cohesion3D ReMix"
#define BOARD_INFO_NAME "Cohesion3D ReMix"
//
// Servos

4
Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
View File

@ -29,8 +29,8 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "MKS SGen"
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"
#define BOARD_INFO_NAME "MKS SGen"
#define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
#include "../lpc1768/pins_MKS_SBASE.h"

7
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
View File

@ -29,9 +29,12 @@
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "Smoothieboard"
#define BOARD_WEBSITE_URL "http://smoothieware.org/smoothieboard"
#define BOARD_INFO_NAME "Smoothieboard"
#define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
//
// Custom CPU Speed 120MHz
//
#undef F_CPU
#define F_CPU 120000000

8
Marlin/src/pins/lpc1768/pins_TH3D_EZBOARD.h → Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h Executable file → Normal file
View File

@ -25,12 +25,12 @@
* TH3D EZBoard pin assignments
*/
#ifndef TARGET_LPC1768
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
#ifndef LPC1769
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
#endif
#define BOARD_NAME "TH3D EZBoard"
#define BOARD_WEBSITE_URL "https://www.th3dstudio.com/product/ezboard-lite/"
#define BOARD_INFO_NAME "TH3D EZBoard"
#define BOARD_WEBSITE_URL "th3dstudio.com"
//
// Servos

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

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

@ -202,6 +202,8 @@
#include "mega/pins_CNCONTROLS_11.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(CNCONTROLS_12)
#include "mega/pins_CNCONTROLS_12.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(CNCONTROLS_15)
#include "mega/pins_CNCONTROLS_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MIGHTYBOARD_REVE)
#include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(CHEAPTRONIC)
@ -351,8 +353,6 @@
#include "lpc1768/pins_BIQU_B300_V1.0.h" // LPC1768 env:LPC1768
#elif MB(BIGTREE_SKR_V1_3)
#include "lpc1768/pins_BIGTREE_SKR_V1.3.h" // LPC1768 env:LPC1768
#elif MB(TH3D_EZBOARD)
#include "lpc1768/pins_TH3D_EZBOARD.h" // LPC1768 env:LPC1768
#elif MB(GMARSH_X6_REV1)
#include "lpc1768/pins_GMARSH_X6_REV1.h" // LPC1768 env:LPC1768
@ -374,6 +374,8 @@
#include "lpc1769/pins_COHESION3D_MINI.h" // LPC1769 env:LPC1769
#elif MB(SMOOTHIEBOARD)
#include "lpc1769/pins_SMOOTHIEBOARD.h" // LPC1769 env:LPC1769
#elif MB(TH3D_EZBOARD)
#include "lpc1769/pins_TH3D_EZBOARD.h" // LPC1769 env:LPC1769
//
// Due (ATSAM) boards
@ -504,6 +506,8 @@
#include "stm32/pins_STEVAL.h" // STM32F4 env:STM32F4
#elif MB(BIGTREE_SKR_PRO_V1_1)
#include "stm32/pins_BIGTREE_SKR_PRO_V1.1.h" // STM32F4 env:BIGTREE_SKR_PRO
#elif MB(BIGTREE_BTT002_V1_0)
#include "stm32/pins_BIGTREE_BTT002_V1.0.h" // STM32F4 env:BIGTREE_BTT002
//
// ARM Cortex M7
@ -940,7 +944,7 @@
#define LCD_PINS_D4 -1
#endif
#if HAS_CHARACTER_LCD
#if HAS_CHARACTER_LCD || TOUCH_UI_ULTIPANEL
#ifndef LCD_PINS_D5
#define LCD_PINS_D5 -1
#endif

8
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Mega 2560 or Rambo' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Einsy Rambo"
#define BOARD_INFO_NAME "Einsy Rambo"
//
// TMC2130 Configuration_adv defaults for EinsyRambo
@ -149,11 +149,11 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#define KILL_PIN 32
#if ENABLED(NEWPANEL)
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85
@ -176,5 +176,5 @@
#define BEEPER_PIN 84 // AUX-4
#define SD_DETECT_PIN 15
#endif // NEWPANEL
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD

9
Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Mega 2560 or Rambo' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Einsy Retro"
#define BOARD_INFO_NAME "Einsy Retro"
//
// TMC2130 Configuration_adv defaults for EinsyRetro
@ -163,11 +163,11 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#define KILL_PIN 32
#if ENABLED(NEWPANEL)
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85
@ -188,7 +188,8 @@
#define BTN_ENC 9 // AUX-2
#define BEEPER_PIN 84 // AUX-4
#define SD_DETECT_PIN 15
#endif // NEWPANEL
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD

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

@ -30,9 +30,9 @@
#endif
#if MB(MINIRAMBO_10A)
#define BOARD_NAME "Mini RAMBo 1.0a"
#define BOARD_INFO_NAME "Mini RAMBo 1.0a"
#else
#define BOARD_NAME "Mini RAMBo"
#define BOARD_INFO_NAME "Mini RAMBo"
#endif
//
@ -141,13 +141,13 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#if !MB(MINIRAMBO_10A)
#define KILL_PIN 32
#endif
#if ENABLED(NEWPANEL)
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if MB(MINIRAMBO_10A)
@ -187,6 +187,6 @@
#endif // !MINIRAMBO_10A
#endif // NEWPANEL
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD

8
Marlin/src/pins/rambo/pins_RAMBO.h
View File

@ -45,7 +45,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Rambo"
#define BOARD_INFO_NAME "Rambo"
//
// Servos
@ -169,11 +169,11 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#define KILL_PIN 80
#if ENABLED(NEWPANEL)
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#define LCD_PINS_RS 70
#define LCD_PINS_ENABLE 71
@ -219,7 +219,7 @@
// No Beeper added
#define BEEPER_PIN 33
// buttons are attached to a shift register
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42

2
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
View File

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

6
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -25,12 +25,12 @@
* 3DRAG (and K8200 / K8400) Arduino Mega with RAMPS v1.4 pin assignments
*/
#ifndef BOARD_NAME
#define BOARD_NAME "3Drag"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "3Drag"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#endif
#ifndef DEFAULT_SOURCE_CODE_URL

2
Marlin/src/pins/ramps/pins_AZTEEG_X3.h
View File

@ -34,7 +34,7 @@
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 6 // Define before RAMPS pins include
#endif
#define BOARD_NAME "Azteeg X3"
#define BOARD_INFO_NAME "Azteeg X3"
//
// Servos

2
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
View File

@ -31,7 +31,7 @@
#error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Azteeg X3 Pro"
#define BOARD_INFO_NAME "Azteeg X3 Pro"
//
// RAMPS pins overrides

2
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
View File

@ -29,7 +29,7 @@
#error "2PrintBeta Due supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "2PrintBeta Due"
#define BOARD_INFO_NAME "2PrintBeta Due"
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
View File

@ -29,7 +29,7 @@
#error "KFB 2.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "KFB 2.0"
#define BOARD_INFO_NAME "KFB 2.0"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "ZUM Mega 3D"
#define BOARD_INFO_NAME "ZUM Mega 3D"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
View File

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

2
Marlin/src/pins/ramps/pins_FELIX2.h
View File

@ -29,7 +29,7 @@
#error "Felix 2.0+ supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Felix 2.0+"
#define BOARD_INFO_NAME "Felix 2.0+"
//
// Heaters / Fans

4
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -31,8 +31,8 @@
#error "Formbot supports up to 3 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Formbot Raptor"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Formbot Raptor"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Servos

4
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
View File

@ -25,8 +25,8 @@
* Formbot Raptor 2 pin assignments
*/
#define BOARD_NAME "Formbot Raptor2"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Formbot Raptor2"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define FAN_PIN 6

4
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

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

4
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View File

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

2
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View File

@ -33,7 +33,7 @@
//#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
#endif
#define BOARD_NAME "FYSETC F6 1.3"
#define BOARD_INFO_NAME "FYSETC F6 1.3"
#define RESET_PIN 30
#define SPI_FLASH_CS 83

2
Marlin/src/pins/ramps/pins_K8200.h
View File

@ -26,7 +26,7 @@
* Identical to 3DRAG
*/
#define BOARD_NAME "Velleman K8200"
#define BOARD_INFO_NAME "Velleman K8200"
#define DEFAULT_MACHINE_NAME "K8200"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"

2
Marlin/src/pins/ramps/pins_K8400.h
View File

@ -32,7 +32,7 @@
* - Second heater has moved pin
*/
#define BOARD_NAME "K8400"
#define BOARD_INFO_NAME "K8400"
#define DEFAULT_MACHINE_NAME "Vertex"
#include "pins_3DRAG.h"

2
Marlin/src/pins/ramps/pins_K8800.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "K8800"
#define BOARD_INFO_NAME "K8800"
#define DEFAULT_MACHINE_NAME "Vertex Delta"
//#define LCD_SCREEN_ROT_180

2
Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
View File

@ -21,7 +21,7 @@
*/
#pragma once
#define BOARD_NAME "MAKEboard Mini"
#define BOARD_INFO_NAME "MAKEboard Mini"
//
// Only 3 Limit Switch plugs on Micromake C1

2
Marlin/src/pins/ramps/pins_MKS_BASE.h
View File

@ -31,7 +31,7 @@
#error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS BASE 1.0"
#define BOARD_INFO_NAME "MKS BASE 1.0"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_BASE_14.h
View File

@ -29,7 +29,7 @@
#error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS BASE 1.4"
#define BOARD_INFO_NAME "MKS BASE 1.4"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_GEN_13.h
View File

@ -34,7 +34,7 @@
#error "MKS GEN 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS GEN >= v1.3"
#define BOARD_INFO_NAME "MKS GEN >= v1.3"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_GEN_L.h
View File

@ -29,7 +29,7 @@
#error "MKS GEN L supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS GEN L"
#define BOARD_INFO_NAME "MKS GEN L"
//
// Heaters / Fans

6
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -57,8 +57,8 @@
#endif
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS 1.4"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.4"
#endif
//
@ -477,7 +477,7 @@
#endif
#if DISABLED(NEWPANEL)
// Buttons are attached to a shift register
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42

4
Marlin/src/pins/ramps/pins_RAMPS_13.h
View File

@ -34,8 +34,8 @@
*
*/
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS 1.3"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.3"
#endif
#define IS_RAMPS_13

7
Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
View File

@ -25,7 +25,7 @@
#error "Creality3D RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Creality3D RAMPS"
#define BOARD_INFO_NAME "Creality3D RAMPS"
//
// Heaters / Fans
@ -35,6 +35,11 @@
#define MOSFET_D_PIN 7
#define FIL_RUNOUT_PIN 2
#if NUM_RUNOUT_SENSORS > 1
#define FIL_RUNOUT2_PIN 15 // Creality CR-X can use dual runout sensors
#endif
#define SD_DETECT_PIN 49 // Always define onboard SD detect
#include "pins_RAMPS.h"

2
Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
View File

@ -25,7 +25,7 @@
#error "Dagoma3D F5 RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Dagoma3D F5 RAMPS"
#define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
#define X_STOP_PIN 2
#define Y_STOP_PIN 3

2
Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
View File

@ -25,7 +25,7 @@
#error "Ender-4 supports only 1 hotend / E-stepper. Comment out this line to continue."
#endif
#define BOARD_NAME "Ender-4"
#define BOARD_INFO_NAME "Ender-4"
#include "pins_RAMPS.h"

2
Marlin/src/pins/ramps/pins_RAMPS_OLD.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS <1.2"
#define BOARD_INFO_NAME "RAMPS <1.2"
// Uncomment the following line for RAMPS v1.0
//#define RAMPS_V_1_0

2
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View File

@ -42,7 +42,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS 1.4 Plus"
#define BOARD_INFO_NAME "RAMPS 1.4 Plus"
#define RAMPS_D8_PIN 10
#define RAMPS_D10_PIN 8

4
Marlin/src/pins/ramps/pins_RIGIDBOARD.h
View File

@ -25,8 +25,8 @@
* RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
*/
#ifndef BOARD_NAME
#define BOARD_NAME "RigidBoard"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RigidBoard"
#endif
//

2
Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
View File

@ -25,7 +25,7 @@
* RIGIDBOARD V2 Arduino Mega with RAMPS v1.4 pin assignments
*/
#define BOARD_NAME "RigidBoard V2"
#define BOARD_INFO_NAME "RigidBoard V2"
#include "pins_RIGIDBOARD.h"

2
Marlin/src/pins/ramps/pins_RL200.h
View File

@ -26,7 +26,7 @@
* extruder motors due to dual Z motors. Pinout therefore based on pins_RUMBA.h.
*/
#define BOARD_NAME "RL200"
#define BOARD_INFO_NAME "RL200"
#define DEFAULT_MACHINE_NAME "Rapide Lite 200"
#if HOTENDS > 2 || E_STEPPERS > 2

6
Marlin/src/pins/ramps/pins_RUMBA.h
View File

@ -31,11 +31,11 @@
#error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Rumba"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Rumba"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#endif
//

2
Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
View File

@ -21,7 +21,7 @@
*/
#pragma once
#define BOARD_NAME "Raise3D Rumba"
#define BOARD_INFO_NAME "Raise3D Rumba"
#define DEFAULT_MACHINE_NAME "Raise3D N Series"
// Raise3D uses thermocouples on the standard input pins

2
Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
View File

@ -29,7 +29,7 @@
#error "Sainsmart 2-in-1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Sainsmart"
#define BOARD_INFO_NAME "Sainsmart"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
View File

@ -25,7 +25,7 @@
* Arduino Mega with RAMPS v1.3 for Anycubic
*/
#define BOARD_NAME "Anycubic RAMPS 1.3"
#define BOARD_INFO_NAME "Anycubic RAMPS 1.3"
#define IS_RAMPS_EFB
#define RAMPS_D9_PIN 44

2
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -25,7 +25,7 @@
* Arduino Mega with RAMPS v1.4 for Anycubic
*/
#define BOARD_NAME "Anycubic RAMPS 1.4"
#define BOARD_INFO_NAME "Anycubic RAMPS 1.4"
//
// Servos

2
Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
View File

@ -31,7 +31,7 @@
#error "TRONXY-V3-1.0 supports only 2 hotends/E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "TRONXY-V3-1.0"
#define BOARD_INFO_NAME "TRONXY-V3-1.0"
//
// Servos

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

@ -28,8 +28,8 @@
#error "TTOSCAR supports up to 5 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "TT OSCAR"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "TT OSCAR"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Servos
@ -337,7 +337,7 @@
#endif
#if DISABLED(NEWPANEL)
// Buttons are attached to a shift register
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
//#define SHIFT_LD 42
@ -436,7 +436,7 @@
#define DOGLCD_CS 25
// GLCD features
//#define LCD_CONTRAST 190
//#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
@ -463,7 +463,7 @@
#define DOGLCD_CS 66
// GLCD features
//#define LCD_CONTRAST 190
//#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180

2
Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
View File

@ -37,7 +37,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Ultimaker 2.x"
#define BOARD_INFO_NAME "Ultimaker 2.x"
#define DEFAULT_MACHINE_NAME "Ultimaker"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"

8
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -37,8 +37,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Ultimaker"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Ultimaker"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
//
@ -129,7 +129,7 @@
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
// buttons are directly attached
// Buttons directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
@ -138,7 +138,7 @@
#else // !NEWPANEL - Old style panel with shift register
// buttons are attached to a shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40

14
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -36,7 +36,7 @@
* the revisions provided inconsistent information.
*
* As best I can determine:
* 1.5.3 boards should use the pins_ULTIMAKER.h file which means the BOARD_NAME
* 1.5.3 boards should use the pins_ULTIMAKER.h file which means the BOARD_INFO_NAME
* define in this file should say 1.5.3 rather than 1.5.4
* This file is meant for 1.1 - 1.3 boards.
* The endstops for the 1.0 boards use different definitions than on the 1.1 - 1.3
@ -65,13 +65,13 @@
#endif
#ifdef BOARD_REV_1_1_TO_1_3
#define BOARD_NAME "Ultimaker 1.1-1.3"
#define BOARD_INFO_NAME "Ultimaker 1.1-1.3"
#elif defined(BOARD_REV_1_0)
#define BOARD_NAME "Ultimaker 1.0"
#define BOARD_INFO_NAME "Ultimaker 1.0"
#elif defined(BOARD_REV_1_5)
#define BOARD_NAME "Ultimaker 1.5"
#define BOARD_INFO_NAME "Ultimaker 1.5"
#else
#define BOARD_NAME "Ultimaker 1.5.4+"
#define BOARD_INFO_NAME "Ultimaker 1.5.4+"
#endif
#define DEFAULT_MACHINE_NAME "Ultimaker"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
@ -187,7 +187,7 @@
#define LCD_PINS_D6 5
#define LCD_PINS_D7 6
// buttons are directly attached
// Buttons directly attached
#define BTN_EN1 40
#define BTN_EN2 42
#define BTN_ENC 19
@ -196,7 +196,7 @@
#else // !NEWPANEL - Old style panel with shift register
// buttons are attached to a shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
#define SHIFT_LD 42
#define SHIFT_OUT 40

2
Marlin/src/pins/ramps/pins_VORON.h
View File

@ -26,7 +26,7 @@
* See https://github.com/mzbotreprap/VORON/blob/master/Firmware/Marlin/pins_RAMPS_VORON.h
*/
#define BOARD_NAME "VORON Design v2"
#define BOARD_INFO_NAME "VORON Design v2"
#define RAMPS_D8_PIN 11

2
Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
View File

@ -31,7 +31,7 @@
#error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
#endif
#define BOARD_NAME "Z-Bolt X Series"
#define BOARD_INFO_NAME "Z-Bolt X Series"
//
// Servos

2
Marlin/src/pins/sam/pins_ADSK.h
View File

@ -25,7 +25,7 @@
* Arduino DUE Shield Kit (ADSK) pin assignments
*/
#define BOARD_NAME "ADSK"
#define BOARD_INFO_NAME "ADSK"
#if !defined(__SAM3X8E__) && !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Select 'Arduino Due or Mega' in 'Tools > Board.'"

2
Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
View File

@ -30,7 +30,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Alligator Board R2"
#define BOARD_INFO_NAME "Alligator Board R2"
//
// Servos

2
Marlin/src/pins/sam/pins_ARCHIM1.h
View File

@ -41,7 +41,7 @@
#error "Oops! Select 'Archim' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Archim 1.0"
#define BOARD_INFO_NAME "Archim 1.0"
//
// Items marked * have been altered from Archim v1.0

8
Marlin/src/pins/sam/pins_ARCHIM2.h
View File

@ -43,7 +43,7 @@
#error "Archim2 requires Software SPI. Enable TMC_USE_SW_SPI in Configuration_adv.h."
#endif
#define BOARD_NAME "Archim 2.0"
#define BOARD_INFO_NAME "Archim 2.0"
//
// Items marked * have been altered from Archim v1.0
@ -231,7 +231,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
@ -242,10 +242,10 @@
#define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#if ENABLED(NEWPANEL)
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif // NEWPANEL
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD

2
Marlin/src/pins/sam/pins_DUE3DOM.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "DUE3DOM"
#define BOARD_INFO_NAME "DUE3DOM"
//
// Servos

2
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "DUE3DOM MINI"
#define BOARD_INFO_NAME "DUE3DOM MINI"
//
// Servos

4
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
View File

@ -29,8 +29,8 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "PRINTRBOARD_G2"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "PRINTRBOARD_G2"
#endif
//

2
Marlin/src/pins/sam/pins_RADDS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RADDS"
#define BOARD_INFO_NAME "RADDS"
//
// Servos

2
Marlin/src/pins/sam/pins_RAMPS4DUE.h
View File

@ -43,7 +43,7 @@
#error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS4DUE"
#define BOARD_INFO_NAME "RAMPS4DUE"
#define IS_RAMPS4DUE
//

2
Marlin/src/pins/sam/pins_RAMPS_DUO.h
View File

@ -47,7 +47,7 @@
#error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS Duo"
#define BOARD_INFO_NAME "RAMPS Duo"
#define IS_RAMPS_DUO
#include "pins_RAMPS.h"

Some files were not shown because too many files have changed in this diff Show More