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

Browse Source
This commit is contained in:
Stefan Kalscheuer
2024-02-13 20:32:22 +01:00
parent e466309bfb
commit 752476dc8f
1367 changed files with 41601 additions and 31124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/pins/lpc1768/env_validate.h
View File

@@ -19,7 +19,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
#ifndef ENV_VALIDATE_H
#define ENV_VALIDATE_H
#if ENABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1769)
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
@@ -28,3 +29,5 @@
#endif
#undef REQUIRE_LPC1769
#endif

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

@@ -82,8 +82,8 @@
// EFB
#define HEATER_0_PIN P2_04
#define HEATER_BED_PIN P2_05
#ifndef FAN_PIN
#define FAN_PIN P2_07
#ifndef FAN0_PIN
#define FAN0_PIN P2_07
#endif
#define FAN1_PIN P0_26

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

@@ -73,18 +73,16 @@
#endif
//
// Software SPI pins for TMC2130 stepper drivers
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P0_18 // ETH
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P0_17 // ETH
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P0_15 // ETH
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P0_18 // ETH
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P0_17 // ETH
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P0_15 // ETH
#endif
//
@@ -99,8 +97,8 @@
//
#define HEATER_0_PIN P2_07
#define HEATER_BED_PIN P2_05
#ifndef FAN_PIN
#define FAN_PIN P2_04
#ifndef FAN0_PIN
#define FAN0_PIN P2_04
#endif
//
@@ -129,14 +127,14 @@
#define SD_DETECT_PIN P0_27 // EXP2-7
#define LCD_PINS_RS P0_16 // EXP1-4
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_EN P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if BOTH(HAS_MARLINUI_HD44780, IS_RRD_SC)
#if ALL(HAS_MARLINUI_HD44780, IS_RRD_SC)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER displays aren't supported by the BIQU B300 v1.0"
#endif
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#error "SDSUPPORT is not supported by the BIQU B300 v1.0 when an LCD controller is used"
#endif
@@ -148,7 +146,7 @@
* Software SPI is used to interface with a stand-alone SD card reader connected to EXP1.
* Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
*/
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#define SD_SCK_PIN P0_15 // EXP1-5
#define SD_MISO_PIN P0_16 // EXP1-4
#define SD_MOSI_PIN P0_18 // EXP1-3
@@ -161,7 +159,7 @@
*
* There are 6 PWMS. Each PWM can be assigned to one of two pins.
*
* PWM1.1 P0_18 LCD_PINS_ENABLE
* PWM1.1 P0_18 LCD_PINS_EN
* PWM1.1 P2_0 X_STEP_PIN
* PWM1.2 P1_20 <none>
* PWM1.2 P2_1 Y_STEP_PIN
@@ -170,7 +168,7 @@
* PWM1.4 P1_23 <none>
* PWM1.4 P2_3 E0_STEP_PIN
* PWM1.5 P1_24 X_MIN_PIN
* PWM1.5 P2_4 FAN_PIN
* PWM1.5 P2_4 FAN0_PIN
* PWM1.6 P1_26 Y_MIN_PIN
* PWM1.6 P2_5 HEATER_BED_PIN
*/

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

@@ -74,8 +74,8 @@
//
#define HEATER_0_PIN P2_07
#define HEATER_BED_PIN P2_05
#ifndef FAN_PIN
#define FAN_PIN P2_04
#ifndef FAN0_PIN
#define FAN0_PIN P2_04
#endif
//
@@ -104,14 +104,14 @@
#define SD_DETECT_PIN P0_27 // EXP2-7
#define LCD_PINS_RS P0_16 // EXP1-4
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_EN P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if BOTH(HAS_MARLINUI_HD44780, IS_RRD_SC)
#if ALL(HAS_MARLINUI_HD44780, IS_RRD_SC)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER displays aren't supported by the BIQU BQ111-A4"
#endif
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
#endif
@@ -123,7 +123,7 @@
* Software SPI is used to interface with a stand-alone SD card reader connected to EXP1.
* Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
*/
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#define SD_SCK_PIN P0_15 // EXP1-5
#define SD_MISO_PIN P0_16 // EXP1-4
@@ -131,14 +131,14 @@
#define SD_SS_PIN P1_30 // EXP1-2
#define SDSS SD_SS_PIN
#endif // SDSUPPORT
#endif // HAS_MEDIA
/**
* PWMS
*
* There are 6 PWMS. Each PWM can be assigned to one of two pins.
*
* PWM1.1 P0_18 LCD_PINS_ENABLE
* PWM1.1 P0_18 LCD_PINS_EN
* PWM1.1 P2_0 X_STEP_PIN
* PWM1.2 P1_20 <none>
* PWM1.2 P2_1 Y_STEP_PIN
@@ -147,7 +147,7 @@
* PWM1.4 P1_23 <none>
* PWM1.4 P2_3 E0_STEP_PIN
* PWM1.5 P1_24 X_MIN_PIN
* PWM1.5 P2_4 FAN_PIN
* PWM1.5 P2_4 FAN0_PIN
* PWM1.6 P1_26 Y_MIN_PIN
* PWM1.6 P2_5 HEATER_BED_PIN
*/

13
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View File

@@ -58,7 +58,6 @@
#define E0_DIR_PIN P2_13
#define E0_ENABLE_PIN P2_12
/** ------ ------
* 1.30 | 1 2 | 2.11 0.17 | 1 2 | 0.15
* 0.18 | 3 4 | 0.16 3.26 | 3 4 | 1.23
@@ -113,7 +112,7 @@
#define LCD_SDSS EXP2_04_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP2_06_PIN
#define LCD_PINS_EN EXP2_06_PIN
#define LCD_PINS_D4 EXP2_02_PIN
#if ENABLED(MKS_MINI_12864)
@@ -167,12 +166,12 @@
// When using any TMC SPI-based drivers, software SPI is used
// because pins may be shared with the display or SD card.
#define TMC_USE_SW_SPI
#define TMC_SW_MOSI EXP2_06_PIN
#define TMC_SW_MISO EXP2_01_PIN
#define TMC_SPI_MOSI EXP2_06_PIN
#define TMC_SPI_MISO EXP2_01_PIN
// To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
#define TMC_SW_SCK EXP2_02_PIN
#define TMC_SPI_SCK EXP2_02_PIN
// If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
//#define TMC_SW_SCK P2_06
//#define TMC_SPI_SCK P2_06
#if ENABLED(SOFTWARE_DRIVER_ENABLE)
@@ -203,7 +202,7 @@
#undef E1_ENABLE_PIN
#endif
#else // !SOFTWARE_DRIVER_ENABLE
#else // !SOFTWARE_DRIVER_ENABLE
// A chip-select pin is needed for each driver.

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

@@ -96,6 +96,13 @@
#define Z_MIN_PROBE_PIN P1_24
#endif
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
//
// Filament Runout Sensor
//
@@ -139,18 +146,16 @@
#endif
//
// Software SPI pins for TMC2130 stepper drivers
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P4_28
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P0_04
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P4_28
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P0_05
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P0_04
#endif
#if HAS_TMC_UART
@@ -188,8 +193,11 @@
#define E1_SERIAL_RX_PIN P1_01
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
/**
* ------ ------
@@ -256,7 +264,7 @@
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_06_PIN
#define LCD_PINS_EN EXP1_06_PIN
#define LCD_PINS_D4 EXP1_04_PIN
#elif ENABLED(WYH_L12864)
@@ -284,14 +292,15 @@
* ------ ------
* LCD LCD
*/
#define BTN_ENC EXP1_03_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_03_PIN
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_04_PIN
#define DOGLCD_MOSI EXP1_01_PIN
#define LCD_BACKLIGHT_PIN -1
#define LCD_BACKLIGHT_PIN -1
#elif ENABLED(CR10_STOCKDISPLAY)
@@ -301,7 +310,7 @@
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_02_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_EN EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#elif HAS_ADC_BUTTONS
@@ -310,28 +319,15 @@
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_A0_PIN EXP1_08_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN EXP1_03_PIN
//#define TFT_RST_PIN EXP2_07_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define BTN_EN2 EXP2_05_PIN
#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
#define BEEPER_PIN EXP1_01_PIN
#define TFT_BUFFER_SIZE 2400
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define TFT_A0_PIN TFT_DC_PIN
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
@@ -340,21 +336,84 @@
#define TFT_HEIGHT 320
#endif
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#if ENABLED(BTT_TFT35_SPI_V1_0)
/**
* ------ ------
* BEEPER | 1 2 | LCD-BTN MISO | 1 2 | CLK
* T_MOSI | 3 4 | T_CS LCD-ENCA | 3 4 | TFTCS
* T_CLK | 5 6 T_MISO LCD-ENCB | 5 6 MOSI
* PENIRQ | 7 8 | F_CS RS | 7 8 | RESET
* GND | 9 10 | VCC GND | 9 10 | NC
* ------ ------
* EXP1 EXP2
*
* 480x320, 3.5", SPI Display with Rotary Encoder.
* Stock Display for the BIQU B1 SE Series.
* Schematic: https://github.com/bigtreetech/TFT35-SPI/blob/master/v1/Hardware/BTT%20TFT35-SPI%20V1-SCH.pdf
*/
#define TFT_CS_PIN EXP2_04_PIN
#define TFT_DC_PIN EXP2_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TOUCH_CS_PIN EXP1_04_PIN
#define TOUCH_SCK_PIN EXP1_05_PIN
#define TOUCH_MISO_PIN EXP1_06_PIN
#define TOUCH_MOSI_PIN EXP1_03_PIN
#define TOUCH_INT_PIN EXP1_07_PIN
#elif ENABLED(MKS_TS35_V2_0)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! MKS_TS35_V2_0 requires wiring modifications. The SKR 1.3 EXP ports are rotated 180° from what the MKS_TS35_V2_0 expects. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this error.)"
#endif
/** ------ ------
* BEEPER | 1 2 | BTN_ENC SPI1_MISO | 1 2 | SPI1_SCK
* TFT_BKL / LCD_EN | 3 4 | TFT_RESET / LCD_RS BTN_EN1 | 3 4 | SPI1_CS
* TOUCH_CS / LCD_D4 | 5 6 TOUCH_INT / LCD_D5 BTN_EN2 | 5 6 SPI1_MOSI
* SPI1_CS / LCD_D6 | 7 8 | SPI1_RS / LCD_D7 SPI1_RS | 7 8 | RESET
* GND | 9 10 | VCC GND | 9 10 | VCC
* ------ ------
* EXP1 EXP2
*/
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN EXP1_03_PIN
//#define TFT_RST_PIN EXP2_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_WORDS 2400
#define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_INT_PIN EXP1_06_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#endif
#if ENABLED(TFT_CLASSIC_UI)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -11386
#define TOUCH_CALIBRATION_X -16794
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 8684
#define TOUCH_CALIBRATION_Y 11000
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 689
#define TOUCH_OFFSET_X 1024
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -273
#define TOUCH_OFFSET_Y -352
#endif
#elif ENABLED(TFT_COLOR_UI)
#ifndef TOUCH_CALIBRATION_X
@@ -369,7 +428,7 @@
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -367
#endif
#define TFT_BUFFER_SIZE 2400
#define TFT_BUFFER_WORDS 2400
#endif
#elif IS_TFTGLCD_PANEL
@@ -379,7 +438,7 @@
#define SD_DETECT_PIN EXP2_07_PIN
#else // !CR10_STOCKDISPLAY
#else // !CR10_STOCKDISPLAY
#define LCD_PINS_RS EXP1_04_PIN
@@ -387,7 +446,7 @@
#define BTN_EN2 EXP2_05_PIN // (33) J3-4 & AUX-4
#define BTN_ENC EXP1_02_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_SDSS EXP2_04_PIN // (16) J3-7 & AUX-4
@@ -399,14 +458,12 @@
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXP1_06_PIN
#endif
@@ -420,7 +477,7 @@
#define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
@@ -472,14 +529,6 @@
#endif // HAS_WIRED_LCD
#if NEED_TOUCH_PINS
#define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_SCK_PIN EXP2_02_PIN
#define TOUCH_MOSI_PIN EXP2_06_PIN
#define TOUCH_MISO_PIN EXP2_01_PIN
#define TOUCH_INT_PIN EXP1_06_PIN
#endif
/**
* Special pins
* P1_30 (37) (NOT 5V tolerant)

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

@@ -134,6 +134,13 @@
#define Z_MIN_PROBE_PIN P0_10
#endif
//
// Probe enable
//
#if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
#define PROBE_ENABLE_PIN SERVO0_PIN
#endif
//
// Filament Runout Sensor
//
@@ -196,18 +203,16 @@
#define TEMP_BED_PIN P0_25_A2 // A2 (T2) - (69) - TEMP_BED_PIN
//
// Software SPI pins for TMC2130 stepper drivers
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P1_17
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P0_04
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P1_17
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P0_05
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P0_04
#endif
#if HAS_TMC_UART
@@ -245,8 +250,11 @@
#define E1_SERIAL_RX_PIN E1_SERIAL_TX_PIN
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
/** ------ ------
* 1.30 | 1 2 | 0.28 0.17 | 1 2 | 0.15
@@ -318,7 +326,7 @@
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_01_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define BEEPER_PIN EXP1_08_PIN
@@ -354,7 +362,7 @@
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_06_PIN
#define LCD_PINS_EN EXP1_06_PIN
#define LCD_PINS_D4 EXP1_04_PIN
#define BEEPER_PIN EXP1_01_PIN
@@ -366,7 +374,7 @@
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_02_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_EN EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
@@ -394,26 +402,119 @@
#define LCD_BACKLIGHT_PIN -1
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_A0_PIN EXP1_08_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define LCD_USE_DMA_SPI
#define SDCARD_CONNECTION ONBOARD
#define TOUCH_INT_PIN EXP1_06_PIN
#define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#define BEEPER_PIN EXP1_01_PIN
// SPI 1
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define TFT_BUFFER_SIZE 2400
#define TFT_A0_PIN TFT_DC_PIN
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
#ifndef TFT_HEIGHT
#define TFT_HEIGHT 320
#endif
#if ENABLED(BTT_TFT35_SPI_V1_0)
/**
* ------ ------
* BEEPER | 1 2 | LCD-BTN MISO | 1 2 | CLK
* T_MOSI | 3 4 | T_CS LCD-ENCA | 3 4 | TFTCS
* T_CLK | 5 6 T_MISO LCD-ENCB | 5 6 MOSI
* PENIRQ | 7 8 | F_CS RS | 7 8 | RESET
* GND | 9 10 | VCC GND | 9 10 | NC
* ------ ------
* EXP1 EXP2
*
* 480x320, 3.5", SPI Display with Rotary Encoder.
* Stock Display for the BIQU B1 SE Series.
* Schematic: https://github.com/bigtreetech/TFT35-SPI/blob/master/v1/Hardware/BTT%20TFT35-SPI%20V1-SCH.pdf
*/
#define TFT_CS_PIN EXP2_04_PIN
#define TFT_DC_PIN EXP2_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TOUCH_CS_PIN EXP1_04_PIN
#define TOUCH_SCK_PIN EXP1_05_PIN
#define TOUCH_MISO_PIN EXP1_06_PIN
#define TOUCH_MOSI_PIN EXP1_03_PIN
#define TOUCH_INT_PIN EXP1_07_PIN
#elif ENABLED(MKS_TS35_V2_0)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! MKS_TS35_V2_0 requires wiring modifications. The SKR 1.4 EXP ports are rotated 180° from what the MKS_TS35_V2_0 expects. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this error.)"
#endif
/** ------ ------
* BEEPER | 1 2 | BTN_ENC SPI1_MISO | 1 2 | SPI1_SCK
* TFT_BKL / LCD_EN | 3 4 | TFT_RESET / LCD_RS BTN_EN1 | 3 4 | SPI1_CS
* TOUCH_CS / LCD_D4 | 5 6 TOUCH_INT / LCD_D5 BTN_EN2 | 5 6 SPI1_MOSI
* SPI1_CS / LCD_D6 | 7 8 | SPI1_RS / LCD_D7 SPI1_RS | 7 8 | RESET
* GND | 9 10 | VCC GND | 9 10 | VCC
* ------ ------
* EXP1 EXP2
*/
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN EXP1_03_PIN
//#define TFT_RST_PIN EXP2_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_WORDS 2400
#define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_INT_PIN EXP1_06_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#endif
#if ENABLED(TFT_CLASSIC_UI)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -16794
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 11000
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 1024
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -352
#endif
#elif ENABLED(TFT_COLOR_UI)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -16741
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 11258
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 1024
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -367
#endif
#define TFT_BUFFER_WORDS 2400
#endif
#elif IS_TFTGLCD_PANEL
@@ -431,7 +532,7 @@
#define BTN_EN1 EXP2_03_PIN // (31) J3-2 & AUX-4
#define BTN_EN2 EXP2_05_PIN // (33) J3-4 & AUX-4
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_SDSS EXP2_04_PIN // (16) J3-7 & AUX-4
@@ -449,7 +550,7 @@
#define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXP1_06_PIN
#endif
@@ -463,7 +564,7 @@
#define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS EXP1_06_PIN

11
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View File

@@ -27,8 +27,8 @@
// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
//#define BTT_MOTOR_EXPANSION
#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
#if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#if ALL(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
#if ANY(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#define EXP_MOT_USE_EXP2_ONLY 1
#else
#error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
@@ -101,8 +101,8 @@
#define HEATER_1_PIN P2_04
#endif
#endif
#ifndef FAN_PIN
#define FAN_PIN P2_03
#ifndef FAN0_PIN
#define FAN0_PIN P2_03
#endif
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN P2_05
@@ -111,8 +111,9 @@
//
// LCD / Controller
//
#if !defined(BEEPER_PIN) && HAS_WIRED_LCD && DISABLED(LCD_USE_I2C_BUZZER)
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define BEEPER_PIN P1_30 // (EXP1-1) Not 5V-tolerant
#endif
//

3
Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
View File

@@ -87,7 +87,7 @@
#define HEATER_0_PIN P2_06 // (H2: 10A shared)
#define HEATER_1_PIN P2_07 // (H3: 10A shared)
#define FAN_PIN P2_11 // (FAN0: 1A)
#define FAN0_PIN P2_11 // (FAN0: 1A)
#define FAN1_PIN P2_13 // (FAN1: 1A)
//
@@ -138,6 +138,7 @@
//
// LCD / Controller
//
#if ENABLED(EMOTION_TECH_LCD)
#define BEEPER_PIN EXP2_01_PIN
#define DOGLCD_A0 EXP2_06_PIN

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

@@ -106,7 +106,9 @@
#define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#else
#error "TMC2208 UART configuration is required for GMarsh X6."
#endif
@@ -123,7 +125,7 @@
//
#define HEATER_BED_PIN P1_19 // Not a PWM pin, software PWM required
#define HEATER_0_PIN P3_26 // PWM1[3]
#define FAN_PIN P3_25 // Part cooling fan - connected to PWM1[2]
#define FAN0_PIN P3_25 // Part cooling fan - connected to PWM1[2]
#define E0_AUTO_FAN_PIN P0_27 // Extruder cooling fan
//
@@ -141,7 +143,7 @@
#define BTN_EN2 P1_24
#define BTN_ENC P1_25
#define LCD_PINS_RS P0_20
#define LCD_PINS_ENABLE P0_21
#define LCD_PINS_EN P0_21
#define LCD_PINS_D4 P2_11
#define LCD_PINS_D5 P0_22
#define LCD_PINS_D6 P1_29

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

@@ -101,8 +101,8 @@
#define HEATER_BED_PIN P2_05
#define HEATER_0_PIN P2_07
#define HEATER_1_PIN P2_06
#ifndef FAN_PIN
#define FAN_PIN P2_04
#ifndef FAN0_PIN
#define FAN0_PIN P2_04
#endif
//
@@ -110,31 +110,25 @@
// Note: These pins are all digitally shared with the EXP1/EXP2 Connector.
// Using them with an LCD connected or configured will lead to hangs & crashes.
//
// 5V
// NC
// GND
#define PIN_P0_17 P0_17
#define PIN_P0_16 P0_16
#define PIN_P0_15 P0_15
//#define PIN_P0_17 P0_17 // 5V
//#define PIN_P0_16 P0_16 // NC
//#define PIN_P0_15 P0_15 // GND
//
// Connector J8
//
// GND
#define PIN_P1_22 P1_22
#define PIN_P1_23 P1_23 // PWM Capable
#define PIN_P2_12 P2_12 // Interrupt Capable
#define PIN_P2_11 P2_11 // Interrupt Capable
#define PIN_P1_22 P1_22 // GND
#define PIN_P1_23 P1_23 // PWM-capable
#define PIN_P2_12 P2_12 // Interrupt-capable
#define PIN_P2_11 P2_11 // Interrupt-capable
//
// Průša i3 MMU1 (Multi Material Multiplexer) Support
//
#if HAS_PRUSA_MMU1
#define E_MUX0_PIN P1_23 // J8-3
#define E_MUX1_PIN P2_12 // J8-4
#define E_MUX2_PIN P2_11 // J8-5
#define E_MUX0_PIN PIN_P1_23 // J8-3
#define E_MUX1_PIN PIN_P2_12 // J8-4
#define E_MUX2_PIN PIN_P2_11 // J8-5
#endif
//
@@ -170,21 +164,19 @@
#if SD_CONNECTION_IS(CUSTOM_CABLE)
/**
* A custom cable is needed. See the README file in the
* Marlin\src\config\examples\Mks\Sbase directory
* P0.27 is on EXP2 and the on-board SD card's socket. That means it can't be
* used as the SD_DETECT for the LCD's SD card.
* A custom cable is needed.
* See https://github.com/MarlinFirmware/Configurations/blob/release-2.1/config/examples/Mks/Sbase/README.md
* P0.27 is on EXP2 and the on-board SD card socket so it can't be used as SD_DETECT for the LCD SD card.
*
* The best solution is to use the custom cable to connect the LCD's SD_DETECT
* to a pin NOT on EXP2.
* The best solution is to use the custom cable to connect the LCD SD_DETECT to a pin NOT on EXP2.
*
* If you can't find a pin to use for the LCD's SD_DETECT then comment out
* SD_DETECT_PIN entirely and remove that wire from the the custom cable.
* If you can't find a pin to use for the LCD SD_DETECT then comment out SD_DETECT_PIN and remove that wire
* from the the custom cable.
*/
#define SD_DETECT_PIN P2_11 // J8-5 (moved from EXP2 P0.27)
#define SD_SCK_PIN P1_22 // J8-2 (moved from EXP2 P0.7)
#define SD_MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8)
#define SD_MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.9)
#define SD_DETECT_PIN PIN_P2_11 // J8-5 (moved from EXP2 P0.27)
#define SD_SCK_PIN PIN_P1_22 // J8-2 (moved from EXP2 P0.7)
#define SD_MISO_PIN PIN_P1_23 // J8-3 (moved from EXP2 P0.8)
#define SD_MOSI_PIN PIN_P2_12 // J8-4 (moved from EXP2 P0.9)
#define SD_SS_PIN P0_28
#define SOFTWARE_SPI // With a custom cable we need software SPI because the
// selected pins are not on a hardware SPI controller
@@ -205,42 +197,53 @@
#endif
/**
* Smart LCD adapter
*
* The Smart LCD adapter can be used for the two 10 pin LCD controllers such as
* REPRAP_DISCOUNT_SMART_CONTROLLER. It can't be used for controllers that use
* DOGLCD_A0, DOGLCD_CS, LCD_PINS_D5, LCD_PINS_D6 or LCD_PINS_D7. A custom cable
* is needed to pick up 5V for the EXP1 connection.
*
* SD card on the LCD uses the same SPI signals as the LCD. This results in garbage/lines
* on the LCD display during accesses of the SD card. The menus/code has been arranged so
* that the garbage/lines are erased immediately after the SD card accesses are completed.
* ------ ------
* 1.31 | 1 2 | 1.30 0.08 | 1 2 | 0.07
* 0.18 | 3 4 | 0.16 3.25 | 3 4 | 0.28
* 0.15 | 5 6 -- 3.26 | 5 6 0.09
* -- | 7 8 | -- 0.27 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN P1_31
#define EXP1_02_PIN P1_30
#define EXP1_03_PIN P0_18
#define EXP1_04_PIN P0_16
#define EXP1_05_PIN P0_15
#define EXP2_01_PIN P0_08
#define EXP2_02_PIN P0_07
#define EXP2_03_PIN P3_25
#define EXP2_04_PIN P0_28
#define EXP2_05_PIN P3_26
#define EXP2_06_PIN P0_09
#define EXP2_07_PIN P0_27
//
// LCD / Controller
//
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS P3_25 // EXP2.3
#define TFTGLCD_CS EXP2_03_PIN
#endif
#if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN P0_28 // EXP2.4
#define SD_DETECT_PIN EXP2_04_PIN
#endif
#elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1.1
#define BTN_ENC P1_30 // EXP1.2
#define BTN_EN1 P3_26 // EXP2.5
#define BTN_EN2 P3_25 // EXP2.3
#define LCD_PINS_RS P0_16 // EXP1.4
#define LCD_SDSS P0_28 // EXP2.4
#define LCD_PINS_ENABLE P0_18 // EXP1.3
#define LCD_PINS_D4 P0_15 // EXP1.5
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 EXP2_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_SDSS EXP2_04_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if ANY(VIKI2, miniVIKI)
#define DOGLCD_SCK SD_SCK_PIN
#define DOGLCD_MOSI SD_MOSI_PIN
#endif
@@ -257,26 +260,26 @@
* Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
* cable will be needed if the RGB LEDs are to be active.
*/
#define DOGLCD_CS LCD_PINS_ENABLE // EXP1.3 (LCD_EN on FYSETC schematic)
#define DOGLCD_A0 LCD_PINS_RS // EXP1.4 (LCD_A0 on FYSETC schematic)
#define DOGLCD_SCK P2_11 // J8-5 (SCK on FYSETC schematic)
#define DOGLCD_CS EXP1_03_PIN // LCD_EN
#define DOGLCD_A0 EXP1_04_PIN // LCD_A0
#define DOGLCD_SCK PIN_P2_11 // J8-5 (SCK on FYSETC schematic)
#define DOGLCD_MOSI P4_28 // J8-6 (MOSI on FYSETC schematic)
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P2_12 // J8-4 (LCD_D6 on FYSETC schematic)
#define RGB_LED_R_PIN PIN_P2_12 // J8-4 (LCD_D6 on FYSETC schematic)
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_23 // J8-3 (LCD_D5 on FYSETC schematic)
#define RGB_LED_G_PIN PIN_P1_23 // J8-3 (LCD_D5 on FYSETC schematic)
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on FYSETC schematic)
#define RGB_LED_B_PIN PIN_P1_22 // J8-2 (LCD_D7 on FYSETC schematic)
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P2_12
#define NEOPIXEL_PIN PIN_P2_12
#endif
#elif ENABLED(MINIPANEL)
@@ -293,25 +296,23 @@
#if HAS_DRIVER(TMC2130)
// J8
#define X_CS_PIN P1_22
#define Y_CS_PIN P1_23
#define Z_CS_PIN P2_12
#define E0_CS_PIN P2_11
#define X_CS_PIN PIN_P1_22
#define Y_CS_PIN PIN_P1_23
#define Z_CS_PIN PIN_P2_12
#define E0_CS_PIN PIN_P2_11
#define E1_CS_PIN P4_28
// Hardware SPI is on EXP2. See if you can make it work:
// https://github.com/makerbase-mks/MKS-SBASE/issues/25
#define TMC_USE_SW_SPI
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P0_03 // AUX1
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P0_02 // AUX1
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P0_26 // TH4
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P0_03 // AUX1
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P0_02 // AUX1
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P0_26 // TH4
#endif
#endif
@@ -325,21 +326,24 @@
* Worst case you may have to give up the LCD
* RX pins need to be interrupt capable
*/
#define X_SERIAL_TX_PIN P1_22 // J8-2
#define X_SERIAL_RX_PIN P2_12 // J8-4 Interrupt Capable
#define X_SERIAL_TX_PIN PIN_P1_22 // J8-2
#define X_SERIAL_RX_PIN PIN_P2_12 // J8-4 Interrupt Capable
#define Y_SERIAL_TX_PIN P1_23 // J8-3
#define Y_SERIAL_RX_PIN P2_11 // J8-5 Interrupt Capable
#define Y_SERIAL_TX_PIN PIN_P1_23 // J8-3
#define Y_SERIAL_RX_PIN PIN_P2_11 // J8-5 Interrupt Capable
#define Z_SERIAL_TX_PIN P2_12 // J8-4
#define Z_SERIAL_TX_PIN PIN_P2_12 // J8-4
#define Z_SERIAL_RX_PIN P0_25 // TH3
#define E0_SERIAL_TX_PIN P4_28 // J8-6
#define E0_SERIAL_RX_PIN P0_26 // TH4
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
// UNUSED
//#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)

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

@@ -134,18 +134,16 @@
#endif
//
// Software SPI pins for TMC2130 stepper drivers
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P4_28
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P0_05
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P0_04
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P4_28
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P0_05
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P0_04
#endif
#if HAS_TMC_UART
@@ -186,7 +184,10 @@
#define Z2_SERIAL_RX_PIN P1_17
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
//
@@ -211,8 +212,8 @@
#define HEATER_1_PIN P2_06
#endif
#endif
#ifndef FAN_PIN
#define FAN_PIN P2_04
#ifndef FAN0_PIN
#define FAN0_PIN P2_04
#endif
//
@@ -289,13 +290,13 @@
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_EN EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_A0_PIN EXP1_08_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_RESET_PIN EXP1_04_PIN
@@ -308,11 +309,11 @@
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
// Disable any LCD related PINs config
#define LCD_PINS_ENABLE -1
#define LCD_PINS_EN -1
#define LCD_PINS_RS -1
#ifndef TFT_BUFFER_SIZE
#define TFT_BUFFER_SIZE 1200
#ifndef TFT_BUFFER_WORDS
#define TFT_BUFFER_WORDS 1200
#endif
#ifndef TFT_QUEUE_SIZE
#define TFT_QUEUE_SIZE 6144
@@ -349,11 +350,11 @@
#define LCD_PINS_D7 EXP1_08_PIN
#define KILL_PIN -1 // NC
#else // !MKS_12864OLED_SSD1306
#else // !MKS_12864OLED_SSD1306
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
@@ -370,7 +371,7 @@
#define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXP1_06_PIN
#endif
@@ -384,7 +385,7 @@
#define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS EXP1_06_PIN

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

@@ -99,18 +99,16 @@
#endif
//
// Software SPI pins for TMC2130 stepper drivers
// Default pins for TMC software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI P1_00 // ETH
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO P1_08 // ETH
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK P1_09 // ETH
#endif
#ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI P1_00 // ETH
#endif
#ifndef TMC_SPI_MISO
#define TMC_SPI_MISO P1_08 // ETH
#endif
#ifndef TMC_SPI_SCK
#define TMC_SPI_SCK P1_09 // ETH
#endif
#if HAS_TMC_UART
@@ -121,7 +119,6 @@
* If undefined software serial is used according to the pins below
*/
// P2_08 E1-Step
// P2_13 E1-Dir
@@ -154,8 +151,11 @@
#endif
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
//
// Temperature Sensors
@@ -167,7 +167,7 @@
#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2
#define TEMP_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_PIN
//#define ?? P0_03_A6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
//#define PIN_P0_03 P0_03_A6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
#define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
//
@@ -206,15 +206,15 @@
#endif
#endif
#ifndef FAN_PIN
#if EITHER(FET_ORDER_EFB, FET_ORDER_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
#define FAN_PIN MOSFET_B_PIN
#elif EITHER(FET_ORDER_EEF, FET_ORDER_SF) // Hotend, Hotend, Fan or Spindle, Fan
#define FAN_PIN MOSFET_C_PIN
#ifndef FAN0_PIN
#if ANY(FET_ORDER_EFB, FET_ORDER_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
#define FAN0_PIN MOSFET_B_PIN
#elif ANY(FET_ORDER_EEF, FET_ORDER_SF) // Hotend, Hotend, Fan or Spindle, Fan
#define FAN0_PIN MOSFET_C_PIN
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
#define FAN_PIN P1_18 // (4) IO pin. Buffer needed
#define FAN0_PIN P1_18 // (4) IO pin. Buffer needed
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
#define FAN_PIN MOSFET_B_PIN
#define FAN0_PIN MOSFET_B_PIN
#endif
#endif
@@ -252,8 +252,8 @@
#error "LASER_FEATURE requires 3 free servo pins."
#endif
#endif
#define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
#define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown!
#define SPINDLE_DIR_PIN SERVO2_PIN // (5)
#endif
@@ -293,18 +293,17 @@
#if ENABLED(CR10_STOCKDISPLAY)
// Re-Arm can support Creality stock display without SD card reader and single cable on EXP3.
// Re-Arm J3 pins 1 (p1.31) & 2 (P3.26) are not used. Stock cable will need to have one
// Re-Arm J3 pins 1 (P1.31) & 2 (P3.26) are not used. Stock cable will need to have one
// 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
// Requires REVERSE_ENCODER_DIRECTION in Configuration.h
#define BEEPER_PIN P2_11 // J3-3 & AUX-4
#define BTN_EN1 P0_16 // J3-7 & AUX-4
#define BTN_EN2 P1_23 // J3-5 & AUX-4
#define BTN_EN1 P1_23 // J3-5 & AUX-4
#define BTN_EN2 P0_16 // J3-7 & AUX-4
#define BTN_ENC P3_25 // J3-4 & AUX-4
#define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_EN P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#elif ENABLED(ZONESTAR_LCD)
@@ -325,8 +324,8 @@
#elif HAS_WIRED_LCD
#if ENABLED(FYSETC_MINI_12864)
#define BEEPER_PIN P1_01
#define BTN_ENC P1_04
#define BEEPER_PIN P1_01 // (79) J12-12
#define BTN_ENC P1_04 // (77) J12-10
#else
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define BTN_ENC P2_11 // (35) J3-3 & AUX-4
@@ -353,7 +352,7 @@
//#define SHIFT_EN_PIN P1_22 // (41) J5-4 & AUX-4
#endif
#if EITHER(VIKI2, miniVIKI)
#if ANY(VIKI2, miniVIKI)
#define DOGLCD_CS P0_16 // (16)
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#define DOGLCD_SCK P0_15 // (52) (SCK) J3-9 & AUX-3
@@ -367,18 +366,18 @@
#else
#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18
#define DOGLCD_SCK P0_15 // (52) (SCK) J3-9 & AUX-3
#define DOGLCD_MOSI P0_18 // (51) (MOSI) J3-10 & AUX-3
// EXP1 on LCD adapter is not usable - using Ethernet connector instead
#define DOGLCD_CS P1_09
#define DOGLCD_A0 P1_14
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0
#define DOGLCD_CS P1_09 // (74) J12-7
#define DOGLCD_A0 P1_14 // (73) J12-6
//#define FORCE_SOFT_SPI // Use this if Hardware SPI causes display problems.
// Results in LCD Software SPI mode 3, SD Software SPI mode 0.
#define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P1_00
#endif
@@ -396,24 +395,22 @@
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#endif
#define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
#define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
#define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
#define LCD_PINS_EN P0_18 // (51) (MOSI) J3-10 & AUX-3
#define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
#if IS_ULTIPANEL
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
#endif
#endif
#if ENABLED(MINIPANEL)
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#endif
#endif // HAS_WIRED_LCD
@@ -421,17 +418,17 @@
// Ethernet pins
//
#if !IS_ULTIPANEL
#define ENET_MDIO P1_17 // (71) J12-4
#define ENET_RX_ER P1_14 // (73) J12-6
#define ENET_RXD1 P1_10 // (75) J12-8
#define ENET_MDIO P1_17 // (71) J12-4
#define ENET_RX_ER P1_14 // (73) J12-6
#define ENET_RXD1 P1_10 // (75) J12-8
#endif
#define ENET_MOC P1_16 // (70) J12-3
#define REF_CLK P1_15 // (72) J12-5
#define ENET_RXD0 P1_09 // (74) J12-7
#define ENET_CRS P1_08 // (76) J12-9
#define ENET_TX_EN P1_04 // (77) J12-10
#define ENET_TXD0 P1_00 // (78) J12-11
#define ENET_TXD1 P1_01 // (79) J12-12
#define ENET_MOC P1_16 // (70) J12-3
#define REF_CLK P1_15 // (72) J12-5
#define ENET_RXD0 P1_09 // (74) J12-7
#define ENET_CRS P1_08 // (76) J12-9
#define ENET_TX_EN P1_04 // (77) J12-10
#define ENET_TXD0 P1_00 // (78) J12-11
#define ENET_TXD1 P1_01 // (79) J12-12
//
// SD Support
@@ -441,10 +438,10 @@
#endif
#if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
#define SD_MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
#define SD_MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3
#define SD_SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
#define SD_SCK_PIN P0_15 // (52) System-defined J3-9 & AUX-3
#define SD_MISO_PIN P0_17 // (50) System-defined J3-10 & AUX-3
#define SD_MOSI_PIN P0_18 // (51) System-defined J3-10 & AUX-3
#define SD_SS_PIN P1_23 // (53) System-defined J3-5 & AUX-3 (aka SDSS, CS)
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
#define SD_SCK_PIN P0_07

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

@@ -87,8 +87,8 @@
#define HEATER_BED2_PIN P2_04
#define HEATER_0_PIN P2_07
#define HEATER_1_PIN P2_06
#ifndef FAN_PIN
#define FAN_PIN P1_24
#ifndef FAN0_PIN
#define FAN0_PIN P1_24
#endif
#define FAN1_PIN P1_26
@@ -98,7 +98,7 @@
#if IS_RRD_FG_SC
#define LCD_PINS_RS P0_16
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_EN P0_18
#define LCD_PINS_D4 P0_15
#define LCD_PINS_D5 P1_00
#define LCD_PINS_D6 P1_01