wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Merge upstream changes from Marlin 2.1.2

Browse Source
This commit is contained in:
Stefan Kalscheuer
2022-12-19 15:23:45 +01:00
parent fe9ea826a5
commit 67c7ce7b79
427 changed files with 10732 additions and 7834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View File

@@ -166,12 +166,12 @@
#define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864)
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN
#define LCD_RESET_PIN EXP1_05_PIN
@@ -179,6 +179,9 @@
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
#if BOTH(MKS_MINI_12864_V3, SDSUPPORT)
#define PAUSE_LCD_FOR_BUSY_SD
#endif
#else
#define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)

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

@@ -396,8 +396,8 @@
#define SD_DETECT_PIN 41
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_DEVICE 1
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN 31
@@ -450,6 +450,19 @@
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y 1
#endif
#elif ENABLED(TFT_RES_1024x600)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X 65533
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 38399
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 2
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y 1
#endif
#endif
#endif

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@@ -323,6 +323,9 @@
#define BTN_EN1 EXP2_03_PIN
#define BTN_ENC EXP1_02_PIN
#define BEEPER_PIN EXP1_01_PIN
#define SDCARD_CONNECTION ONBOARD
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
@@ -423,6 +426,7 @@
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define FORCE_SOFT_SPI
#elif ENABLED(ENDER2_STOCKDISPLAY)

1
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@@ -43,6 +43,7 @@
#if NO_EEPROM_SELECTED
//#define I2C_EEPROM // EEPROM on I2C-0
//#define SDCARD_EEPROM_EMULATION
//#undef NO_EEPROM_SELECTED
#endif
#if ENABLED(I2C_EEPROM)

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

@@ -101,9 +101,9 @@
// LCD Display input pins
//
#define BTN_UP 25
#define BTN_DWN 26
#define BTN_LFT 27
#define BTN_RT 28
#define BTN_DOWN 26
#define BTN_LEFT 27
#define BTN_RIGHT 28
// 'OK' button
#define BTN_ENC 29

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

@@ -203,14 +203,13 @@
#define BTN_EN2 75 // J4, UP
#define BTN_EN1 73 // J3, DOWN
//STOP button connected as KILL_PIN
#define KILL_PIN 14 // J1, RIGHT
//KILL - not connected
// STOP button connected as KILL_PIN
#define KILL_PIN 14 // J1, RIGHT (not connected)
#define BEEPER_PIN 8 // H5, SD_WP
//on board leds
#define STAT_LED_RED_LED SERVO0_PIN // C1 (1280-EX1, DEBUG2)
// Onboard leds
#define STAT_LED_RED_PIN SERVO0_PIN // C1 (1280-EX1, DEBUG2)
#define STAT_LED_BLUE_PIN SERVO1_PIN // C0 (1280-EX2, DEBUG3)
#else
@@ -220,9 +219,9 @@
#define SR_STROBE_PIN 33 // C4
#define BTN_UP 75 // J4
#define BTN_DWN 73 // J3
#define BTN_LFT 72 // J2
#define BTN_RT 14 // J1
#define BTN_DOWN 73 // J3
#define BTN_LEFT 72 // J2
#define BTN_RIGHT 14 // J1
// Disable encoder
#undef BTN_EN1

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

@@ -135,7 +135,7 @@
#if IS_NEWPANEL
#define BTN_ENC 16 // Enter Pin
#define BTN_UP 19 // Button UP Pin
#define BTN_DWN 17 // Button DOWN Pin
#define BTN_DOWN 17 // Button DOWN Pin
#endif
// Additional connectors/pins on the Overlord V1.X board

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

@@ -195,6 +195,8 @@
#include "ramps/pins_ORTUR_4.h" // ATmega2560 env:mega2560
#elif MB(TENLOG_D3_HERO)
#include "ramps/pins_TENLOG_D3_HERO.h" // ATmega2560 env:mega2560
#elif MB(TENLOG_MB1_V23)
#include "ramps/pins_TENLOG_MB1_V23.h" // ATmega2560 env:mega2560
#elif MB(MKS_GEN_L_V21)
#include "ramps/pins_MKS_GEN_L_V21.h" // ATmega2560 env:mega2560
#elif MB(RAMPS_S_12_EEFB, RAMPS_S_12_EEEB, RAMPS_S_12_EFFB)
@@ -236,7 +238,7 @@
#elif MB(CNCONTROLS_15)
#include "mega/pins_CNCONTROLS_15.h" // ATmega2560, ATmega1280 env:mega2560 env:mega1280
#elif MB(MIGHTYBOARD_REVE)
#include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega2560, ATmega1280 env:mega2560ext env:mega1280 env:MightyBoard1280 env:MightyBoard2560
#include "mega/pins_MIGHTYBOARD_REVE.h" // ATmega2560, ATmega1280 env:mega2560ext env:MightyBoard1280 env:MightyBoard2560
#elif MB(CHEAPTRONIC)
#include "mega/pins_CHEAPTRONIC.h" // ATmega2560 env:mega2560
#elif MB(CHEAPTRONIC_V2)
@@ -516,9 +518,9 @@
#elif MB(MKS_ROBIN_MINI)
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini env:mks_robin_mini_maple
#elif MB(MKS_ROBIN_NANO)
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1v2_usbmod
#elif MB(MKS_ROBIN_NANO_V2)
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple
#elif MB(MKS_ROBIN_LITE)
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite env:mks_robin_lite_maple
#elif MB(MKS_ROBIN_LITE3)
@@ -535,6 +537,8 @@
#include "stm32f1/pins_MKS_ROBIN_E3D_V1_1.h" // STM32F1 env:mks_robin_e3
#elif MB(MKS_ROBIN_E3P)
#include "stm32f1/pins_MKS_ROBIN_E3P.h" // STM32F1 env:mks_robin_e3p env:mks_robin_e3p_maple
#elif MB(BTT_EBB42_V1_1)
#include "stm32g0/pins_BTT_EBB42_V1_1.h" // STM32G0 env:BTT_EBB42_V1_1_filament_extruder
#elif MB(BTT_SKR_MINI_V1_1)
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#elif MB(BTT_SKR_MINI_E3_V1_0)
@@ -545,6 +549,8 @@
#include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
#elif MB(BTT_SKR_MINI_E3_V3_0)
#include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h" // STM32G0 env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
#elif MB(BTT_SKR_MINI_E3_V3_0_1)
#include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"// STM32F4 env:STM32F401RC_btt
#elif MB(BTT_SKR_MINI_MZ_V1_0)
#include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
#elif MB(BTT_SKR_E3_DIP)
@@ -593,6 +599,8 @@
#include "stm32f1/pins_CREALITY_V24S1_301.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V25S1)
#include "stm32f1/pins_CREALITY_V25S1.h" // STM32F1 env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
#elif MB(CREALITY_V521)
#include "stm32f1/pins_CREALITY_V521.h" // STM32F103VE env:STM32F103VE_creality
#elif MB(TRIGORILLA_PRO)
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
#elif MB(FLY_MINI)
@@ -654,7 +662,7 @@
#elif MB(BTT_OCTOPUS_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_V1_0.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
#elif MB(BTT_OCTOPUS_V1_1)
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
#include "stm32f4/pins_BTT_OCTOPUS_V1_1.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB env:BIGTREE_OCTOPUS_V1_F407 env:BIGTREE_OCTOPUS_V1_F407_USB
#elif MB(BTT_OCTOPUS_PRO_V1_0)
#include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4 env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB env:BIGTREE_OCTOPUS_PRO_V1_F429 env:BIGTREE_OCTOPUS_PRO_V1_F429_USB
#elif MB(LERDGE_K)
@@ -698,13 +706,21 @@
#elif MB(OPULO_LUMEN_REV3)
#include "stm32f4/pins_OPULO_LUMEN_REV3.h" // STM32F4 env:Opulo_Lumen_REV3
#elif MB(MKS_ROBIN_NANO_V1_3_F4)
#include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4 env:mks_robin_nano_v1_3_f4
#include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4 env:mks_robin_nano_v1_3_f4 env:mks_robin_nano_v1_3_f4_usbmod
#elif MB(MKS_EAGLE)
#include "stm32f4/pins_MKS_EAGLE.h" // STM32F4 env:mks_eagle
#elif MB(ARTILLERY_RUBY)
#include "stm32f4/pins_ARTILLERY_RUBY.h" // STM32F4 env:Artillery_Ruby
#elif MB(CREALITY_V24S1_301F4)
#include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4 env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
#elif MB(OPULO_LUMEN_REV4)
#include "stm32f4/pins_OPULO_LUMEN_REV4.h" // STM32F4 env:Opulo_Lumen_REV4
#elif MB(FYSETC_SPIDER_KING407)
#include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4 env:FYSETC_SPIDER_KING407
#elif MB(MKS_SKIPR_V1)
#include "stm32f4/pins_MKS_SKIPR_V1_0.h" // STM32F4 env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
#elif MB(TRONXY_V10)
#include "stm32f4/pins_TRONXY_V10.h" // STM32F4 env:STM32F446_tronxy
//
// ARM Cortex M7
@@ -763,6 +779,13 @@
#elif MB(BRICOLEMON_LITE_V1_0)
#include "samd/pins_BRICOLEMON_LITE_V1_0.h" // SAMD51 env:SAMD51_grandcentral_m4
//
// ReprapWorld Minitronics (SAMD21)
//
#elif MB(MINITRONICS20)
#include "samd/pins_MINITRONICS20.h" // SAMD21 env:SAMD21_minitronics20
//
// Custom board (with custom PIO env)
//

20
Marlin/src/pins/pinsDebug.h
View File

@@ -45,23 +45,23 @@
#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
#include "pinsDebug_list.h"
#line 48
#line 49
// manually add pins that have names that are macros which don't play well with these macros
#if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
#if CONF_SERIAL_IS(0)
#if SERIAL_IN_USE(0)
static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
#endif
#if CONF_SERIAL_IS(1)
#if SERIAL_IN_USE(1)
static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
#endif
#if CONF_SERIAL_IS(2)
#if SERIAL_IN_USE(2)
static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
#endif
#if CONF_SERIAL_IS(3)
#if SERIAL_IN_USE(3)
static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
#endif
@@ -99,7 +99,7 @@ const PinInfo pin_array[] PROGMEM = {
* 2 bytes containing the digital/analog bool flag
*/
#if CONF_SERIAL_IS(0)
#if SERIAL_IN_USE(0)
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
{ RXD_NAME_0, 0, true },
{ TXD_NAME_0, 1, true },
@@ -112,7 +112,7 @@ const PinInfo pin_array[] PROGMEM = {
#endif
#endif
#if CONF_SERIAL_IS(1)
#if SERIAL_IN_USE(1)
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
{ RXD_NAME_1, 19, true },
{ TXD_NAME_1, 18, true },
@@ -130,7 +130,7 @@ const PinInfo pin_array[] PROGMEM = {
#endif
#endif
#if CONF_SERIAL_IS(2)
#if SERIAL_IN_USE(2)
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
{ RXD_NAME_2, 17, true },
{ TXD_NAME_2, 16, true },
@@ -145,7 +145,7 @@ const PinInfo pin_array[] PROGMEM = {
#endif
#endif
#if CONF_SERIAL_IS(3)
#if SERIAL_IN_USE(3)
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
{ RXD_NAME_3, 15, true },
{ TXD_NAME_3, 14, true },
@@ -164,7 +164,7 @@ const PinInfo pin_array[] PROGMEM = {
#endif
#include "pinsDebug_list.h"
#line 167
#line 168
};

1810
Marlin/src/pins/pinsDebug_list.h
View File

File diff suppressed because it is too large Load Diff

563
Marlin/src/pins/pins_postprocess.h
View File

@@ -307,6 +307,76 @@
#define E7_CS_PIN -1
#endif
//
// Destroy stepper driver RX and TX pins when set to -1
//
#if !PIN_EXISTS(Z2_SERIAL_TX)
#undef Z2_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(Z2_SERIAL_RX)
#undef Z2_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(Z3_SERIAL_TX)
#undef Z3_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(Z3_SERIAL_RX)
#undef Z3_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(Z4_SERIAL_TX)
#undef Z4_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(Z4_SERIAL_RX)
#undef Z4_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(X2_SERIAL_TX)
#undef X2_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(X2_SERIAL_RX)
#undef X2_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(Y2_SERIAL_TX)
#undef Y2_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(Y2_SERIAL_RX)
#undef Y2_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(I_SERIAL_TX)
#undef I_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(I_SERIAL_RX)
#undef I_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(J_SERIAL_TX)
#undef J_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(J_SERIAL_RX)
#undef J_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(K_SERIAL_TX)
#undef K_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(K_SERIAL_RX)
#undef K_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(U_SERIAL_TX)
#undef U_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(U_SERIAL_RX)
#undef U_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(V_SERIAL_TX)
#undef V_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(V_SERIAL_RX)
#undef V_SERIAL_RX_PIN
#endif
#if !PIN_EXISTS(W_SERIAL_TX)
#undef W_SERIAL_TX_PIN
#endif
#if !PIN_EXISTS(W_SERIAL_RX)
#undef W_SERIAL_RX_PIN
#endif
#ifndef FAN_PIN
#define FAN_PIN -1
#endif
@@ -645,6 +715,8 @@
#undef FIL_RUNOUT2_PIN
#endif
#undef LCD_PINS_DEFINED
#ifndef LCD_PINS_D4
#define LCD_PINS_D4 -1
#endif
@@ -1787,6 +1859,497 @@
#undef Z4_MAX_PIN
#endif
/**
* X_DUAL_ENDSTOPS endstop reassignment
*/
#if ENABLED(X_DUAL_ENDSTOPS)
#if X_HOME_TO_MAX
#ifndef X2_MAX_PIN
#if PIN_EXISTS(X2_STOP)
#define X2_MAX_PIN X2_STOP_PIN
#elif X2_USE_ENDSTOP == _XMIN_
#define X2_MAX_PIN X_MIN_PIN
#elif X2_USE_ENDSTOP == _XMAX_
#define X2_MAX_PIN X_MAX_PIN
#elif X2_USE_ENDSTOP == _XSTOP_
#define X2_MAX_PIN X_STOP_PIN
#elif X2_USE_ENDSTOP == _YMIN_
#define X2_MAX_PIN Y_MIN_PIN
#elif X2_USE_ENDSTOP == _YMAX_
#define X2_MAX_PIN Y_MAX_PIN
#elif X2_USE_ENDSTOP == _YSTOP_
#define X2_MAX_PIN Y_STOP_PIN
#elif X2_USE_ENDSTOP == _ZMIN_
#define X2_MAX_PIN Z_MIN_PIN
#elif X2_USE_ENDSTOP == _ZMAX_
#define X2_MAX_PIN Z_MAX_PIN
#elif X2_USE_ENDSTOP == _ZSTOP_
#define X2_MAX_PIN Z_STOP_PIN
#elif X2_USE_ENDSTOP == _XDIAG_
#define X2_MAX_PIN X_DIAG_PIN
#elif X2_USE_ENDSTOP == _YDIAG_
#define X2_MAX_PIN Y_DIAG_PIN
#elif X2_USE_ENDSTOP == _ZDIAG_
#define X2_MAX_PIN Z_DIAG_PIN
#elif X2_USE_ENDSTOP == _E0DIAG_
#define X2_MAX_PIN E0_DIAG_PIN
#elif X2_USE_ENDSTOP == _E1DIAG_
#define X2_MAX_PIN E1_DIAG_PIN
#elif X2_USE_ENDSTOP == _E2DIAG_
#define X2_MAX_PIN E2_DIAG_PIN
#elif X2_USE_ENDSTOP == _E3DIAG_
#define X2_MAX_PIN E3_DIAG_PIN
#elif X2_USE_ENDSTOP == _E4DIAG_
#define X2_MAX_PIN E4_DIAG_PIN
#elif X2_USE_ENDSTOP == _E5DIAG_
#define X2_MAX_PIN E5_DIAG_PIN
#elif X2_USE_ENDSTOP == _E6DIAG_
#define X2_MAX_PIN E6_DIAG_PIN
#elif X2_USE_ENDSTOP == _E7DIAG_
#define X2_MAX_PIN E7_DIAG_PIN
#endif
#endif
#else
#ifndef X2_MIN_PIN
#if PIN_EXISTS(X2_STOP)
#define X2_MIN_PIN X2_STOP_PIN
#elif X2_USE_ENDSTOP == _XMIN_
#define X2_MIN_PIN X_MIN_PIN
#elif X2_USE_ENDSTOP == _XMAX_
#define X2_MIN_PIN X_MAX_PIN
#elif X2_USE_ENDSTOP == _XSTOP_
#define X2_MIN_PIN X_STOP_PIN
#elif X2_USE_ENDSTOP == _YMIN_
#define X2_MIN_PIN Y_MIN_PIN
#elif X2_USE_ENDSTOP == _YMAX_
#define X2_MIN_PIN Y_MAX_PIN
#elif X2_USE_ENDSTOP == _YSTOP_
#define X2_MIN_PIN Y_STOP_PIN
#elif X2_USE_ENDSTOP == _ZMIN_
#define X2_MIN_PIN Z_MIN_PIN
#elif X2_USE_ENDSTOP == _ZMAX_
#define X2_MIN_PIN Z_MAX_PIN
#elif X2_USE_ENDSTOP == _ZSTOP_
#define X2_MIN_PIN Z_STOP_PIN
#elif X2_USE_ENDSTOP == _XDIAG_
#define X2_MIN_PIN X_DIAG_PIN
#elif X2_USE_ENDSTOP == _YDIAG_
#define X2_MIN_PIN Y_DIAG_PIN
#elif X2_USE_ENDSTOP == _ZDIAG_
#define X2_MIN_PIN Z_DIAG_PIN
#elif X2_USE_ENDSTOP == _E0DIAG_
#define X2_MIN_PIN E0_DIAG_PIN
#elif X2_USE_ENDSTOP == _E1DIAG_
#define X2_MIN_PIN E1_DIAG_PIN
#elif X2_USE_ENDSTOP == _E2DIAG_
#define X2_MIN_PIN E2_DIAG_PIN
#elif X2_USE_ENDSTOP == _E3DIAG_
#define X2_MIN_PIN E3_DIAG_PIN
#elif X2_USE_ENDSTOP == _E4DIAG_
#define X2_MIN_PIN E4_DIAG_PIN
#elif X2_USE_ENDSTOP == _E5DIAG_
#define X2_MIN_PIN E5_DIAG_PIN
#elif X2_USE_ENDSTOP == _E6DIAG_
#define X2_MIN_PIN E6_DIAG_PIN
#elif X2_USE_ENDSTOP == _E7DIAG_
#define X2_MIN_PIN E7_DIAG_PIN
#endif
#endif
#endif
#endif
/**
* Y_DUAL_ENDSTOPS endstop reassignment
*/
#if ENABLED(Y_DUAL_ENDSTOPS)
#if Y_HOME_TO_MAX
#ifndef Y2_MAX_PIN
#if PIN_EXISTS(Y2_STOP)
#define Y2_MAX_PIN Y2_STOP_PIN
#elif Y2_USE_ENDSTOP == _XMIN_
#define Y2_MAX_PIN X_MIN_PIN
#elif Y2_USE_ENDSTOP == _XMAX_
#define Y2_MAX_PIN X_MAX_PIN
#elif Y2_USE_ENDSTOP == _XSTOP_
#define Y2_MAX_PIN X_STOP_PIN
#elif Y2_USE_ENDSTOP == _YMIN_
#define Y2_MAX_PIN Y_MIN_PIN
#elif Y2_USE_ENDSTOP == _YMAX_
#define Y2_MAX_PIN Y_MAX_PIN
#elif Y2_USE_ENDSTOP == _YSTOP_
#define Y2_MAX_PIN Y_STOP_PIN
#elif Y2_USE_ENDSTOP == _ZMIN_
#define Y2_MAX_PIN Z_MIN_PIN
#elif Y2_USE_ENDSTOP == _ZMAX_
#define Y2_MAX_PIN Z_MAX_PIN
#elif Y2_USE_ENDSTOP == _ZSTOP_
#define Y2_MAX_PIN Z_STOP_PIN
#elif Y2_USE_ENDSTOP == _XDIAG_
#define Y2_MAX_PIN X_DIAG_PIN
#elif Y2_USE_ENDSTOP == _YDIAG_
#define Y2_MAX_PIN Y_DIAG_PIN
#elif Y2_USE_ENDSTOP == _ZDIAG_
#define Y2_MAX_PIN Z_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E0DIAG_
#define Y2_MAX_PIN E0_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E1DIAG_
#define Y2_MAX_PIN E1_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E2DIAG_
#define Y2_MAX_PIN E2_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E3DIAG_
#define Y2_MAX_PIN E3_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E4DIAG_
#define Y2_MAX_PIN E4_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E5DIAG_
#define Y2_MAX_PIN E5_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E6DIAG_
#define Y2_MAX_PIN E6_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E7DIAG_
#define Y2_MAX_PIN E7_DIAG_PIN
#endif
#endif
#else
#ifndef Y2_MIN_PIN
#if PIN_EXISTS(Y2_STOP)
#define Y2_MIN_PIN Y2_STOP_PIN
#elif Y2_USE_ENDSTOP == _XMIN_
#define Y2_MIN_PIN X_MIN_PIN
#elif Y2_USE_ENDSTOP == _XMAX_
#define Y2_MIN_PIN X_MAX_PIN
#elif Y2_USE_ENDSTOP == _XSTOP_
#define Y2_MIN_PIN X_STOP_PIN
#elif Y2_USE_ENDSTOP == _YMIN_
#define Y2_MIN_PIN Y_MIN_PIN
#elif Y2_USE_ENDSTOP == _YMAX_
#define Y2_MIN_PIN Y_MAX_PIN
#elif Y2_USE_ENDSTOP == _YSTOP_
#define Y2_MIN_PIN Y_STOP_PIN
#elif Y2_USE_ENDSTOP == _ZMIN_
#define Y2_MIN_PIN Z_MIN_PIN
#elif Y2_USE_ENDSTOP == _ZMAX_
#define Y2_MIN_PIN Z_MAX_PIN
#elif Y2_USE_ENDSTOP == _ZSTOP_
#define Y2_MIN_PIN Z_STOP_PIN
#elif Y2_USE_ENDSTOP == _XDIAG_
#define Y2_MIN_PIN X_DIAG_PIN
#elif Y2_USE_ENDSTOP == _YDIAG_
#define Y2_MIN_PIN Y_DIAG_PIN
#elif Y2_USE_ENDSTOP == _ZDIAG_
#define Y2_MIN_PIN Z_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E0DIAG_
#define Y2_MIN_PIN E0_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E1DIAG_
#define Y2_MIN_PIN E1_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E2DIAG_
#define Y2_MIN_PIN E2_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E3DIAG_
#define Y2_MIN_PIN E3_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E4DIAG_
#define Y2_MIN_PIN E4_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E5DIAG_
#define Y2_MIN_PIN E5_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E6DIAG_
#define Y2_MIN_PIN E6_DIAG_PIN
#elif Y2_USE_ENDSTOP == _E7DIAG_
#define Y2_MIN_PIN E7_DIAG_PIN
#endif
#endif
#endif
#endif
/**
* Z_MULTI_ENDSTOPS endstop reassignment
*/
#if ENABLED(Z_MULTI_ENDSTOPS)
#if Z_HOME_TO_MAX
#ifndef Z2_MAX_PIN
#if PIN_EXISTS(Z2_STOP)
#define Z2_MAX_PIN Z2_STOP_PIN
#elif Z2_USE_ENDSTOP == _XMIN_
#define Z2_MAX_PIN X_MIN_PIN
#elif Z2_USE_ENDSTOP == _XMAX_
#define Z2_MAX_PIN X_MAX_PIN
#elif Z2_USE_ENDSTOP == _XSTOP_
#define Z2_MAX_PIN X_STOP_PIN
#elif Z2_USE_ENDSTOP == _YMIN_
#define Z2_MAX_PIN Y_MIN_PIN
#elif Z2_USE_ENDSTOP == _YMAX_
#define Z2_MAX_PIN Y_MAX_PIN
#elif Z2_USE_ENDSTOP == _YSTOP_
#define Z2_MAX_PIN Y_STOP_PIN
#elif Z2_USE_ENDSTOP == _ZMIN_
#define Z2_MAX_PIN Z_MIN_PIN
#elif Z2_USE_ENDSTOP == _ZMAX_
#define Z2_MAX_PIN Z_MAX_PIN
#elif Z2_USE_ENDSTOP == _ZSTOP_
#define Z2_MAX_PIN Z_STOP_PIN
#elif Z2_USE_ENDSTOP == _XDIAG_
#define Z2_MAX_PIN X_DIAG_PIN
#elif Z2_USE_ENDSTOP == _YDIAG_
#define Z2_MAX_PIN Y_DIAG_PIN
#elif Z2_USE_ENDSTOP == _ZDIAG_
#define Z2_MAX_PIN Z_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E0DIAG_
#define Z2_MAX_PIN E0_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E1DIAG_
#define Z2_MAX_PIN E1_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E2DIAG_
#define Z2_MAX_PIN E2_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E3DIAG_
#define Z2_MAX_PIN E3_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E4DIAG_
#define Z2_MAX_PIN E4_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E5DIAG_
#define Z2_MAX_PIN E5_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E6DIAG_
#define Z2_MAX_PIN E6_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E7DIAG_
#define Z2_MAX_PIN E7_DIAG_PIN
#endif
#endif
#else
#ifndef Z2_MIN_PIN
#if PIN_EXISTS(Z2_STOP)
#define Z2_MIN_PIN Z2_STOP_PIN
#elif Z2_USE_ENDSTOP == _XMIN_
#define Z2_MIN_PIN X_MIN_PIN
#elif Z2_USE_ENDSTOP == _XMAX_
#define Z2_MIN_PIN X_MAX_PIN
#elif Z2_USE_ENDSTOP == _XSTOP_
#define Z2_MIN_PIN X_STOP_PIN
#elif Z2_USE_ENDSTOP == _YMIN_
#define Z2_MIN_PIN Y_MIN_PIN
#elif Z2_USE_ENDSTOP == _YMAX_
#define Z2_MIN_PIN Y_MAX_PIN
#elif Z2_USE_ENDSTOP == _YSTOP_
#define Z2_MIN_PIN Y_STOP_PIN
#elif Z2_USE_ENDSTOP == _ZMIN_
#define Z2_MIN_PIN Z_MIN_PIN
#elif Z2_USE_ENDSTOP == _ZMAX_
#define Z2_MIN_PIN Z_MAX_PIN
#elif Z2_USE_ENDSTOP == _ZSTOP_
#define Z2_MIN_PIN Z_STOP_PIN
#elif Z2_USE_ENDSTOP == _XDIAG_
#define Z2_MIN_PIN X_DIAG_PIN
#elif Z2_USE_ENDSTOP == _YDIAG_
#define Z2_MIN_PIN Y_DIAG_PIN
#elif Z2_USE_ENDSTOP == _ZDIAG_
#define Z2_MIN_PIN Z_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E0DIAG_
#define Z2_MIN_PIN E0_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E1DIAG_
#define Z2_MIN_PIN E1_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E2DIAG_
#define Z2_MIN_PIN E2_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E3DIAG_
#define Z2_MIN_PIN E3_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E4DIAG_
#define Z2_MIN_PIN E4_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E5DIAG_
#define Z2_MIN_PIN E5_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E6DIAG_
#define Z2_MIN_PIN E6_DIAG_PIN
#elif Z2_USE_ENDSTOP == _E7DIAG_
#define Z2_MIN_PIN E7_DIAG_PIN
#endif
#endif
#endif
#if NUM_Z_STEPPERS >= 3
#if Z_HOME_TO_MAX
#ifndef Z3_MAX_PIN
#if PIN_EXISTS(Z3_STOP)
#define Z3_MAX_PIN Z3_STOP_PIN
#elif Z3_USE_ENDSTOP == _XMIN_
#define Z3_MAX_PIN X_MIN_PIN
#elif Z3_USE_ENDSTOP == _XMAX_
#define Z3_MAX_PIN X_MAX_PIN
#elif Z3_USE_ENDSTOP == _XSTOP_
#define Z3_MAX_PIN X_STOP_PIN
#elif Z3_USE_ENDSTOP == _YMIN_
#define Z3_MAX_PIN Y_MIN_PIN
#elif Z3_USE_ENDSTOP == _YMAX_
#define Z3_MAX_PIN Y_MAX_PIN
#elif Z3_USE_ENDSTOP == _YSTOP_
#define Z3_MAX_PIN Y_STOP_PIN
#elif Z3_USE_ENDSTOP == _ZMIN_
#define Z3_MAX_PIN Z_MIN_PIN
#elif Z3_USE_ENDSTOP == _ZMAX_
#define Z3_MAX_PIN Z_MAX_PIN
#elif Z3_USE_ENDSTOP == _ZSTOP_
#define Z3_MAX_PIN Z_STOP_PIN
#elif Z3_USE_ENDSTOP == _XDIAG_
#define Z3_MAX_PIN X_DIAG_PIN
#elif Z3_USE_ENDSTOP == _YDIAG_
#define Z3_MAX_PIN Y_DIAG_PIN
#elif Z3_USE_ENDSTOP == _ZDIAG_
#define Z3_MAX_PIN Z_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E0DIAG_
#define Z3_MAX_PIN E0_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E1DIAG_
#define Z3_MAX_PIN E1_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E2DIAG_
#define Z3_MAX_PIN E2_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E3DIAG_
#define Z3_MAX_PIN E3_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E4DIAG_
#define Z3_MAX_PIN E4_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E5DIAG_
#define Z3_MAX_PIN E5_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E6DIAG_
#define Z3_MAX_PIN E6_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E7DIAG_
#define Z3_MAX_PIN E7_DIAG_PIN
#endif
#endif
#else
#ifndef Z3_MIN_PIN
#if PIN_EXISTS(Z3_STOP)
#define Z3_MIN_PIN Z3_STOP_PIN
#elif Z3_USE_ENDSTOP == _XMIN_
#define Z3_MIN_PIN X_MIN_PIN
#elif Z3_USE_ENDSTOP == _XMAX_
#define Z3_MIN_PIN X_MAX_PIN
#elif Z3_USE_ENDSTOP == _XSTOP_
#define Z3_MIN_PIN X_STOP_PIN
#elif Z3_USE_ENDSTOP == _YMIN_
#define Z3_MIN_PIN Y_MIN_PIN
#elif Z3_USE_ENDSTOP == _YMAX_
#define Z3_MIN_PIN Y_MAX_PIN
#elif Z3_USE_ENDSTOP == _YSTOP_
#define Z3_MIN_PIN Y_STOP_PIN
#elif Z3_USE_ENDSTOP == _ZMIN_
#define Z3_MIN_PIN Z_MIN_PIN
#elif Z3_USE_ENDSTOP == _ZMAX_
#define Z3_MIN_PIN Z_MAX_PIN
#elif Z3_USE_ENDSTOP == _ZSTOP_
#define Z3_MIN_PIN Z_STOP_PIN
#elif Z3_USE_ENDSTOP == _XDIAG_
#define Z3_MIN_PIN X_DIAG_PIN
#elif Z3_USE_ENDSTOP == _YDIAG_
#define Z3_MIN_PIN Y_DIAG_PIN
#elif Z3_USE_ENDSTOP == _ZDIAG_
#define Z3_MIN_PIN Z_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E0DIAG_
#define Z3_MIN_PIN E0_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E1DIAG_
#define Z3_MIN_PIN E1_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E2DIAG_
#define Z3_MIN_PIN E2_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E3DIAG_
#define Z3_MIN_PIN E3_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E4DIAG_
#define Z3_MIN_PIN E4_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E5DIAG_
#define Z3_MIN_PIN E5_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E6DIAG_
#define Z3_MIN_PIN E6_DIAG_PIN
#elif Z3_USE_ENDSTOP == _E7DIAG_
#define Z3_MIN_PIN E7_DIAG_PIN
#endif
#endif
#endif
#endif
#if NUM_Z_STEPPERS >= 4
#if Z_HOME_TO_MAX
#ifndef Z4_MAX_PIN
#if PIN_EXISTS(Z4_STOP)
#define Z4_MAX_PIN Z4_STOP_PIN
#elif Z4_USE_ENDSTOP == _XMIN_
#define Z4_MAX_PIN X_MIN_PIN
#elif Z4_USE_ENDSTOP == _XMAX_
#define Z4_MAX_PIN X_MAX_PIN
#elif Z4_USE_ENDSTOP == _XSTOP_
#define Z4_MAX_PIN X_STOP_PIN
#elif Z4_USE_ENDSTOP == _YMIN_
#define Z4_MAX_PIN Y_MIN_PIN
#elif Z4_USE_ENDSTOP == _YMAX_
#define Z4_MAX_PIN Y_MAX_PIN
#elif Z4_USE_ENDSTOP == _YSTOP_
#define Z4_MAX_PIN Y_STOP_PIN
#elif Z4_USE_ENDSTOP == _ZMIN_
#define Z4_MAX_PIN Z_MIN_PIN
#elif Z4_USE_ENDSTOP == _ZMAX_
#define Z4_MAX_PIN Z_MAX_PIN
#elif Z4_USE_ENDSTOP == _ZSTOP_
#define Z4_MAX_PIN Z_STOP_PIN
#elif Z4_USE_ENDSTOP == _XDIAG_
#define Z4_MAX_PIN X_DIAG_PIN
#elif Z4_USE_ENDSTOP == _YDIAG_
#define Z4_MAX_PIN Y_DIAG_PIN
#elif Z4_USE_ENDSTOP == _ZDIAG_
#define Z4_MAX_PIN Z_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E0DIAG_
#define Z4_MAX_PIN E0_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E1DIAG_
#define Z4_MAX_PIN E1_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E2DIAG_
#define Z4_MAX_PIN E2_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E3DIAG_
#define Z4_MAX_PIN E3_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E4DIAG_
#define Z4_MAX_PIN E4_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E5DIAG_
#define Z4_MAX_PIN E5_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E6DIAG_
#define Z4_MAX_PIN E6_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E7DIAG_
#define Z4_MAX_PIN E7_DIAG_PIN
#endif
#endif
#else
#ifndef Z4_MIN_PIN
#if PIN_EXISTS(Z4_STOP)
#define Z4_MIN_PIN Z4_STOP_PIN
#elif Z4_USE_ENDSTOP == _XMIN_
#define Z4_MIN_PIN X_MIN_PIN
#elif Z4_USE_ENDSTOP == _XMAX_
#define Z4_MIN_PIN X_MAX_PIN
#elif Z4_USE_ENDSTOP == _XSTOP_
#define Z4_MIN_PIN X_STOP_PIN
#elif Z4_USE_ENDSTOP == _YMIN_
#define Z4_MIN_PIN Y_MIN_PIN
#elif Z4_USE_ENDSTOP == _YMAX_
#define Z4_MIN_PIN Y_MAX_PIN
#elif Z4_USE_ENDSTOP == _YSTOP_
#define Z4_MIN_PIN Y_STOP_PIN
#elif Z4_USE_ENDSTOP == _ZMIN_
#define Z4_MIN_PIN Z_MIN_PIN
#elif Z4_USE_ENDSTOP == _ZMAX_
#define Z4_MIN_PIN Z_MAX_PIN
#elif Z4_USE_ENDSTOP == _ZSTOP_
#define Z4_MIN_PIN Z_STOP_PIN
#elif Z4_USE_ENDSTOP == _XDIAG_
#define Z4_MIN_PIN X_DIAG_PIN
#elif Z4_USE_ENDSTOP == _YDIAG_
#define Z4_MIN_PIN Y_DIAG_PIN
#elif Z4_USE_ENDSTOP == _ZDIAG_
#define Z4_MIN_PIN Z_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E0DIAG_
#define Z4_MIN_PIN E0_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E1DIAG_
#define Z4_MIN_PIN E1_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E2DIAG_
#define Z4_MIN_PIN E2_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E3DIAG_
#define Z4_MIN_PIN E3_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E4DIAG_
#define Z4_MIN_PIN E4_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E5DIAG_
#define Z4_MIN_PIN E5_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E6DIAG_
#define Z4_MIN_PIN E6_DIAG_PIN
#elif Z4_USE_ENDSTOP == _E7DIAG_
#define Z4_MIN_PIN E7_DIAG_PIN
#endif
#endif
#endif
#endif
#endif // Z_MULTI_ENDSTOPS
//
// Default DOGLCD SPI delays
//

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

@@ -136,27 +136,56 @@
#ifndef FAN1_PIN
#ifdef MK3_FAN_PINS
#define FAN1_PIN -1
#define FAN1_PIN -1
#else
#define FAN1_PIN 6
#define FAN1_PIN 6
#endif
#endif
/**
* ------ ------ ------
* 84 PH2 | 1 2 | PH6 9 50 MISO | 1 2 | SCK 52 62 PK0 | 1 2 | PJ5 76
* 61 PF7 | 3 4 | PD5 82 72 PJ2 | 3 4 | SDSS 77 20 SDA | 3 4 | GND
* 59 PF5 | 5 6 PG4 70 14 TX3 | 5 6 MOSI 51 21 SCL | 5 6 RX2 16
* 85 PH7 | 7 8 | PG3 71 15 RX3 | 7 8 | RESET GND | 7 8 | TX2 17
* GND | 9 10 | 5V GND | 9 10 | PE3 5 5V | 9 10 | 5V
* ------ ------ ------
* P1 P2 P3
*/
#define EXP1_01_PIN 84
#define EXP1_02_PIN 9
#define EXP1_03_PIN 61
#define EXP1_04_PIN 82
#define EXP1_05_PIN 59
#define EXP1_06_PIN 70
#define EXP1_07_PIN 85
#define EXP1_08_PIN 71
#define EXP2_01_PIN 50
#define EXP2_02_PIN 52
#define EXP2_03_PIN 72
#define EXP2_04_PIN 77
#define EXP2_05_PIN 14
#define EXP2_06_PIN 51
#define EXP2_07_PIN 15
#define EXP2_08_PIN -1
//
// Misc. Functions
//
#define SDSS 77
#define SDSS EXP2_04_PIN
#define LED_PIN 13
#ifndef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 9
#define CASE_LIGHT_PIN EXP1_02_PIN
#endif
//
// M3/M4/M5 - Spindle/Laser Control
//
// use P1 connector for spindle pins
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
#define SPINDLE_LASER_PWM_PIN EXP1_02_PIN // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 18 // Pullup!
#define SPINDLE_DIR_PIN 19
@@ -179,20 +208,20 @@
#if IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85
#define LCD_PINS_ENABLE 71
#define LCD_PINS_D4 70
#define BTN_EN1 61
#define BTN_EN2 59
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#else
#define LCD_PINS_RS 82
#define LCD_PINS_ENABLE 61
#define LCD_PINS_D4 59
#define LCD_PINS_D5 70
#define LCD_PINS_D6 85
#define LCD_PINS_D7 71
#define BTN_EN1 14
#define BTN_EN2 72
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 EXP2_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -200,9 +229,9 @@
#endif
#define BTN_ENC 9 // AUX-2
#define BEEPER_PIN 84 // AUX-4
#define SD_DETECT_PIN 15
#define BTN_ENC EXP1_02_PIN // P1
#define BEEPER_PIN EXP1_01_PIN // P1
#define SD_DETECT_PIN EXP2_07_PIN
#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_WIRED_LCD

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

@@ -66,6 +66,8 @@
#define MOSFET_C_PIN 9
#define MOSFET_D_PIN 12
#define HEATER_2_PIN 6
//
// Misc. Functions
//
@@ -122,16 +124,6 @@
#endif
#endif
#include "pins_RAMPS.h"
//
// Heaters / Fans
//
#define HEATER_2_PIN 6
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 53
//
// LCD / Controller
//
@@ -139,12 +131,6 @@
#undef BEEPER_PIN
// TODO: Remap EXP1/2 based on adapter
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 37
@@ -153,13 +139,12 @@
#define LCD_PINS_D7 31
// Buttons
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define BTN_EN1 16
#define BTN_EN2 17
#define BTN_ENC 23
#define LCD_PINS_DEFINED
#else
#define BEEPER_PIN 33
@@ -171,3 +156,7 @@
#define BOARD_ST7920_DELAY_2 188
#define BOARD_ST7920_DELAY_3 0
#endif
#define SD_DETECT_PIN 53
#include "pins_RAMPS.h"

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

@@ -50,6 +50,10 @@
#define X_STOP_PIN 3
#define Y_STOP_PIN 14
#if EITHER(BLTOUCH, TOUCH_MI_PROBE)
#define HAS_INVERTED_PROBE
#endif
#include "pins_3DRAG.h" // ... RAMPS
//

31
Marlin/src/pins/ramps/pins_K8600.h
View File

@@ -37,8 +37,7 @@
//
#define X_MIN_PIN 3
#define Y_MAX_PIN 14
#define Z_MAX_PIN 18
#define Z_MIN_PIN -1
#define Z_STOP_PIN 18
//
// Steppers
@@ -48,6 +47,7 @@
//
// Heaters / Fans
//
#define HEATER_BED_PIN -1
#define FAN_PIN 8
//
@@ -56,28 +56,11 @@
#define SDSS 25
#define CASE_LIGHT_PIN 7
//
// Other RAMPS pins
//
#include "pins_RAMPS.h"
//
// Heaters / Fans
//
#undef HEATER_BED_PIN
//
// LCD / Controller
//
#if HAS_WIRED_LCD && IS_NEWPANEL
#undef BEEPER_PIN
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 37
@@ -86,15 +69,19 @@
#define LCD_PINS_D7 31
// Buttons
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define BTN_EN1 17
#define BTN_EN2 16
#define BTN_ENC 23
#define LCD_PINS_DEFINED
#else
#define BEEPER_PIN 33
#endif
//
// Other RAMPS pins
//
#include "pins_RAMPS.h"

96
Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
View File

@@ -33,56 +33,68 @@
#endif
#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || SERIAL_PORT_3 == 1
#warning "Serial 1 is originally reserved to DGUS LCD."
#warning "Serial 1 is originally reserved for DGUS LCD."
#endif
#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || SERIAL_PORT_3 == 2 || LCD_SERIAL_PORT == 2
#warning "Serial 2 has no connector. Hardware changes may be required to use it."
#endif
#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || SERIAL_PORT_3 == 3 || LCD_SERIAL_PORT == 3
#define CHANGE_Y_LIMIT_PINS
#warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
#warning "Serial 3 is originally reserved for Y limit switches. Hardware changes are required to use it."
#define Y_STOP_PIN 37
#if MB(LONGER3D_LKx_PRO)
#define Z_STOP_PIN 35
#endif
#endif
// Custom flags and defines for the build
//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
#define BOARD_INFO_NAME "LGT KIT V1.0"
#if ENABLED(LONGER_LK5)
#define DEFAULT_MACHINE_NAME "LONGER LK5"
#else
#define DEFAULT_MACHINE_NAME "LONGER 3D Printer"
#endif
//
// Servos
//
#if !MB(LONGER3D_LK1_PRO)
#if MB(LONGER3D_LKx_PRO)
#define SERVO0_PIN 7
#endif
#define SERVO1_PIN -1
#define SERVO2_PIN -1
#define SERVO3_PIN -1
#define SERVO1_PIN -1
#define SERVO2_PIN -1
#define SERVO3_PIN -1
//
// Limit Switches
//
#define X_STOP_PIN 3
#ifdef CHANGE_Y_LIMIT_PINS
#define Y_STOP_PIN 37
#if ENABLED(LONGER_LK5)
#define X_MIN_PIN 3
#define X_MAX_PIN 2
#else
#define Y_MIN_PIN 14
#define Y_MAX_PIN 15
#define X_STOP_PIN 3
#endif
#if !MB(LONGER3D_LK1_PRO)
#ifdef CHANGE_Y_LIMIT_PINS
#define Z_STOP_PIN 35
#if !ANY_PIN(Y_MIN, Y_MAX, Y_STOP)
#if ENABLED(LONGER_LK5)
#define Y_STOP_PIN 14
#else
#define Z_MIN_PIN 35
#define Z_MAX_PIN 37
#define Y_MIN_PIN 14
#define Y_MAX_PIN 15
#endif
#endif
#if !ANY_PIN(Z_MIN, Z_MAX, Z_STOP)
#if MB(LONGER3D_LKx_PRO)
#define Z_MIN_PIN 35
#else
#define Z_MIN_PIN 11
#endif
#else
#define Z_MIN_PIN 11
#define Z_MAX_PIN 37
#endif
#undef CHANGE_Y_LIMIT_PINS
//
// Z Probe (when not Z_MIN_PIN)
//
#define Z_MIN_PROBE_PIN -1
//
// Steppers - No E1 pins
@@ -92,11 +104,6 @@
#define E1_ENABLE_PIN -1
#define E1_CS_PIN -1
//
// Z Probe (when not Z_MIN_PIN)
//
#define Z_MIN_PROBE_PIN -1
//
// Temperature Sensors
//
@@ -115,7 +122,36 @@
#define SD_DETECT_PIN 49
#define FIL_RUNOUT_PIN 2
// ------------------ ---------------- --------------- -------------
// Aux-1 | D19 D18 GND 5V | J21 | D4 D5 D6 GND | J17 | D11 GND 24V | J18 | D7 GND 5V |
// ------------------ ---------------- --------------- -------------
#if BOTH(CR10_STOCKDISPLAY, LONGER_LK5)
/** CR-10 Stock Display
* ------
* GND | 9 10 | 5V
* LCD_PINS_RS D5 | 7 8 | D4 LCD_PINS_ENABLE
* BTN_EN2 D19 | 5 6 D6 LCD_PINS_D4
* BTN_EN1 D18 | 3 4 | GND
* BEEPER_PIN D11 | 1 2 | D15 BTN_ENC
* ------
* Connected via provided custom cable to:
* Aux-1, J21, J17 and Y-Max.
*/
#define LCD_PINS_RS 5
#define LCD_PINS_ENABLE 4
#define LCD_PINS_D4 6
#define BTN_EN1 18
#define BTN_EN2 19
#define BTN_ENC 15
#define BEEPER_PIN 11
#define SDCARD_CONNECTION ONBOARD
#define LCD_PINS_DEFINED
#endif
//
// Other RAMPS 1.3 pins
//
#include "pins_RAMPS_13.h" // ... RAMPS
#include "pins_RAMPS_13.h" // ... pins_RAMPS.h

16
Marlin/src/pins/ramps/pins_ORTUR_4.h
View File

@@ -75,31 +75,25 @@
#define E0_SERIAL_RX_PIN 65
#endif
#include "pins_RAMPS.h"
//
// LCD / Controller
//
#if IS_RRD_FG_SC
#undef BEEPER_PIN
#define BEEPER_PIN 35
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 23
#define LCD_PINS_D4 37
#undef LCD_SDSS
#undef SD_DETECT_PIN
#define LCD_SDSS 53
#define SD_DETECT_PIN 49
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define BTN_EN1 29
#define BTN_EN2 25
#define BTN_ENC 16
#define LCD_PINS_DEFINED
#endif
#include "pins_RAMPS.h"

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

@@ -233,16 +233,22 @@
#define HEATER_0_PIN MOSFET_A_PIN
#if FET_ORDER_EFB // Hotend, Fan, Bed
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#elif FET_ORDER_EEF // Hotend, Hotend, Fan
#define HEATER_1_PIN MOSFET_B_PIN
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
#define HEATER_1_PIN MOSFET_B_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#elif FET_ORDER_EFF // Hotend, Fan, Fan
#define FAN1_PIN MOSFET_C_PIN
#elif DISABLED(FET_ORDER_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
#define HEATER_1_PIN MOSFET_D_PIN
#else
@@ -585,7 +591,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_WIRED_LCD
#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED)
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
@@ -715,7 +721,9 @@
#define BTN_EN1 AUX2_05_PIN
#define BTN_EN2 AUX2_03_PIN
#define BTN_ENC AUX2_04_PIN
#define SD_DETECT_PIN AUX2_08_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX2_08_PIN
#endif
#elif ENABLED(LCD_I2C_PANELOLU2)
@@ -732,7 +740,9 @@
#define BTN_ENC -1
#define LCD_SDSS SDSS
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#elif EITHER(VIKI2, miniVIKI)
@@ -748,7 +758,9 @@
#define BTN_EN2 7
#define BTN_ENC AUX4_08_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#endif
#define KILL_PIN EXP2_03_PIN
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -764,7 +776,9 @@
#define BTN_ENC EXP2_03_PIN
#define LCD_SDSS SDSS
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define KILL_PIN EXP2_08_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
@@ -833,7 +847,9 @@
#define BTN_EN2 AUX2_04_PIN
#define BTN_ENC AUX2_03_PIN
#define SD_DETECT_PIN AUX3_02_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX3_02_PIN
#endif
#define KILL_PIN AUX2_05_PIN
#elif ENABLED(ZONESTAR_LCD)
@@ -848,7 +864,9 @@
#define BEEPER_PIN EXP1_01_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define KILL_PIN EXP2_08_PIN
#define BTN_EN1 EXP2_05_PIN
@@ -857,7 +875,9 @@
#elif IS_TFTGLCD_PANEL
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#else
@@ -876,7 +896,7 @@
#endif
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD
#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT_PIN AUX2_06_PIN
@@ -933,7 +953,9 @@
#define BEEPER_PIN EXP1_01_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define CLCD_MOD_RESET EXP2_05_PIN
#define CLCD_SPI_CS EXP2_03_PIN

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

@@ -103,9 +103,9 @@
// Direction buttons
#define BTN_UP 37
#define BTN_DWN 35
#define BTN_LFT 33
#define BTN_RT 32
#define BTN_DOWN 35
#define BTN_LEFT 33
#define BTN_RIGHT 32
// 'R' button
#undef BTN_ENC

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

@@ -40,78 +40,97 @@
//
// PWM FETS
//
#if EITHER(FET_ORDER_EEF, FET_ORDER_EEB)
#define MOSFET_B_PIN 45 // HEATER1
#elif FET_ORDER_EFB
#define MOSFET_B_PIN 9 // FAN0
#else
#define MOSFET_B_PIN 7 // FAN1
#endif
#if FET_ORDER_EEB
#define MOSFET_C_PIN 8 // BED
#elif FET_ORDER_EFB
#if DISABLED(ANYCUBIC_LCD_CHIRON)
#define MOSFET_C_PIN 8
#else
#define MOSFET_C_PIN 45
#endif
#else // EEF, EFF
#define MOSFET_C_PIN 9
#endif
#if FET_ORDER_EEB
#define FAN_PIN 9 // Override pin 4 in pins_RAMPS.h
#endif
#define MOSFET_B_PIN 45 // HEATER1
//
// Heaters / Fans
//
#if ANY(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFB)
#define FAN1_PIN 7
#endif
#define FAN2_PIN 44
#define FAN_PIN 9 // FAN0
#define FAN1_PIN 7 // FAN1
#define FAN2_PIN 44 // FAN2
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN 44 // Used in Anycubic Kossel example config
#endif
#if ANY(ANYCUBIC_LCD_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON)
#define CONTROLLER_FAN_PIN 7
#define E0_AUTO_FAN_PIN FAN2_PIN
#endif
//
// AnyCubic standard pin mappings
// AnyCubic pin mappings
//
// Define the appropriate mapping option in Configuration.h:
// - TRIGORILLA_MAPPING_CHIRON
// - TRIGORILLA_MAPPING_I3MEGA
//
// On most printers, endstops are NOT all wired to the appropriate pins on the Trigorilla board.
// For instance, on a Chiron, Y axis goes to an aux connector.
// There are also other things that have been wired in creative ways.
// To enable PIN definitions for a specific printer model, #define the appropriate symbol after
// MOTHERBOARD in Configuration.h
//
// Limit Switches
//
//#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
#if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
#define X_MAX_PIN 43
#define Y_STOP_PIN 19
#elif ANY(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON) // PATCH: Knutwurst
#define Y_STOP_PIN 42
#define Z2_MIN_PIN 43
#define CONTROLLER_FAN_PIN FAN1_PIN // PATCH: knutwurst
#elif ANY(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA, KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_MEGA_X, KNUTWURST_4MAXP2, KNUTWURST_CHIRON) // PATCH: Knutwurst
// Chiron uses AUX header for Y and Z endstops
#define Y_STOP_PIN 42 // AUX
#define Z_STOP_PIN 43 // AUX
#define Z2_MIN_PIN 18 // Z-
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 2
#endif
#ifndef FIL_RUNOUT_PIN
#if EITHER(ANYCUBIC_LCD_CHIRON, KNUTWURST_CHIRON) // PATCH: Knutwurst
#define CONTROLLER_FAN_PIN FAN1_PIN
#if ENABLED(POWER_LOSS_RECOVERY)
#define OUTAGETEST_PIN 79
#define OUTAGECON_PIN 58
#endif
#if EITHER(TRIGORILLA_MAPPING_CHIRON, KNUTWURST_CHIRON) // PATCH: Knutwurst
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 33
#else
#endif
#define HEATER_BED_PIN MOSFET_B_PIN // HEATER1
#else
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 19
#endif
#endif
#if EITHER(TRIGORILLA_MAPPING_CHIRON, SWAP_Z_MOTORS)
// Chiron and some Anycubic i3 MEGAs swap Z steppers
#define Z_STEP_PIN 36
#define Z_DIR_PIN 34
#define Z_ENABLE_PIN 30
#define Z_CS_PIN 44
#define Z2_STEP_PIN 46
#define Z2_DIR_PIN 48
#define Z2_ENABLE_PIN 62
#define Z2_CS_PIN 40
#endif
#endif
#if EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
#define BEEPER_PIN 31
#define SD_DETECT_PIN 49
#endif
#if HAS_TMC_UART
#ifndef X_SERIAL_TX_PIN
#define X_SERIAL_TX_PIN SERVO1_PIN
#endif
#ifndef Y_SERIAL_TX_PIN
#define Y_SERIAL_TX_PIN SERVO0_PIN
#endif
#ifndef Z_SERIAL_TX_PIN
#define Z_SERIAL_TX_PIN SERVO3_PIN
#endif
#ifndef E0_SERIAL_TX_PIN
#define E0_SERIAL_TX_PIN SERVO2_PIN
#endif
#endif
#include "pins_RAMPS.h"
//

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

@@ -107,8 +107,8 @@
#define SDSS 53
#define SD_DETECT_PIN 39
#define LED_PIN 8
#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
//#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
//#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
//
// LCD / Controller

61
Marlin/src/pins/ramps/pins_ZRIB_V20.h
View File

@@ -26,62 +26,37 @@
* V2 and V3 Boards only differ in USB controller, nothing affecting the pins.
*/
#include "pins_MKS_GEN_13.h" // ... RAMPS
#define ZRIB_V20_D6_PIN 6 // Fan
#define ZRIB_V20_D9_PIN 9 // Fan2
#define ZRIB_V20_A10_PIN 10
#define ZRIB_V20_D16_PIN 16
#define ZRIB_V20_D17_PIN 17
#define ZRIB_V20_D23_PIN 23
#define ZRIB_V20_D25_PIN 25
#define ZRIB_V20_D27_PIN 27
#define ZRIB_V20_D29_PIN 29
#define ZRIB_V20_D37_PIN 37
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 11 // Analog Input
#endif
//
// Auto fans
//
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E0_AUTO_FAN_PIN 6 // Fan
#endif
#ifndef E1_AUTO_FAN_PIN
#define E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E1_AUTO_FAN_PIN 6
#endif
#ifndef E2_AUTO_FAN_PIN
#define E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E2_AUTO_FAN_PIN 6
#endif
#ifndef E3_AUTO_FAN_PIN
#define E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#endif
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 11 // Analog Input
#define E3_AUTO_FAN_PIN 6
#endif
#if ENABLED(ZONESTAR_LCD)
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#undef ADC_KEYPAD_PIN
#undef BEEPER_PIN
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define ADC_KEYPAD_PIN 10 // Analog Input
#define BEEPER_PIN 37
#undef SHIFT_OUT_PIN
#undef SHIFT_CLK_PIN
#undef SHIFT_LD_PIN
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define LCD_PINS_RS ZRIB_V20_D16_PIN
#define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
#define LCD_PINS_D4 ZRIB_V20_D23_PIN
#define LCD_PINS_D5 ZRIB_V20_D25_PIN
#define LCD_PINS_D6 ZRIB_V20_D27_PIN
#define LCD_PINS_D7 ZRIB_V20_D29_PIN
#define ADC_KEYPAD_PIN ZRIB_V20_A10_PIN
#define BEEPER_PIN ZRIB_V20_D37_PIN
#define LCD_PINS_DEFINED
#endif
#include "pins_MKS_GEN_13.h" // ... RAMPS

19
Marlin/src/pins/ramps/pins_ZRIB_V52.h
View File

@@ -47,6 +47,16 @@
#define E2_DIR_PIN 5
#define E2_ENABLE_PIN 22
//
// Servos / XS3 Connector
//
#ifndef SERVO0_PIN
#define SERVO0_PIN 65 // PWM
#endif
#ifndef SERVO1_PIN
#define SERVO1_PIN 66 // PWM
#endif
#include "pins_MKS_BASE_common.h" // ... RAMPS
/**
@@ -78,20 +88,13 @@
* | GND |
* ==========
*
* XS3 Connector
* Servos / XS3 Connector
* =================
* | 65 | GND | 5V | (65) PK3 ** Pin86 ** A11
* |----|-----|----|
* | 66 | GND | 5V | (66) PK4 ** Pin85 ** A12
* =================
*
* Servos Connector
* =================
* | 11 | GND | 5V | (11) PB5 ** Pin24 ** PWM11
* |----|-----|----|
* | 12 | GND | 5V | (12) PB6 ** Pin25 ** PWM12
* =================
*
* ICSP
* =================
* | 5V | 51 | GND | (51) PB2 ** Pin21 ** SPI_MOSI

12
Marlin/src/pins/ramps/pins_ZRIB_V53.h
View File

@@ -62,10 +62,10 @@
// Servos / XS3 Connector
//
#ifndef SERVO0_PIN
#define SERVO0_PIN 11 // Analog Output
#define SERVO0_PIN 65 // PWM
#endif
#ifndef SERVO1_PIN
#define SERVO1_PIN 12 // Analog Output
#define SERVO1_PIN 66 // PWM
#endif
//
@@ -424,18 +424,12 @@
* |--------| Power
* | GND |
* ==========
* XS3 Connector
* Servos / XS3 Connector
* =================
* | 65 | GND | 5V | (65) PK3 ** Pin86 ** A11
* |----|-----|----|
* | 66 | GND | 5V | (66) PK4 ** Pin85 ** A12
* =================
* XS3/Servos Connector
* =================
* | 11 | GND | 5V | (11) PB5 ** Pin24 ** PWM11
* |----|-----|----|
* | 12 | GND | 5V | (12) PB6 ** Pin25 ** PWM12
* =================
* ICSP
* =================
* | 5V | 51 | GND | (51) PB2 ** Pin21 ** SPI_MOSI

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

@@ -85,6 +85,13 @@
#define Z_MS1_PIN 44 // PC19
#define E0_MS1_PIN 45 // PC18
#ifndef MICROSTEP16
#define MICROSTEP16 LOW,LOW,LOW
#endif
#ifndef MICROSTEP32
#define MICROSTEP32 HIGH,HIGH,LOW
#endif
//#define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT
//

2
Marlin/src/pins/samd/pins_RAMPS_144.h
View File

@@ -452,7 +452,7 @@
//#define SD_DETECT_PIN 49
//#ifndef KILL_PIN
// #define KILL_PIN 41
// #define KILL_PIN 41
//#endif
#if ENABLED(MKS_MINI_12864)

2
Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
View File

@@ -27,4 +27,6 @@
#define BOARD_INFO_NAME "Azteeg X1"
#define FAN_PIN 4
#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

4
Marlin/src/pins/sanguino/pins_MELZI.h
View File

@@ -29,7 +29,9 @@
#define BOARD_INFO_NAME "Melzi"
#endif
#define IS_MELZI 1
#ifndef FAN_PIN
#define FAN_PIN 4
#endif
// Alter timing for graphical display
#if IS_U8GLIB_ST7920

28
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@@ -42,24 +42,24 @@
#define BOARD_ST7920_DELAY_3 125
#endif
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
//
// For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
//
#undef LCD_SDSS
#undef LED_PIN
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
#define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
#define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK
#define BTN_ENC 16
#define BTN_EN1 11
#define BTN_EN2 10
#define BEEPER_PIN 27
#define LCD_PINS_DEFINED
#endif
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
#if ENABLED(BLTOUCH)
#ifndef SERVO0_PIN

26
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
View File

@@ -27,19 +27,15 @@
#define BOARD_INFO_NAME "Melzi (Malyan)"
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 17 // ST9720 CS
#define LCD_PINS_ENABLE 16 // ST9720 DAT
#define LCD_PINS_D4 11 // ST9720 CLK
#define BTN_EN1 30
#define BTN_EN2 29
#define BTN_ENC 28
#define LCD_PINS_DEFINED
#endif
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
#undef LCD_SDSS
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define LCD_PINS_RS 17 // ST9720 CS
#define LCD_PINS_ENABLE 16 // ST9720 DAT
#define LCD_PINS_D4 11 // ST9720 CLK
#define BTN_EN1 30
#define BTN_EN2 29
#define BTN_ENC 28

41
Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
View File

@@ -27,6 +27,24 @@
#define BOARD_INFO_NAME "Melzi (Tronxy)"
#define Z_ENABLE_PIN 14
#define LCD_SDSS -1
#if EITHER(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 16
#define LCD_PINS_D5 17
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define BTN_EN1 10
#define BTN_EN2 11
#define BTN_ENC 26
#define LCD_PINS_DEFINED
#endif
// Alter timing for graphical display
#if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 0
@@ -35,26 +53,3 @@
#endif
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
#undef Z_ENABLE_PIN
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#undef LCD_SDSS
#define Z_ENABLE_PIN 14
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 16
#define LCD_PINS_D5 17
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define BTN_EN1 10
#define BTN_EN2 11
#define BTN_ENC 26

36
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@@ -90,30 +90,18 @@
//
#define HEATER_0_PIN 13 // (extruder)
#if ENABLED(SANGUINOLOLU_V_1_2)
#define HEATER_BED_PIN 12 // (bed)
#define X_ENABLE_PIN 14
#define Y_ENABLE_PIN 14
#define Z_ENABLE_PIN 26
#define E0_ENABLE_PIN 14
#if !defined(FAN_PIN) && ENABLED(LCD_I2C_PANELOLU2)
#define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
#endif
#else
#ifndef FAN_PIN
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
#if DISABLED(SANGUINOLOLU_V_1_2)
#define HEATER_BED_PIN 14 // (bed)
#define X_ENABLE_PIN 4
#define Y_ENABLE_PIN 4
#define Z_ENABLE_PIN 4
#ifndef Z_ENABLE_PIN
#define Z_ENABLE_PIN 4
#endif
#define E0_ENABLE_PIN 4
#endif
#if !defined(FAN_PIN) && (MB(AZTEEG_X1, STB_11) || IS_MELZI)
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
//
@@ -151,7 +139,7 @@
//
// LCD / Controller
//
#if HAS_WIRED_LCD
#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED)
#define SD_DETECT_PIN -1
@@ -245,7 +233,9 @@
#if IS_MELZI
#define BTN_ENC 29
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#ifndef LCD_SDSS
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#endif
#else
#define BTN_ENC 30
#endif
@@ -253,7 +243,9 @@
#else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
#define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#ifndef LCD_SDSS
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif
#endif

12
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
View File

@@ -38,5 +38,17 @@
#define BOARD_INFO_NAME "Sanguinololu 1.2"
#endif
#define HEATER_BED_PIN 12 // (bed)
#define X_ENABLE_PIN 14
#define Y_ENABLE_PIN 14
#ifndef Z_ENABLE_PIN
#define Z_ENABLE_PIN 26
#endif
#define E0_ENABLE_PIN 14
#if !defined(FAN_PIN) && ENABLED(LCD_I2C_PANELOLU2)
#define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
#endif
#define SANGUINOLOLU_V_1_2
#include "pins_SANGUINOLOLU_11.h"

4
Marlin/src/pins/sanguino/pins_STB_11.h
View File

@@ -27,4 +27,8 @@
#define BOARD_INFO_NAME "STB V1.1"
#ifndef FAN_PIN
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

2
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View File

@@ -36,7 +36,7 @@
* If you don't have a chip programmer you can use a spare Arduino plus a few
* electronic components to write the bootloader.
*
* See http://www.instructables.com/id/Burn-Arduino-Bootloader-with-Arduino-MEGA/
* See https://www.instructables.com/Burn-Arduino-Bootloader-with-Arduino-MEGA/
*/
/**

123
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View File

@@ -166,19 +166,28 @@
* EXP1
*/
#define EXP1_01_PIN PA15
#define EXP1_02_PIN PB6
#define EXP1_03_PIN PA9
#define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN PA10
#define EXP1_06_PIN PB9
#define EXP1_07_PIN PB8
#define EXP1_08_PIN PB7
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN PA15
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_RS PB8
#define LCD_PINS_ENABLE PB7
#define LCD_PINS_D4 PB9
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -186,12 +195,12 @@
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE PB6
#define LCD_PINS_D4 PB8
#define LCD_PINS_D5 PA10
#define LCD_PINS_D6 PA9
#define LCD_PINS_D7 PA15
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_ENABLE EXP1_02_PIN
#define LCD_PINS_D4 EXP1_07_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
@@ -207,19 +216,81 @@
* EXP1
*/
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define DOGLCD_CS PB8
#define DOGLCD_A0 PB9
#define DOGLCD_SCK PA15
#define DOGLCD_MOSI PB7
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_01_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! FYSETC_MINI_12864_2_1 and it's clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#if SD_CONNECTION_IS(LCD)
#error "The LCD SD Card is not supported with this configuration."
#endif
/**
* FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
*
* Board Display
* ------ ------
* (NEOPIXEL) PA15 | 1 2 | PB6 (BTN_ENC) 5V |10 9 | GND
* (BTN_EN2) PA9 | 3 4 | RESET -- | 8 7 | --
* (BTN_EN1) PA10 5 6 | PB9 (LCD_RESET) NEOPIXEL | 6 5 LCD RESET
* (LCD_A0) PB8 | 7 8 | PB7 (LCD_CS) LCD_A0 | 4 3 | LCD_CS
* GND | 9 10 | 5V BTN_ENC | 2 1 | BEEP
* ------ ------
* EXP1 EXP1
*
*
* ----- ------
* | 1 | RST -- |10 9 | --
* | 2 | PA3 RX2 RESET_BTN | 8 7 | SD_DETECT
* | 3 | PA2 TX2 LCD_MOSI | 6 5 EN2
* | 4 | GND -- | 4 3 | EN1
* | 5 | 5V LCD_SCK | 2 1 | --
* ----- ------
* TFT EXP2
*
* Needs custom cable.
*
* BOARD EXP1 NEOPIXEL <--> LCD EXP1 NEOPIXEL
* BOARD EXP1 BTN_ENC <--> LCD EXP1 BTN_ENC
* BOARD EXP1 BTN_EN2 <--> LCD EXP2 EN2
* BOARD EXP1 RESET <--> LCD EXP2 RESET_BTN
* BOARD EXP1 BTN_EN1 <--> LCD EXP2 EN1
* BOARD EXP1 LCD_RESET <--> LCD EXP1 LCD RESET
* BOARD EXP1 LCD_A0 <--> LCD EXP1 LCD_A0
* BOARD EXP1 LCD_CS <--> LCD EXP1 LCD_CS
* BOARD TFT RX2 <--> LCD EXP2 LCD_MOSI
* BOARD TFT TX2 <--> LCD EXP2 LCD_SCK
*/
#define NEOPIXEL_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_RESET_PIN EXP1_06_PIN
#define BEEPER_PIN -1
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_SCK PA2
#define DOGLCD_MOSI PA3
#define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI
#else
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1 and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
#endif
#endif // HAS_WIRED_LCD
@@ -260,10 +331,10 @@
#define CLCD_SPI_BUS 1 // SPI1 connector
#define BEEPER_PIN PB6
#define BEEPER_PIN EXP1_02_PIN
#define CLCD_MOD_RESET PA9
#define CLCD_SPI_CS PB8
#define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS EXP1_07_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
@@ -281,8 +352,8 @@
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#define SD_DETECT_PIN PA15
#define SD_SS_PIN PA10
#define SD_DETECT_PIN EXP1_01_PIN
#define SD_SS_PIN EXP1_05_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
#endif

43
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
View File

@@ -21,7 +21,9 @@
*/
#pragma once
#define SKR_MINI_E3_V2
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0"
#endif
#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
@@ -29,33 +31,50 @@
#if NO_EEPROM_SELECTED
#define I2C_EEPROM
#define SOFT_I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#define I2C_SDA_PIN PB7
#define I2C_SCL_PIN PB6
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#define I2C_SDA_PIN PB7
#define I2C_SCL_PIN PB6
#undef NO_EEPROM_SELECTED
#endif
#include "pins_BTT_SKR_MINI_E3_common.h"
#define FAN_PIN PC6
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0"
#endif
//
// USB connect control
//
#define USB_CONNECT_PIN PA14
/**
* SKR Mini E3 V2.0
* ------
* (BEEPER) PB5 | 1 2 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PB15 (LCD_EN)
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_02_PIN PA15
#define EXP1_08_PIN PB15
#include "pins_BTT_SKR_MINI_E3_common.h"
// Release PA13/PA14 (led, usb control) from SWD pins
#define DISABLE_DEBUG
#ifndef NEOPIXEL_PIN
#define NEOPIXEL_PIN PA8 // LED driving pin
#define NEOPIXEL_PIN PA8 // LED driving pin
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PC13 // Power Supply Control
#define PS_ON_PIN PC13 // Power Supply Control
#endif
#define FAN1_PIN PC7
#define FAN1_PIN PC7
#ifndef CONTROLLER_FAN_PIN
#define CONTROLLER_FAN_PIN FAN1_PIN
#define CONTROLLER_FAN_PIN FAN1_PIN
#endif
#if HAS_TMC_UART

106
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@@ -100,41 +100,40 @@
#define HEATER_0_PIN PC8 // "HE"
#define HEATER_BED_PIN PC9 // "HB"
#ifdef SKR_MINI_E3_V2
#define FAN_PIN PC6
#else
#ifndef FAN_PIN
#define FAN_PIN PA8 // "FAN0"
#endif
//
// USB connect control
//
#ifdef SKR_MINI_E3_V2
#define USB_CONNECT_PIN PA14
#else
#ifndef USB_CONNECT_PIN
#define USB_CONNECT_PIN PC13
#endif
#define USB_CONNECT_INVERTING false
/**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* ------ ------
* (BEEPER) PB5 | 1 2 | PB6 (BTN_ENC) (BEEPER) PB5 | 1 2 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4) (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN) (LCD_RS) PB8 | 7 8 | PB15 (LCD_EN)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP1
* SKR Mini E3 V1.0, V1.2
* ------
* (BEEPER) PB5 | 1 2 | PB6 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN)
* GND | 9 10 | 5V
* ------
* EXP1
*/
#ifdef SKR_MINI_E3_V2
#define EXP1_02_PIN PA15
#define EXP1_08_PIN PB15
#else
#ifndef EXP1_02_PIN
#define EXP1_02_PIN PB6
#define EXP1_08_PIN PB7
#endif
#define EXP1_01_PIN PB5
#define EXP1_03_PIN PA9
#define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN PA10
#define EXP1_06_PIN PB9
#define EXP1_07_PIN PB8
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
@@ -156,22 +155,22 @@
#define BEEPER_PIN EXP1_02_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 PB8
#define BTN_ENC PB5
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_01_PIN
#elif HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN PB5
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_RS PB8
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 PB9
#define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -179,23 +178,23 @@
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#define LCD_PINS_RS PB9
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_ENABLE EXP1_02_PIN
#define LCD_PINS_D4 PB8
#define LCD_PINS_D5 PA10
#define LCD_PINS_D6 PA9
#define LCD_PINS_D7 PB5
#define LCD_PINS_D4 EXP1_07_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define DOGLCD_CS PB8
#define DOGLCD_A0 PB9
#define DOGLCD_SCK PB5
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_01_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
@@ -238,7 +237,7 @@
* EXP1-1 ----------- EXP1-7 SD_DET
*/
#define TFTGLCD_CS PA9
#define TFTGLCD_CS EXP1_03_PIN
#endif
@@ -263,8 +262,8 @@
*
* --- ------
* RST | 1 | (MISO) |10 9 | SCK
* (RX2) PA2 | 2 | BTN_EN1 | 8 7 | (SS)
* (TX2) PA3 | 3 | BTN_EN2 | 6 5 | MOSI
* (RX2) PA3 | 2 | BTN_EN1 | 8 7 | (SS)
* (TX2) PA2 | 3 | BTN_EN2 | 6 5 | MOSI
* GND | 4 | (CD) | 4 3 | (RST)
* 5V | 5 | (GND) | 2 1 | (KILL)
* --- ------
@@ -279,32 +278,29 @@
* EXP1-8 ----------- EXP2-6 EN2
* EXP1-7 ----------- EXP1-5 RED
* EXP1-6 ----------- EXP2-8 EN1
* EXP1-5 ----------- EXP1-6 LCD_RST
* EXP1-4 ----------- n/c
* EXP1-5 ----------- n/c
* EXP1-4 ----------- EXP1-6 RESET
* EXP1-3 ----------- EXP1-8 LCD_CS
* EXP1-2 ----------- EXP1-9 ENC
* EXP1-1 ----------- EXP1-7 LCD_A0
*
* TFT-2 ----------- EXP2-9 SCK
* TFT-3 ----------- EXP2-5 MOSI
* TFT-2 ----------- EXP2-5 SCK
* TFT-3 ----------- EXP2-9 MOSI
*
* for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
*/
#define LCD_PINS_RS PA9 // CS
#define LCD_PINS_ENABLE PA3 // MOSI
#define LCD_BACKLIGHT_PIN -1
#define NEOPIXEL_PIN PB8
#define LCD_CONTRAST 255
#define LCD_RESET_PIN PA10
#define NEOPIXEL_PIN EXP1_07_PIN
#define LCD_CONTRAST 255
#define DOGLCD_CS PA9
#define DOGLCD_A0 PB5
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 EXP1_01_PIN
#define DOGLCD_SCK PA2
#define DOGLCD_MOSI PA3
#define BTN_ENC PA15
#define BTN_EN1 PB9
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 PB15
#define FORCE_SOFT_SPI
@@ -354,8 +350,8 @@
#define BEEPER_PIN EXP1_02_PIN
#define CLCD_MOD_RESET PA9
#define CLCD_SPI_CS PB8
#define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS EXP1_07_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
@@ -370,8 +366,8 @@
#if SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PC4
#elif SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
#define SD_DETECT_PIN PB5
#define SD_SS_PIN PA10
#define SD_DETECT_PIN EXP1_01_PIN
#define SD_SS_PIN EXP1_05_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
#endif

35
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@@ -140,7 +140,38 @@
//
// LCD / Controller
//
#if HAS_WIRED_LCD
#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 3
#define TOUCH_CS_PIN EXP1_05_PIN // SPI3_NSS
#define TOUCH_SCK_PIN EXP2_02_PIN // SPI3_SCK
#define TOUCH_MISO_PIN EXP2_01_PIN // SPI3_MISO
#define TOUCH_MOSI_PIN EXP2_06_PIN // SPI3_MOSI
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_SIZE 9600
#elif HAS_WIRED_LCD
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
@@ -253,5 +284,7 @@
#define SD_MOSI_PIN PA7
#define SD_SS_PIN PA4
#endif
#define ONBOARD_SPI_DEVICE 1 // SPI1
#define ONBOARD_SD_CS_PIN PA4 // Chip select for "System" SD card
#define SDSS SD_SS_PIN

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

@@ -23,6 +23,14 @@
#define BOARD_INFO_NAME "Chitu3D V5"
#define Z_STOP_PIN PA14
//
// Servos
//
#define SERVO0_PIN PA13 // Z+ (behind FILAMENT) Pinout [+5v|G|S]
//
// Limit Switches
//
#define Z_STOP_PIN PA14 // Pinout [+12/24v|G|S]
#include "pins_CHITU3D_common.h"

4
Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
View File

@@ -114,8 +114,8 @@
#endif
// SPI Flash
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x200000 // 2MB
#endif

207
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View File

@@ -161,91 +161,148 @@
#define SDIO_SUPPORT
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
/**
* RET6 12864 LCD
* ------
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PB11
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
*/
#define EXP3_01_PIN PC6
#define EXP3_02_PIN PB2
#define EXP3_03_PIN PB10
#define EXP3_04_PIN PB11
#define EXP3_05_PIN PB14
#define EXP3_06_PIN PB13
#define EXP3_07_PIN PB12
#define EXP3_08_PIN PB15
#elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
/**
* VET6 12864 LCD
* ------
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
*/
#define EXP3_01_PIN -1
#define EXP3_02_PIN PC5
#define EXP3_03_PIN PB10
#define EXP3_04_PIN -1
#define EXP3_05_PIN PA6
#define EXP3_06_PIN PA5
#define EXP3_07_PIN PA4
#define EXP3_08_PIN PA7
#elif EITHER(CR10_STOCKDISPLAY, FYSETC_MINI_12864_2_1)
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for the LCD with the Creality V4 controller."
#endif
#if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(RET6_12864_LCD)
#define LCD_PINS_RS EXP3_07_PIN
#define LCD_PINS_ENABLE EXP3_08_PIN
#define LCD_PINS_D4 EXP3_06_PIN
/**
* RET6 12864 LCD
* ------
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PE8
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_01_PIN PC6
#define EXP1_02_PIN PB2
#define EXP1_03_PIN PB10
#define EXP1_04_PIN PE8
#define EXP1_05_PIN PB14
#define EXP1_06_PIN PB13
#define EXP1_07_PIN PB12
#define EXP1_08_PIN PB15
#define BTN_ENC EXP3_02_PIN
#define BTN_EN1 EXP3_03_PIN
#define BTN_EN2 EXP3_05_PIN
#ifndef HAS_PIN_27_BOARD
#define BEEPER_PIN EXP1_01_PIN
#endif
#elif ENABLED(VET6_12864_LCD)
/**
* VET6 12864 LCD
* ------
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_01_PIN -1
#define EXP1_02_PIN PC5
#define EXP1_03_PIN PB10
#define EXP1_04_PIN -1
#define EXP1_05_PIN PA6
#define EXP1_06_PIN PA5
#define EXP1_07_PIN PA4
#define EXP1_08_PIN PA7
#else
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#ifndef HAS_PIN_27_BOARD
#define BEEPER_PIN EXP3_01_PIN
#endif
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
// RET6 DWIN ENCODER LCD
#define EXP1_05_PIN PB14
#define EXP1_06_PIN PB13
#define EXP1_07_PIN PB12
#define EXP1_08_PIN PB15
//#define LCD_LED_PIN PB2
#else
// VET6 DWIN ENCODER LCD
#define EXP1_05_PIN PA6
#define EXP1_06_PIN PA5
#define EXP1_07_PIN PA4
#define EXP1_08_PIN PA7
#endif
#define BTN_ENC EXP1_05_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP3_05_PIN
#define BTN_EN1 EXP3_08_PIN
#define BTN_EN2 EXP3_07_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_06_PIN
#define BEEPER_PIN EXP3_06_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
#endif
#if SD_CONNECTION_IS(LCD)
#error "The LCD SD Card is not connected with this configuration."
#endif
/**
*
* Board (RET6 12864 LCD) Display
* ------ ------
* (EN1) PC6 | 1 2 | PB2 (BTN_ENC) 5V |10 9 | GND
* (LCD_CS) PB10 | 3 4 | PB11 (LCD RESET) -- | 8 7 | --
* (LCD_A0) PB14 5 6 | PB13 (EN2) (DIN) | 6 5 (LCD RESET)
* (LCD_SCK)PB12 | 7 8 | PB15 (MOSI) (LCD_A0) | 4 3 | (LCD_CS)
* GND | 9 10 | 5V (BTN_ENC) | 2 1 | --
* ------ ------
* EXP1 EXP1
*
* ------
* ----- -- |10 9 | --
* | 1 | VCC (RESET) | 8 7 | --
* | 2 | PA13 (DIN) (MOSI) | 6 5 (EN2)
* | 3 | PA14 -- | 4 3 | (EN1)
* | 4 | GND (LCD_SCK)| 2 1 | --
* ----- ------
* Debug port EXP2
*
* Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
* Debug port is just above EXP1. You need to add pins.
*
*/
#define BTN_ENC EXP3_02_PIN
#define BTN_EN1 EXP3_01_PIN
#define BTN_EN2 EXP3_06_PIN
#define BEEPER_PIN -1
#define DOGLCD_CS EXP3_03_PIN
#define DOGLCD_A0 EXP3_05_PIN
#define DOGLCD_SCK EXP3_07_PIN
#define DOGLCD_MOSI EXP3_08_PIN
#define LCD_RESET_PIN EXP3_04_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#define NEOPIXEL_PIN PA13
#endif
// Pins for documentation and sanity checks only.
// Changing these will not change the pin they are on.
// Hardware UART pins
#define UART1_TX_PIN PA9 // default uses CH340 RX
#define UART1_RX_PIN PA10 // default uses CH340 TX
#define UART2_TX_PIN PA2 // default uses HEATER_BED_PIN
#define UART2_RX_PIN PA3 // not connected
#define UART3_TX_PIN PB10 // default uses LCD connector
#define UART3_RX_PIN PB11 // default uses LCD connector
#define UART4_TX_PIN PC10 // default uses sdcard SDIO_D2
#define UART4_RX_PIN PC11 // default uses sdcard SDIO_D3
#define UART5_TX_PIN PC12 // default uses sdcard SDIO_CK
#define UART5_RX_PIN PD2 // default uses sdcard SDIO_CMD
// SDIO pins
#define SDIO_D0_PIN PC8
#define SDIO_D1_PIN PC9
#define SDIO_D2_PIN PC10
#define SDIO_D3_PIN PC11
#define SDIO_CK_PIN PC12
#define SDIO_CMD_PIN PD2

136
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
View File

@@ -1,9 +1,9 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* 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
@@ -22,7 +22,7 @@
#pragma once
/**
* CREALITY 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
* Creality 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
*/
#include "env_validate.h"
@@ -143,85 +143,75 @@
#define SDIO_SUPPORT
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
/**
* RET6 12864 LCD
* ------
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PE8
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
*/
#define EXP3_01_PIN PC6
#define EXP3_02_PIN PB2
#define EXP3_03_PIN PB10
#define EXP3_04_PIN PE8
#define EXP3_05_PIN PB14
#define EXP3_06_PIN PB13
#define EXP3_07_PIN PB12
#define EXP3_08_PIN PB15
#elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
/**
* VET6 12864 LCD
* ------
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
*/
#define EXP3_01_PIN -1
#define EXP3_02_PIN PC5
#define EXP3_03_PIN PB10
#define EXP3_04_PIN -1
#define EXP3_05_PIN PA6
#define EXP3_06_PIN PA5
#define EXP3_07_PIN PA4
#define EXP3_08_PIN PA7
#endif
#if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(RET6_12864_LCD)
/**
* RET6 12864 LCD
* ------
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PE8
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_01_PIN PC6
#define EXP1_02_PIN PB2
#define EXP1_03_PIN PB10
#define EXP1_04_PIN PE8
#define EXP1_05_PIN PB14
#define EXP1_06_PIN PB13
#define EXP1_07_PIN PB12
#define EXP1_08_PIN PB15
#define BEEPER_PIN EXP1_01_PIN
#elif ENABLED(VET6_12864_LCD)
/**
* VET6 12864 LCD
* ------
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_01_PIN -1
#define EXP1_02_PIN PC5
#define EXP1_03_PIN PB10
#define EXP1_04_PIN -1
#define EXP1_05_PIN PA6
#define EXP1_06_PIN PA5
#define EXP1_07_PIN PA4
#define EXP1_08_PIN PA7
#else
#if NONE(RET6_12864_LCD, VET6_12864_LCD)
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_RS EXP3_07_PIN
#define LCD_PINS_ENABLE EXP3_08_PIN
#define LCD_PINS_D4 EXP3_06_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP3_02_PIN
#define BTN_EN1 EXP3_03_PIN
#define BTN_EN2 EXP3_05_PIN
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#define BEEPER_PIN EXP3_01_PIN
// RET6 DWIN ENCODER LCD
#define BTN_ENC PB14
#define BTN_EN1 PB15
#define BTN_EN2 PB12
#elif ANY(DWIN_VET6_CREALITY_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
//#define LCD_LED_PIN PB2
// RET6 / VET6 DWIN ENCODER LCD
#define BTN_ENC EXP3_05_PIN
#define BTN_EN1 EXP3_08_PIN
#define BTN_EN2 EXP3_07_PIN
//#define LCD_LED_PIN EXP3_02_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN PB13
#define BEEPER_PIN EXP3_06_PIN
#endif
#elif ENABLED(DWIN_VET6_CREALITY_LCD)
// VET6 DWIN ENCODER LCD
#define BTN_ENC PA6
#define BTN_EN1 PA7
#define BTN_EN2 PA4
#define BEEPER_PIN PA5
#endif

2
Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
View File

@@ -28,4 +28,6 @@
#define BOARD_INFO_NAME "Creality v4.2.2"
#define DEFAULT_MACHINE_NAME "Creality3D"
#define EMIT_CREALITY_422_WARNING
#include "pins_CREALITY_V4.h"

4
Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
View File

@@ -1,9 +1,9 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* 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

4
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
View File

@@ -68,8 +68,8 @@
#define SPI_DEVICE 2
// SPI Flash
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
// SPI 2
#define SPI_FLASH_CS_PIN PB12 // SPI2_NSS / Flash chip-select
#define SPI_FLASH_MOSI_PIN PB15

2
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
View File

@@ -23,7 +23,7 @@
/**
* Geeetech GTM32 Pro VB board pin assignments
* http://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
* https://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
*
* Also applies to GTM32 Pro VD
*/

4
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
View File

@@ -183,7 +183,7 @@
//
#if NO_EEPROM_SELECTED
//#define SPI_EEPROM
//#define HAS_SPI_FLASH 1 // need MARLIN_DEV_MODE for M993/M994 eeprom backup tests
//#define SPI_FLASH // need MARLIN_DEV_MODE for M993/M994 EEPROM backup tests
#define FLASH_EEPROM_EMULATION
#endif
@@ -196,7 +196,7 @@
#define EEPROM_MOSI_PIN BOARD_SPI1_MOSI_PIN // PA7 pin 32
#define EEPROM_PAGE_SIZE 0x1000U // 4K (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64K for now...
#elif HAS_SPI_FLASH
#elif ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x40000U // limit to 256K (M993 will reboot with 512)
#define SPI_FLASH_CS_PIN PC5
#define SPI_FLASH_MOSI_PIN PA7

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
View File

@@ -272,8 +272,8 @@
//
// W25Q64 64Mb (8MB) SPI flash
//
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x800000 // 8MB
#define SPI_FLASH_CS_PIN PG9
#define SPI_FLASH_MOSI_PIN PB15

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View File

@@ -377,8 +377,8 @@
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PB15

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@@ -196,8 +196,8 @@
#endif
#endif
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN PB12 // Flash chip-select
#define SPI_FLASH_MOSI_PIN PB15

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@@ -29,7 +29,7 @@
#define ALLOW_STM32DUINO
#include "env_validate.h"
#define BOARD_INFO_NAME "MKS Robin Nano"
#define BOARD_INFO_NAME "MKS Robin Nano V1"
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

8
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@@ -35,7 +35,9 @@
#define BOARD_INFO_NAME "MKS Robin nano V2.0"
#define BOARD_NO_NATIVE_USB
#ifndef USB_MOD
#define BOARD_NO_NATIVE_USB
#endif
#define USES_DIAG_PINS
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
@@ -377,8 +379,8 @@
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PB15

17
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
View File

@@ -29,7 +29,9 @@
#error "MKS Robin nano boards support up to 2 hotends / E steppers."
#endif
#define BOARD_NO_NATIVE_USB
#ifndef USB_MOD
#define BOARD_NO_NATIVE_USB
#endif
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
#define TEMP_TIMER 5
@@ -58,9 +60,14 @@
// Limit Switches
//
#define X_STOP_PIN PA15
#define Y_STOP_PIN PA12
#define Z_MIN_PIN PA11
#define Z_MAX_PIN PC4
#ifndef USB_MOD
#define Y_STOP_PIN PA12
#define Z_MIN_PIN PA11
#else
#define Y_STOP_PIN PB10
#define Z_MIN_PIN PB11
#endif
//
// Steppers
@@ -201,8 +208,8 @@
#define TFT_BUFFER_SIZE 14400
#endif
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PB15

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@@ -308,8 +308,8 @@
#define BOARD_ST7920_DELAY_3 125
#endif
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB
#define SPI_FLASH_CS_PIN PB12 // Flash chip-select
#define SPI_FLASH_MOSI_PIN PB15

5
Marlin/src/pins/stm32f4/pins_ARMED.h
View File

@@ -19,11 +19,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
// https://github.com/ktand/Armed
#pragma once
// https://github.com/ktand/Armed
#include "env_validate.h"
#if HOTENDS > 2 || E_STEPPERS > 2

2
Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
View File

@@ -16,7 +16,7 @@
* 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/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once

26
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View File

@@ -28,7 +28,7 @@
// Onboard I2C EEPROM
#define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB (AT24C32)
#define MARLIN_EEPROM_SIZE 0x1000 // 4K (AT24C32)
#define I2C_SCL_PIN PB8
#define I2C_SDA_PIN PB9
@@ -429,6 +429,30 @@
#define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
* ------ ------ ---
* | 1 2 | | 1 2 | 1 |
* | 3 4 | RX | 3 4 | TX | 2 | RX
* ENT 5 6 | BEEP ENT 5 6 | BEEP | 3 | TX
* B | 7 8 | A B | 7 8 | A | 4 |
* GND | 9 10 | VCC GND | 9 10 | VCC 5 |
* ------ ------ ---
* EXP1 DWIN TFT
*
* DWIN pins are labeled as printed on DWIN PCB. GND, VCC, A, B, ENT & BEEP can be connected in the same
* orientation as the existing plug/DWIN to EXP1. TX/RX need to be connected to the TFT port, with TX->RX, RX->TX.
*/
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_OCTOPUS_V1_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#define BEEPER_PIN EXP1_06_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_05_PIN
#elif HAS_WIRED_LCD
#define BEEPER_PIN EXP1_01_PIN

2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
View File

@@ -26,7 +26,9 @@
//
// Limit Switches
//
#define X_MIN_PIN PA14
#define X_MAX_PIN PA13
#define Y_MIN_PIN PA15
#define Y_MAX_PIN PC5
//

14
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
View File

@@ -23,6 +23,12 @@
#define BOARD_INFO_NAME "MKS Monster8 V2"
//
// Limit Switches
//
#define X_STOP_PIN PA14
#define Y_STOP_PIN PA15
//
// Steppers
//
@@ -47,11 +53,11 @@
//
//#define WIFI_SERIAL 1// USART1
#if ENABLED(MKS_WIFI_MODULE)
#define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN
#define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN
#define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
#define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN
#define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN
#define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
#endif
#define NEOPIXEL_PIN PC5
#define NEOPIXEL_PIN PC5
#include "pins_MKS_MONSTER8_common.h"

2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
View File

@@ -64,8 +64,6 @@
#define E4_DIAG_PIN -1 // Driver7 diag signal is not connected
// Limit Switches for endstops
#define X_MIN_PIN PA14
#define Y_MIN_PIN PA15
#define Z_MIN_PIN PB13
#define Z_MAX_PIN PB12

2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
View File

@@ -225,7 +225,7 @@
#define SPI_FLASH
#if ENABLED(SPI_FLASH)
#define HAS_SPI_FLASH 1
#define SPI_FLASH
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#define SPI_FLASH_CS_PIN PB12

2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
View File

@@ -273,7 +273,7 @@
//
// LCD / Controller
#define SPI_FLASH
#define HAS_SPI_FLASH 1
#define SPI_FLASH
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH)

3
Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
View File

@@ -44,6 +44,9 @@
// I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
#define HAS_MCP3426_ADC
#ifdef STM32F4
#define HAS_STM32_UID
#endif
//
// Servos

4
Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
View File

@@ -24,6 +24,10 @@
#define ALLOW_STM32DUINO
#include "env_validate.h"
#if HOTENDS > 1 || E_STEPPERS > 1
#error "TH3D EZBoard only supports 1 hotend / E stepper."
#endif
#define BOARD_INFO_NAME "TH3D EZBoard V2"
#define BOARD_WEBSITE_URL "th3dstudio.com"

2
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
View File

@@ -311,7 +311,7 @@
#elif ENABLED(FYSETC_MINI_12864_2_1)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
#endif
/**

2
Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
View File

@@ -46,7 +46,7 @@
#define SOFT_I2C_EEPROM // Force the use of Software I2C
#define I2C_SCL_PIN PA14
#define I2C_SDA_PIN PA13
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#endif
//