0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

♻️ LCD pins migration precursor (#26719)

Browse source 
Preliminary changes for #25650
This commit is contained in:
Scott Lahteine 2024-01-22 17:32:01 -06:00 committed by GitHub
parent 604d3e8fad
commit aa7d571486
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
84 changed files with 1884 additions and 1195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/DUE/HAL_SPI.cpp
View file

@ -42,7 +42,7 @@
// Public functions // Public functions
// ------------------------ // ------------------------
#if ANY(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI) #if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
// ------------------------ // ------------------------
// Software SPI // Software SPI

4
Marlin/src/HAL/DUE/inc/SanityCheck.h
View file

@ -72,10 +72,10 @@
#if HAS_MEDIA && HAS_DRIVER(TMC2130) #if HAS_MEDIA && HAS_DRIVER(TMC2130)
#if ENABLED(TMC_USE_SW_SPI) #if ENABLED(TMC_USE_SW_SPI)
#if DISABLED(DUE_SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK)) #if DISABLED(SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
#error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs." #error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
#endif #endif
#elif ENABLED(DUE_SOFTWARE_SPI) #elif ENABLED(SOFTWARE_SPI)
#error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix." #error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
#endif #endif
#endif #endif

2
Marlin/src/HAL/DUE/spi_pins.h
View file

@ -48,7 +48,7 @@
#define SD_MOSI_PIN 75 #define SD_MOSI_PIN 75
#else #else
// defaults // defaults
#define DUE_SOFTWARE_SPI #define SOFTWARE_SPI
#ifndef SD_SCK_PIN #ifndef SD_SCK_PIN
#define SD_SCK_PIN 52 #define SD_SCK_PIN 52
#endif #endif

3
Marlin/src/HAL/LINUX/spi_pins.h
View file

@ -21,9 +21,6 @@
*/ */
#pragma once #pragma once
#include "../../core/macros.h"
#include "../../inc/MarlinConfigPre.h"
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN) #if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently #define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
// needed due to the speed and mode required for communicating with each device being different. // needed due to the speed and mode required for communicating with each device being different.

4
Marlin/src/HAL/LPC1768/spi_pins.h
View file

@ -21,9 +21,7 @@
*/ */
#pragma once #pragma once
#include "../../core/macros.h" #if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
#if ALL(HAS_MEDIA, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently #define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
// needed due to the speed and mode required for communicating with each device being different. // needed due to the speed and mode required for communicating with each device being different.
// This requirement can be removed if the SPI access to these devices is updated to use // This requirement can be removed if the SPI access to these devices is updated to use

3
Marlin/src/HAL/NATIVE_SIM/spi_pins.h
View file

@ -21,9 +21,6 @@
*/ */
#pragma once #pragma once
#include "../../core/macros.h"
#include "../../inc/MarlinConfigPre.h"
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN) #if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently #define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
// needed due to the speed and mode required for communicating with each device being different. // needed due to the speed and mode required for communicating with each device being different.

2
Marlin/src/MarlinCore.cpp
View file

@ -1063,7 +1063,7 @@ inline void tmc_standby_setup() {
* - Init the buzzer, possibly a custom timer * - Init the buzzer, possibly a custom timer
* - Init more optional hardware: * - Init more optional hardware:
* • Color LED illumination * • Color LED illumination
* • Neopixel illumination * • NeoPixel illumination
* • Controller Fan * • Controller Fan
* • Creality DWIN LCD (show boot image) * • Creality DWIN LCD (show boot image)
* • Tare the Probe if possible * • Tare the Probe if possible

2
Marlin/src/inc/Conditionals_LCD.h
View file

@ -575,7 +575,7 @@
#define MKS_MINI_12864 #define MKS_MINI_12864
#endif #endif
// MKS_MINI_12864_V3 , BTT_MINI_12864 and BEEZ_MINI_12864 have identical pinouts to FYSETC_MINI_12864_2_1 // MKS_MINI_12864_V3 , BTT_MINI_12864 and BEEZ_MINI_12864 are nearly identical to FYSETC_MINI_12864_2_1
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864) #if ANY(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)
#define FYSETC_MINI_12864_2_1 #define FYSETC_MINI_12864_2_1
#endif #endif

12
Marlin/src/inc/Conditionals_post.h
View file

@ -3215,18 +3215,6 @@
#undef SOUND_ON_DEFAULT #undef SOUND_ON_DEFAULT
#endif #endif
/**
* Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
*/
#if HAS_MARLINUI_U8GLIB
#ifndef DOGLCD_SCK
#define DOGLCD_SCK SD_SCK_PIN
#endif
#ifndef DOGLCD_MOSI
#define DOGLCD_MOSI SD_MOSI_PIN
#endif
#endif
/** /**
* Z_CLEARANCE_FOR_HOMING / Z_CLEARANCE_BETWEEN_PROBES * Z_CLEARANCE_FOR_HOMING / Z_CLEARANCE_BETWEEN_PROBES
*/ */

3
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View file

@ -311,9 +311,6 @@ void MarlinUI::init_lcd() {
#if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED, K3D_242_OLED_CONTROLLER) #if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED, K3D_242_OLED_CONTROLLER)
SET_OUTPUT(LCD_PINS_DC); SET_OUTPUT(LCD_PINS_DC);
#ifndef LCD_RESET_PIN
#define LCD_RESET_PIN LCD_PINS_RS
#endif
#endif #endif
#if PIN_EXISTS(LCD_RESET) #if PIN_EXISTS(LCD_RESET)

5
Marlin/src/lcd/dogm/marlinui_DOGM.h
View file

@ -40,13 +40,16 @@
#ifdef __SAMD21__ #ifdef __SAMD21__
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
#else #else
// Hardware SPI on DUE
#define U8G_CLASS U8GLIB_ST7920_128X64_4X #define U8G_CLASS U8GLIB_ST7920_128X64_4X
#endif #endif
#define U8G_PARAM LCD_PINS_RS #define U8G_PARAM LCD_PINS_RS
#elif (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN) #elif (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
// Hardware SPI shared with SD Card
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
#define U8G_PARAM LCD_PINS_RS #define U8G_PARAM LCD_PINS_RS
#else #else
// Software SPI
#define U8G_CLASS U8GLIB_ST7920_128X64_4X #define U8G_CLASS U8GLIB_ST7920_128X64_4X
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS #define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS
#endif #endif
@ -97,7 +100,7 @@
#define SMART_RAMPS MB(RAMPS_SMART_EFB, RAMPS_SMART_EEB, RAMPS_SMART_EFF, RAMPS_SMART_EEF, RAMPS_SMART_SF) #define SMART_RAMPS MB(RAMPS_SMART_EFB, RAMPS_SMART_EEB, RAMPS_SMART_EFF, RAMPS_SMART_EEF, RAMPS_SMART_SF)
#define U8G_CLASS U8GLIB_64128N_2X_HAL // 4 stripes (HW-SPI) #define U8G_CLASS U8GLIB_64128N_2X_HAL // 4 stripes (HW-SPI)
#if (SMART_RAMPS && defined(__SAM3X8E__)) || DOGLCD_SCK != SD_SCK_PIN || DOGLCD_MOSI != SD_MOSI_PIN #if (SMART_RAMPS && defined(__SAM3X8E__)) || (defined(DOGLCD_SCK) && (DOGLCD_SCK != -1 && DOGLCD_SCK != SD_SCK_PIN)) || (defined(DOGLCD_MOSI) && (DOGLCD_MOSI != -1 && DOGLCD_MOSI != SD_MOSI_PIN))
#define FORCE_SOFT_SPI // SW-SPI #define FORCE_SOFT_SPI // SW-SPI
#endif #endif

2
Marlin/src/module/settings.cpp
View file

@ -702,7 +702,7 @@ void MarlinSettings::postprocess() {
if (oldpos != current_position) if (oldpos != current_position)
report_current_position(); report_current_position();
// Moved as last update due to interference with Neopixel init // Moved as last update due to interference with NeoPixel init
TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast()); TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness()); TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
TERN_(HAS_BACKLIGHT_TIMEOUT, ui.refresh_backlight_timeout()); TERN_(HAS_BACKLIGHT_TIMEOUT, ui.refresh_backlight_timeout());

4
Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
View file

@ -112,8 +112,8 @@
// #define FAN_SOFT_PWM_REQUIRED // check if needed // #define FAN_SOFT_PWM_REQUIRED // check if needed
// Neopixel Rings // NeoPixel Rings
#define NEOPIXEL_PIN 14 #define BOARD_NEOPIXEL_PIN 14
#define NEOPIXEL2_PIN 27 #define NEOPIXEL2_PIN 27
// SPI // SPI

4
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View file

@ -128,7 +128,7 @@
* ------ ------ * ------ ------
* (BEEPER) 149 | 1 2 | 13 (BTN_ENC) (SPI MISO) 19 | 1 2 | 18 (SPI SCK) * (BEEPER) 149 | 1 2 | 13 (BTN_ENC) (SPI MISO) 19 | 1 2 | 18 (SPI SCK)
* (LCD_EN) 21 | 3 4 | 4 (LCD_RS) (BTN_EN1) 14 | 3 4 | 5 (SPI CS) * (LCD_EN) 21 | 3 4 | 4 (LCD_RS) (BTN_EN1) 14 | 3 4 | 5 (SPI CS)
* (LCD_D4) 0 5 6 | 16 (LCD_D5) (BTN_EN2) 12 5 6 | 23 (SPI MOSI) * (LCD_D4) 0 | 5 6 16 (LCD_D5) (BTN_EN2) 12 | 5 6 23 (SPI MOSI)
* (LCD_D6) 15 | 7 8 | 17 (LCD_D7) (SPI_DET) 34 | 7 8 | RESET * (LCD_D6) 15 | 7 8 | 17 (LCD_D7) (SPI_DET) 34 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | 3.3V * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------ * ------ ------
@ -159,6 +159,8 @@
//#define SD_MOSI_PIN EXP2_06_PIN // uses esp32 default 23 //#define SD_MOSI_PIN EXP2_06_PIN // uses esp32 default 23
//#define SD_MISO_PIN EXP2_01_PIN // uses esp32 default 19 //#define SD_MISO_PIN EXP2_01_PIN // uses esp32 default 19
//#define SD_SCK_PIN EXP2_02_PIN // uses esp32 default 18 //#define SD_SCK_PIN EXP2_02_PIN // uses esp32 default 18
// TODO: Migrate external SD Card to pins/lcd
#define SDSS EXP2_04_PIN #define SDSS EXP2_04_PIN
#define SD_DETECT_PIN EXP2_07_PIN // IO34 default is SD_DET signal (Jump to SDDET) #define SD_DETECT_PIN EXP2_07_PIN // IO34 default is SD_DET signal (Jump to SDDET)
#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers

2
Marlin/src/pins/esp32/pins_PANDA_common.h
View file

@ -86,7 +86,7 @@
* (EN1) 33 | 3 4 | (5 SDSS?) (EN) 26 | 3 4 | 27 (RS) * (EN1) 33 | 3 4 | (5 SDSS?) (EN) 26 | 3 4 | 27 (RS)
* (EN2) 32 5 6 | (23 MOSI?) (D4) 14 | 5 6 -- * (EN2) 32 5 6 | (23 MOSI?) (D4) 14 | 5 6 --
* (SDDET 2?) | 7 8 | (RESET) -- | 7 8 | -- * (SDDET 2?) | 7 8 | (RESET) -- | 7 8 | --
* -- | 9 10 | -- (GND) | 9 10 | (5V) * -- | 9 10 | -- GND | 9 10 | 5V
* ------ ------ * ------ ------
* EXP2 EXP1 * EXP2 EXP1
*/ */

144
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View file

@ -193,7 +193,7 @@
// //
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define NEOPIXEL_PIN 71 #define BOARD_NEOPIXEL_PIN 71
#ifndef FILWIDTH_PIN #ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 5 // Analog Input on AUX2 #define FILWIDTH_PIN 5 // Analog Input on AUX2
@ -371,6 +371,34 @@
#endif #endif
#endif #endif
/** Faux Expansion Headers
* ------ ------
* (BEEP) 37 | 1 2 | 35 (ENC) (MISO) 50 | 1 2 | 52 (SCK)
* (LCD_EN) 17 | 3 4 | 16 (LCD_RS) (EN1) 31 | 3 4 | 53 (SDSS)
* (LCD_D4) 23 5 6 | 25 (LCD_D5) (EN2) 33 5 6 | 51 (MOSI)
* (LCD_D6) 27 | 7 8 | 29 (LCD_D7) (SD_DET) 49 | 7 8 | 41 (KILL)
* -- | 9 10 | -- -- | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN 37 // BEEPER
#define EXP1_02_PIN 35 // ENC
#define EXP1_03_PIN 17 // LCD_EN
#define EXP1_04_PIN 16 // LCD_RS
#define EXP1_05_PIN 23 // LCD_D4
#define EXP1_06_PIN 25 // LCD_D5
#define EXP1_07_PIN 27 // LCD_D6
#define EXP1_08_PIN 29 // LCD_D7
#define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 31 // EN1
#define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 33 // EN2
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 // SD_DET
#define EXP2_08_PIN 41 // KILL
////////////////////////// //////////////////////////
// LCDs and Controllers // // LCDs and Controllers //
////////////////////////// //////////////////////////
@ -385,10 +413,11 @@
#define TFT_MOSI_PIN SD_MOSI_PIN #define TFT_MOSI_PIN SD_MOSI_PIN
#define LCD_USE_DMA_SPI #define LCD_USE_DMA_SPI
#define BEEPER_PIN 42
#define BTN_ENC 59
#define BTN_EN1 40 #define BTN_EN1 40
#define BTN_EN2 63 #define BTN_EN2 63
#define BTN_ENC 59
#define BEEPER_PIN 42
#define TOUCH_CS_PIN 33 #define TOUCH_CS_PIN 33
@ -473,9 +502,9 @@
// //
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select #define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
#define LCD_PINS_EN 51 // SID (MOSI) #define LCD_PINS_EN EXP2_06_PIN // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock #define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
#elif ALL(IS_NEWPANEL, PANEL_ONE) #elif ALL(IS_NEWPANEL, PANEL_ONE)
@ -490,12 +519,12 @@
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 27 #define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_EN 29 #define LCD_PINS_EN EXP1_08_PIN
#define LCD_PINS_D4 25 #define LCD_PINS_D4 EXP1_06_PIN
#if !IS_NEWPANEL #if !IS_NEWPANEL
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_01_PIN
#endif #endif
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
@ -510,38 +539,28 @@
#else #else
#if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306) #if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306)
#define LCD_PINS_DC 25 // Set as output on init #define LCD_PINS_DC EXP1_06_PIN // Set as output on init
#define LCD_PINS_RS 27 // Pull low for 1s to init #define LCD_PINS_RS EXP1_07_PIN // Pull low for 1s to init
// DOGM SPI LCD Support // DOGM SPI LCD Support
#define DOGLCD_CS 16 #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_MOSI 17 #define DOGLCD_MOSI EXP1_03_PIN
#define DOGLCD_SCK 23 #define DOGLCD_SCK EXP1_05_PIN
#define DOGLCD_A0 LCD_PINS_DC #define DOGLCD_A0 LCD_PINS_DC
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN 17 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 23 #define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 25 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 27 #define LCD_PINS_D6 EXP1_07_PIN
#endif #endif
#define LCD_PINS_D7 29 #define LCD_PINS_D7 EXP1_08_PIN
#if !IS_NEWPANEL #if !IS_NEWPANEL
#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_05_PIN
#endif #endif
#endif #endif
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN 42
//#define SHIFT_OUT_PIN 40
//#define SHIFT_EN_PIN 17
#endif
#endif #endif
// //
@ -551,19 +570,19 @@
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define BTN_EN1 17 #define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 23 #define BTN_EN2 EXP1_05_PIN
#else #else
#define BTN_EN1 31 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_05_PIN
#endif #endif
#define BTN_ENC 35 #define BTN_ENC EXP1_02_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_08_PIN
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
#define LCD_BACKLIGHT_PIN 39 #define LCD_BACKLIGHT_PIN 39
@ -613,34 +632,34 @@
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define DOGLCD_CS 29 #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 27 #define DOGLCD_A0 EXP1_07_PIN
#define BEEPER_PIN 23 #define BEEPER_PIN EXP1_05_PIN
#define LCD_BACKLIGHT_PIN 33 #define LCD_BACKLIGHT_PIN EXP2_05_PIN
#define BTN_EN1 35 #define BTN_EN1 EXP1_02_PIN
#define BTN_EN2 37 #define BTN_EN2 EXP1_01_PIN
#define BTN_ENC 31 #define BTN_ENC EXP2_03_PIN
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_08_PIN
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 27 #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS 25 #define DOGLCD_CS EXP1_06_PIN
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_01_PIN
// not connected to a pin // not connected to a pin
#define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
#define BTN_EN1 31 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_05_PIN
#define BTN_ENC 35 #define BTN_ENC EXP1_02_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#define KILL_PIN 64 #define KILL_PIN 64
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
@ -673,7 +692,6 @@
#else #else
// Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Buttons are directly attached to AUX-2 // Buttons are directly attached to AUX-2
@ -689,15 +707,15 @@
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 EXP1_01_PIN
#define BTN_EN2 35 #define BTN_EN2 EXP1_02_PIN
#define BTN_ENC 31 #define BTN_ENC EXP2_03_PIN
#define SD_DETECT_PIN 41 #define SD_DETECT_PIN EXP2_08_PIN
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_08_PIN
#endif #endif
#endif #endif

5
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View file

@ -292,9 +292,10 @@
* ------ ------ * ------ ------
* LCD LCD * LCD LCD
*/ */
#define BTN_ENC EXP1_03_PIN
#define BTN_EN1 EXP1_05_PIN #define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_07_PIN #define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_03_PIN
#define DOGLCD_CS EXP1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_06_PIN #define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_04_PIN #define DOGLCD_SCK EXP1_04_PIN
@ -457,8 +458,6 @@
#define DOGLCD_SCK EXP2_02_PIN #define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_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 #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 // results in LCD soft SPI mode 3, SD soft SPI mode 0

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -598,8 +598,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN P1_24 #define BOARD_NEOPIXEL_PIN P1_24
#endif #endif
/** /**

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View file

@ -112,7 +112,7 @@
// LCD / Controller // LCD / Controller
// //
#if !defined(BEEPER_PIN) && HAS_WIRED_LCD && DISABLED(LCD_USE_I2C_BUZZER) #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 #endif
// //

132
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View file

@ -117,31 +117,25 @@
// Note: These pins are all digitally shared with the EXP1/EXP2 Connector. // 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. // Using them with an LCD connected or configured will lead to hangs & crashes.
// //
//#define PIN_P0_17 P0_17 // 5V
// 5V //#define PIN_P0_16 P0_16 // NC
// NC //#define PIN_P0_15 P0_15 // GND
// GND
#define PIN_P0_17 P0_17
#define PIN_P0_16 P0_16
#define PIN_P0_15 P0_15
// //
// Connector J8 // Connector J8
// //
#define PIN_P1_22 P1_22 // GND
// GND #define PIN_P1_23 P1_23 // PWM-capable
#define PIN_P1_22 P1_22 #define PIN_P2_12 P2_12 // Interrupt-capable
#define PIN_P1_23 P1_23 // PWM Capable #define PIN_P2_11 P2_11 // Interrupt-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 // Průša i3 MMU1 (Multi Material Multiplexer) Support
// //
#if HAS_PRUSA_MMU1 #if HAS_PRUSA_MMU1
#define E_MUX0_PIN P1_23 // J8-3 #define E_MUX0_PIN PIN_P1_23 // J8-3
#define E_MUX1_PIN P2_12 // J8-4 #define E_MUX1_PIN PIN_P2_12 // J8-4
#define E_MUX2_PIN P2_11 // J8-5 #define E_MUX2_PIN PIN_P2_11 // J8-5
#endif #endif
// //
@ -177,21 +171,19 @@
#if SD_CONNECTION_IS(CUSTOM_CABLE) #if SD_CONNECTION_IS(CUSTOM_CABLE)
/** /**
* A custom cable is needed. See the README file in the * A custom cable is needed.
* Marlin\src\config\examples\Mks\Sbase directory * 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's socket. That means it can't be * 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.
* used as the SD_DETECT for the LCD's SD card.
* *
* The best solution is to use the custom cable to connect the LCD's SD_DETECT * The best solution is to use the custom cable to connect the LCD SD_DETECT to a pin NOT on EXP2.
* to a pin NOT on EXP2.
* *
* If you can't find a pin to use for the LCD's SD_DETECT then comment out * If you can't find a pin to use for the LCD SD_DETECT then comment out SD_DETECT_PIN and remove that wire
* SD_DETECT_PIN entirely and remove that wire from the the custom cable. * from the the custom cable.
*/ */
#define SD_DETECT_PIN P2_11 // J8-5 (moved from EXP2 P0.27) #define SD_DETECT_PIN 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_SCK_PIN 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_MISO_PIN 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_MOSI_PIN PIN_P2_12 // J8-4 (moved from EXP2 P0.9)
#define SD_SS_PIN P0_28 #define SD_SS_PIN P0_28
#define SOFTWARE_SPI // With a custom cable we need software SPI because the #define SOFTWARE_SPI // With a custom cable we need software SPI because the
// selected pins are not on a hardware SPI controller // selected pins are not on a hardware SPI controller
@ -212,17 +204,28 @@
#endif #endif
/** /**
* Smart LCD adapter * ------ ------
* * 1.31 | 1 2 | 1.30 0.08 | 1 2 | 0.07
* The Smart LCD adapter can be used for the two 10 pin LCD controllers such as * 0.18 | 3 4 | 0.16 3.25 | 3 4 | 0.28
* REPRAP_DISCOUNT_SMART_CONTROLLER. It can't be used for controllers that use * 0.15 | 5 6 -- 3.26 | 5 6 0.09
* DOGLCD_A0, DOGLCD_CS, LCD_PINS_D5, LCD_PINS_D6 or LCD_PINS_D7. A custom cable * -- | 7 8 | -- 0.27 | 7 8 | RESET
* is needed to pick up 5V for the EXP1 connection. * GND | 9 10 | 5V GND | 9 10 | --
* * ------ ------
* SD card on the LCD uses the same SPI signals as the LCD. This results in garbage/lines * EXP1 EXP2
* 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.
*/ */
#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 // LCD / Controller
@ -230,23 +233,22 @@
#if IS_TFTGLCD_PANEL #if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS P3_25 // EXP2.3 #define TFTGLCD_CS EXP2_03_PIN
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN P0_28 // EXP2.4 #define SD_DETECT_PIN EXP2_04_PIN
#endif #endif
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1.1 #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC P1_30 // EXP1.2 #define BTN_ENC EXP1_02_PIN
#define BTN_EN1 P3_26 // EXP2.5 #define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 P3_25 // EXP2.3 #define BTN_EN2 EXP2_03_PIN
#define LCD_PINS_RS P0_16 // EXP1.4 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_SDSS P0_28 // EXP2.4 #define LCD_SDSS EXP2_04_PIN
#define LCD_PINS_EN P0_18 // EXP1.3 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 P0_15 // EXP1.5 #define LCD_PINS_D4 EXP1_05_PIN
#if ANY(VIKI2, miniVIKI) #if ANY(VIKI2, miniVIKI)
#define DOGLCD_SCK SD_SCK_PIN #define DOGLCD_SCK SD_SCK_PIN
#define DOGLCD_MOSI SD_MOSI_PIN #define DOGLCD_MOSI SD_MOSI_PIN
@ -264,9 +266,9 @@
* Pins 6, 7 & 8 on EXP2 are no connects. That means a second special * 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. * cable will be needed if the RGB LEDs are to be active.
*/ */
#define DOGLCD_CS P0_18 // EXP1.3 (LCD_EN on FYSETC schematic) #define DOGLCD_CS EXP1_03_PIN // LCD_EN
#define DOGLCD_A0 P0_16 // EXP1.4 (LCD_A0 on FYSETC schematic) #define DOGLCD_A0 EXP1_04_PIN // LCD_A0
#define DOGLCD_SCK P2_11 // J8-5 (SCK on FYSETC schematic) #define DOGLCD_SCK PIN_P2_11 // J8-5 (SCK on FYSETC schematic)
#define DOGLCD_MOSI P4_28 // J8-6 (MOSI 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 //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
@ -274,16 +276,16 @@
#if ANY(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 #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 #endif
#ifndef RGB_LED_G_PIN #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 #endif
#ifndef RGB_LED_B_PIN #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 #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P2_12 #define NEOPIXEL_PIN PIN_P2_12
#endif #endif
#elif ENABLED(MINIPANEL) #elif ENABLED(MINIPANEL)
@ -300,10 +302,10 @@
#if HAS_DRIVER(TMC2130) #if HAS_DRIVER(TMC2130)
// J8 // J8
#define X_CS_PIN P1_22 #define X_CS_PIN PIN_P1_22
#define Y_CS_PIN P1_23 #define Y_CS_PIN PIN_P1_23
#define Z_CS_PIN P2_12 #define Z_CS_PIN PIN_P2_12
#define E0_CS_PIN P2_11 #define E0_CS_PIN PIN_P2_11
#define E1_CS_PIN P4_28 #define E1_CS_PIN P4_28
// Hardware SPI is on EXP2. See if you can make it work: // Hardware SPI is on EXP2. See if you can make it work:
@ -330,13 +332,13 @@
* Worst case you may have to give up the LCD * Worst case you may have to give up the LCD
* RX pins need to be interrupt capable * RX pins need to be interrupt capable
*/ */
#define X_SERIAL_TX_PIN P1_22 // J8-2 #define X_SERIAL_TX_PIN PIN_P1_22 // J8-2
#define X_SERIAL_RX_PIN P2_12 // J8-4 Interrupt Capable #define X_SERIAL_RX_PIN PIN_P2_12 // J8-4 Interrupt Capable
#define Y_SERIAL_TX_PIN P1_23 // J8-3 #define Y_SERIAL_TX_PIN PIN_P1_23 // J8-3
#define Y_SERIAL_RX_PIN P2_11 // J8-5 Interrupt Capable #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 Z_SERIAL_RX_PIN P0_25 // TH3
#define E0_SERIAL_TX_PIN P4_28 // J8-6 #define E0_SERIAL_TX_PIN P4_28 // J8-6

35
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View file

@ -167,7 +167,7 @@
#define TEMP_2_PIN P0_26_A3 // A3 - (63) - J5-3 & AUX-2 #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_3_PIN P1_30_A4 // A4 - (37) - BUZZER_PIN
//#define TEMP_4_PIN P1_31_A5 // A5 - (49) - SD_DETECT_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 #define FILWIDTH_PIN P0_02_A7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
// //
@ -293,14 +293,13 @@
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
// Re-Arm can support Creality stock display without SD card reader and single cable on EXP3. // 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. // 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 BEEPER_PIN P2_11 // J3-3 & AUX-4
#define BTN_EN1 P0_16 // J3-7 & AUX-4 #define BTN_EN1 P1_23 // J3-5 & AUX-4
#define BTN_EN2 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 BTN_ENC P3_25 // J3-4 & AUX-4
#define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS) #define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS)
@ -325,8 +324,8 @@
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define BEEPER_PIN P1_01 #define BEEPER_PIN P1_01 // (79) J12-12
#define BTN_ENC P1_04 #define BTN_ENC P1_04 // (77) J12-10
#else #else
#define BEEPER_PIN P1_30 // (37) not 5V tolerant #define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define BTN_ENC P2_11 // (35) J3-3 & AUX-4 #define BTN_ENC P2_11 // (35) J3-3 & AUX-4
@ -367,14 +366,14 @@
#else #else
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_SCK P0_15 #define DOGLCD_SCK P0_15 // (52) (SCK) J3-9 & AUX-3
#define DOGLCD_MOSI P0_18 #define DOGLCD_MOSI P0_18 // (51) (MOSI) J3-10 & AUX-3
// EXP1 on LCD adapter is not usable - using Ethernet connector instead // EXP1 on LCD adapter is not usable - using Ethernet connector instead
#define DOGLCD_CS P1_09 #define DOGLCD_CS P1_09 // (74) J12-7
#define DOGLCD_A0 P1_14 #define DOGLCD_A0 P1_14 // (73) J12-6
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems //#define FORCE_SOFT_SPI // Use this if Hardware SPI causes display problems.
// results in LCD soft SPI mode 3, SD soft SPI mode 0 // 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. #define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally.
@ -403,11 +402,9 @@
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO #define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER #define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1 #define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif #endif
#endif #endif
#endif #endif
@ -441,10 +438,10 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3 #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_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_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_SS_PIN P1_23 // (53) System-defined J3-5 & AUX-3 (aka SDSS, CS)
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_SCK_PIN P0_07 #define SD_SCK_PIN P0_07

126
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View file

@ -33,7 +33,7 @@
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Azteeg X5 MINI" #define BOARD_INFO_NAME "Azteeg X5 MINI"
#endif #endif
#define BOARD_WEBSITE_URL "tiny.cc/x5_mini" #define BOARD_WEBSITE_URL "panucatt.com"
// //
// LED // LED
@ -56,11 +56,11 @@
#define Z_STOP_PIN P1_28 #define Z_STOP_PIN P1_28
#ifndef FIL_RUNOUT_PIN #ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN P2_04 #define FIL_RUNOUT_PIN _EXP1_09
#endif #endif
#ifndef FILWIDTH_PIN #ifndef FILWIDTH_PIN
#define FILWIDTH_PIN P0_25_A2 // Analog Input (P0_25) #define FILWIDTH_PIN _EXP1_04 // Analog Input (P0_25)
#endif #endif
// //
@ -109,6 +109,47 @@
#endif #endif
#define FAN1_PIN P1_25 #define FAN1_PIN P1_25
//
// Headers V1.1 - V3.0
//
//#define _EXP1_01 -1 // GND
#define _EXP1_02 P1_03
//#define _EXP1_03 -1 // 3.3V
#define _EXP1_04 P0_25_A2
#define _EXP1_05 P0_27 // SDA0
#define _EXP1_06 P4_29
#define _EXP1_07 P0_28 // SCL0
#define _EXP1_08 P2_08
#define _EXP1_09 P2_04
#define _EXP1_10 P1_22
#define _EXP2_01 P1_31
#define _EXP2_02 P3_26
#define _EXP2_03 P2_11
#define _EXP2_04 P3_25
#define _EXP2_05 P1_23
#define _EXP2_06 P0_17
#define _EXP2_07 P0_16
#define _EXP2_08 P2_06
#define _EXP2_09 P0_15
#define _EXP2_10 P0_18
//
// Only V2.0
//
//#define _J7_01 -1 // 3.3V
//#define _J7_02 -1 // GND
#define _J7_03 P1_16
#define _J7_04 P1_17
#define _J7_05 P1_15
#define _J7_06 P0_14
#define _J7_07 P1_09
#define _J7_08 P1_10
#define _J7_09 P1_08
#define _J7_10 P1_04
#define _J7_11 P1_00
#define _J7_12 P1_01
// //
// Display // Display
// //
@ -121,61 +162,60 @@
// 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3. // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
// Requires REVERSE_ENCODER_DIRECTION in Configuration.h // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
#define BEEPER_PIN P2_11 // J3-3 & AUX-4 #define BEEPER_PIN _EXP2_03
#define BTN_EN1 P0_16 // J3-7 & AUX-4 #define BTN_EN1 _EXP2_07
#define BTN_EN2 P1_23 // J3-5 & AUX-4 #define BTN_EN2 _EXP2_05
#define BTN_ENC P3_25 // J3-4 & AUX-4 #define BTN_ENC _EXP2_04
#define LCD_PINS_RS P0_15 // J3-9 & AUX-4 (CS) #define LCD_PINS_RS _EXP2_09
#define LCD_PINS_EN P0_18 // J3-10 & AUX-3 (SID, MOSI) #define LCD_PINS_EN _EXP2_10
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK) #define LCD_PINS_D4 _EXP2_08
#else #else
#define BTN_EN1 P3_26 // (31) J3-2 & AUX-4 #define BTN_EN1 _EXP2_02
#define BTN_EN2 P3_25 // (33) J3-4 & AUX-4 #define BTN_EN2 _EXP2_04
#define BTN_ENC P2_11 // (35) J3-3 & AUX-4 #define BTN_ENC _EXP2_03
#define SD_DETECT_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3 #define SD_DETECT_PIN _EXP2_01
#define KILL_PIN P1_22 // (41) J5-4 & AUX-4 #define KILL_PIN _EXP1_10
#define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4 #define LCD_PINS_RS _EXP2_07
#define LCD_SDSS P0_16 // (16) J3-7 & AUX-4 #define LCD_SDSS _EXP2_07
#define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers #define LCD_BACKLIGHT_PIN _EXP2_07
#define LCD_PINS_EN P0_18 // (51) (MOSI) J3-10 & AUX-3 #define LCD_PINS_EN _EXP2_10
#define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3 #define LCD_PINS_D4 _EXP2_09
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2 #define DOGLCD_A0 _EXP2_08
#if IS_RRW_KEYPAD #if IS_RRW_KEYPAD
#define SHIFT_OUT_PIN P0_18 // (51) (MOSI) J3-10 & AUX-3 #define SHIFT_OUT_PIN _EXP2_10
#define SHIFT_CLK_PIN P0_15 // (52) (SCK) J3-9 & AUX-3 #define SHIFT_CLK_PIN _EXP2_09
#define SHIFT_LD_PIN P1_31 // (49) not 5V tolerant J3-1 & AUX-3 #define SHIFT_LD_PIN _EXP2_01
#elif !IS_NEWPANEL #elif !IS_NEWPANEL
//#define SHIFT_OUT_PIN P2_11 // (35) J3-3 & AUX-4 //#define SHIFT_OUT_PIN _EXP2_03
//#define SHIFT_CLK_PIN P3_26 // (31) J3-2 & AUX-4 //#define SHIFT_CLK_PIN _EXP2_02
//#define SHIFT_LD_PIN P3_25 // (33) J3-4 & AUX-4 //#define SHIFT_LD_PIN _EXP2_04
//#define SHIFT_EN_PIN P1_22 // (41) J5-4 & AUX-4 //#define SHIFT_EN_PIN _EXP1_10
#endif #endif
#if ANY(VIKI2, miniVIKI) #if ANY(VIKI2, miniVIKI)
#define BEEPER_PIN P1_30 // (37) may change if cable changes #define BEEPER_PIN P1_30
#define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2 #define DOGLCD_CS P0_26
#define DOGLCD_SCK SD_SCK_PIN #define DOGLCD_SCK SD_SCK_PIN
#define DOGLCD_MOSI SD_MOSI_PIN #define DOGLCD_MOSI SD_MOSI_PIN
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes #define STAT_LED_BLUE_PIN P0_26
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes #define STAT_LED_RED_PIN P1_21
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else #else
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO #define LCD_PINS_D5 P1_17
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER #define LCD_PINS_D6 P1_14
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1 #define LCD_PINS_D7 P1_10
#endif #endif
#define BEEPER_PIN P1_30 // (37) not 5V tolerant #define BEEPER_PIN P1_30
#define DOGLCD_CS P0_16 // (16) #define DOGLCD_CS _EXP2_07
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -183,7 +223,7 @@
#endif #endif
#if ENABLED(MINIPANEL) #if ANY(VIKI2, miniVIKI, MINIPANEL)
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif #endif
@ -199,10 +239,10 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15 #define SD_SCK_PIN _EXP2_09
#define SD_MISO_PIN P0_17 #define SD_MISO_PIN _EXP2_06
#define SD_MOSI_PIN P0_18 #define SD_MOSI_PIN _EXP2_10
#define SD_SS_PIN P1_23 #define SD_SS_PIN _EXP2_05
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_SCK_PIN P0_07 #define SD_SCK_PIN P0_07

4
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View file

@ -87,8 +87,8 @@
#endif #endif
// LED driving pin // LED driving pin
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN P1_24 #define BOARD_NEOPIXEL_PIN P1_24
#endif #endif
// //

114
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
View file

@ -158,6 +158,37 @@
#define SPINDLE_DIR_PIN P2_06 // FET 4 #define SPINDLE_DIR_PIN P2_06 // FET 4
#endif #endif
/** ------ ------
* (BEEPER) 1.31 | 1 2 | 1.30 (BTN_ENC) (MISO) 0.8 | 1 2 | 0.7 (SD_SCK)
* (EN) 0.18 | 3 4 | 0.16 (RS) (EN1) 3.26 | 3 4 | 0.28 (SD_CS2)
* (D4) 0.15 5 6 | -- (EN2) 3.25 5 6 | 0.9 (SD_MOSI)
* -- | 7 8 | 0.27 (D7) (SD_DET) 0.27 | 7 8 | 2.11
* 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 EXP1_06_PIN -1
#define EXP1_07_PIN -1
#define EXP1_08_PIN P0_27 // (also on EXP2-7)
#define EXP1_09_PIN -1
#define EXP1_10_PIN -1
#define EXP2_01_PIN P0_08
#define EXP2_02_PIN P0_07
#define EXP2_03_PIN P3_26
#define EXP2_04_PIN P0_28
#define EXP2_05_PIN P3_25
#define EXP2_06_PIN P0_09
#define EXP2_07_PIN P0_27 // (also on EXP1-8)
#define EXP2_08_PIN P2_11
#define EXP2_09_PIN -1
#define EXP2_10_PIN -1
// //
// LCD / Controller // LCD / Controller
// //
@ -171,54 +202,54 @@
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define FORCE_SOFT_SPI // REQUIRED - results in LCD soft SPI mode 3 #define FORCE_SOFT_SPI // REQUIRED. Results in LCD Software SPI mode 3
#define BEEPER_PIN P1_31 // EXP1-1 #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC P1_30 // EXP1-2 #define BTN_ENC EXP1_02_PIN
#define DOGLCD_CS P0_18 // EXP1-3 #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 P0_16 // EXP1-4 #define DOGLCD_A0 EXP1_04_PIN
#define LCD_RESET_PIN P0_15 // EXP1-5 #define LCD_RESET_PIN EXP1_05_PIN
// A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated // A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
// to the onboard SD card. All required EXP2 signals come from the Ethernet connector. Pin 1 of this // to the onboard SD card. All required EXP2 signals come from the Ethernet connector. Pin 1 of this
// connector is the one nearest the motor power connector. // connector is the one nearest the motor power connector.
#define DOGLCD_SCK P1_17 // EXP2-2 => Ethernet pin 5 (bottom, 3 from left) #define DOGLCD_SCK P1_17 // LCD2-2 => Ethernet pin 5 (bottom, 3 from left)
#define BTN_EN2 P1_09 // EXP2-3 => Ethernet pin 9 (bottom, 5 from left) #define BTN_EN2 P1_09 // LCD2-3 => Ethernet pin 9 (bottom, 5 from left)
#define BTN_EN1 P1_04 // EXP2-5 => Ethernet pin 11 (bottom, 6 from left) #define BTN_EN1 P1_04 // LCD2-5 => Ethernet pin 11 (bottom, 6 from left)
#define DOGLCD_MOSI P1_01 // EXP2-6 => Ethernet pin 13 (bottom, 7 from left) #define DOGLCD_MOSI P1_01 // LCD2-6 => Ethernet pin 13 (bottom, 7 from left)
// A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10 // A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
// on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector. // on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
// Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB. // Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
#if ANY(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 #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left) #define RGB_LED_R_PIN P1_16 // LCD1-6 => Ethernet pin 6 (top row, 3 from left)
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_10 // EXP1-7 => Ethernet pin 10 (top row, 5 from left) #define RGB_LED_G_PIN P1_10 // LCD1-7 => Ethernet pin 10 (top row, 5 from left)
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_00 // EXP1-8 => Ethernet pin 12 (top row, 6 from left) #define RGB_LED_B_PIN P1_00 // LCD1-8 => Ethernet pin 12 (top row, 6 from left)
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left) #define NEOPIXEL_PIN P1_16 // LCD1-6 => Ethernet pin 6 (top row, 3 from left)
#endif #endif
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1 #define BEEPER_PIN EXP1_01_PIN
//#define SD_DETECT_PIN P0_27 // EXP2-7 //#define SD_DETECT_PIN EXP2_07_PIN
#define BTN_EN1 P3_26 // EXP2-5 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 P3_25 // EXP2-3 #define BTN_EN2 EXP2_05_PIN
#define BTN_ENC P1_30 // EXP1-2 #define BTN_ENC EXP1_02_PIN
#define LCD_PINS_RS P0_16 // EXP1-4 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_SDSS P0_28 // EXP2-4 #define LCD_SDSS EXP2_04_PIN
#define LCD_PINS_EN P0_18 // EXP1-3 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 P0_15 // EXP1-5 #define LCD_PINS_D4 EXP1_05_PIN
#define KILL_PIN P2_11 // EXP2-10 #define KILL_PIN EXP2_08_PIN
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
@ -230,11 +261,11 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
#define SD_SCK_PIN P0_07 // (52) system defined J3-9 & AUX-3 #define SD_SCK_PIN EXP2_02_PIN // (52) System-defined J3-9 & AUX-3
#define SD_MISO_PIN P0_08 // (50) system defined J3-10 & AUX-3 #define SD_MISO_PIN EXP2_01_PIN // (50) System-defined J3-10 & AUX-3
#define SD_MOSI_PIN P0_09 // (51) system defined J3-10 & AUX-3 #define SD_MOSI_PIN EXP2_06_PIN // (51) System-defined J3-10 & AUX-3
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin #define SD_SS_PIN P1_23 // (53) System-defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
#else #else
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card #define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
@ -257,30 +288,3 @@
//#define ENET_TX_EN P1_04 // Ethernet pin 11 (bottom, 6 from left) //#define ENET_TX_EN P1_04 // Ethernet pin 11 (bottom, 6 from left)
//#define ENET_TXD0 P1_00 // Ethernet pin 12 (top row, 6 from left) //#define ENET_TXD0 P1_00 // Ethernet pin 12 (top row, 6 from left)
//#define ENET_TXD1 P1_01 // Ethernet pin 13 (bottom, 7 from left) //#define ENET_TXD1 P1_01 // Ethernet pin 13 (bottom, 7 from left)
/**
* EXP1 pins
* 1 - P1_31
* 2 - P1_30
* 3 - P0_18
* 4 - P0_16
* 5 - P0_15
* 6 - N/C
* 7 - N/C
* 8 - P0_27 (also on EXP2-7)
* 9 - GND
* 10 - +5V
*
*
* EXP2 pins
* 1 - P0_08
* 2 - P0_07
* 3 - P3_26
* 4 - P0_28
* 5 - P3_25
* 6 - P0_09
* 7 - P0_27 (also on EXP1_8)
* 8 - P2_11
* 9 - GND
* 10 - N/C
*/

3
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
View file

@ -436,6 +436,9 @@
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
//
// SD Card
//
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif

48
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View file

@ -129,31 +129,59 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 53 #define SDSS MINI_06
#define LED_PIN 13 #define LED_PIN 13
#ifndef CASE_LIGHT_PIN #ifndef CASE_LIGHT_PIN
#define CASE_LIGHT_PIN 2 #define CASE_LIGHT_PIN 2
#endif #endif
/**
* MegaController LCD/SD Connector
*
* SDD MOSI SDSS -- RESET -- LCDSS A0 KILL ENC
* 49 51 53 | 45 47 12 10
* PL0 PB2 PB0 | PL4 PL2 PB6 PB4
* ----------------------------------------------------------
* | 2 4 6 8 10 12 14 16 18 20 |
* | 1 3 5 7 9 11 13 15 17 19 |
* ----------------------------------------------------------
* | PB3 PB1 | | PL5 PL3 PL1 PB5
* | 50 52 | | 44 46 48 11
* 5V MISO SCK GND 3V3 -- BL BEEP EN1 EN2
*/
#define MINI_02 49 // SD_DETECT
#define MINI_03 50 // MISO
#define MINI_04 51 // MOSI
#define MINI_05 52 // SCK
#define MINI_06 53 // SDSS
#define MINI_13 44 // BACKLIGHT
#define MINI_14 45 // LCDSS
#define MINI_15 46 // BEEP
#define MINI_16 47 // A0
#define MINI_17 48 // EN1
#define MINI_18 12 // KILL
#define MINI_19 11 // EN2
#define MINI_20 10 // ENC
// //
// LCD / Controller // LCD / Controller
// //
#if ENABLED(MINIPANEL) #if ENABLED(MINIPANEL)
#define BEEPER_PIN 46 #define BEEPER_PIN MINI_15
#define DOGLCD_A0 47 #define DOGLCD_A0 MINI_16
#define DOGLCD_CS 45 #define DOGLCD_CS MINI_14
#define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3 #define LCD_BACKLIGHT_PIN MINI_13 // backlight LED on PA3
#define KILL_PIN 12 #define KILL_PIN MINI_18
#define BTN_EN1 48 #define BTN_ENC MINI_20
#define BTN_EN2 11 #define BTN_EN1 MINI_17
#define BTN_ENC 10 #define BTN_EN2 MINI_19
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN MINI_02
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270

63
Marlin/src/pins/mega/pins_PICA.h
View file

@ -43,15 +43,6 @@
#define BOARD_INFO_NAME "PICA" #define BOARD_INFO_NAME "PICA"
#endif #endif
/*
// Note that these are the "pins" that correspond to the analog inputs on the arduino mega.
// These are not the same as the physical pin numbers
AD0 = 54; AD1 = 55; AD2 = 56; AD3 = 57;
AD4 = 58; AD5 = 59; AD6 = 60; AD7 = 61;
AD8 = 62; AD9 = 63; AD10 = 64; AD11 = 65;
AD12 = 66; AD13 = 67; AD14 = 68; AD15 = 69;
*/
// //
// Servos // Servos
// //
@ -136,25 +127,53 @@
// //
// SD Support // SD Support
// //
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#define SDSS 53 #define SDSS EXP2_04_PIN
/** PICA Expansion Headers
* ------ ------
* (BEEP) 29 | 1 2 | 31 (ENC) (MISO) 50 | 1 2 | 52 (SCK)
* (LCD_EN) 30 | 3 4 | 33 (LCD_RS) (EN1) 47 | 3 4 | 53 (SDSS)
* (LCD_D4) 35 5 6 | 32 (LCD_D5) (EN2) 48 5 6 | 51 (MOSI)
* (LCD_D6) 37 | 7 8 | 36 (LCD_D7) (SDDET) 49 | 7 8 | 41 (KILL)
* GND | 9 10 | 5V -- | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN 29 // BEEPER
#define EXP1_02_PIN 31 // ENC
#define EXP1_03_PIN 30 // LCD_EN
#define EXP1_04_PIN 33 // LCD_RS
#define EXP1_05_PIN 35 // LCD_D4
#define EXP1_06_PIN 32 // LCD_D5
#define EXP1_07_PIN 37 // LCD_D6
#define EXP1_08_PIN 36 // LCD_D7
#define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 47 // EN1
#define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 48 // EN2
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 // SDDET
#define EXP2_08_PIN 41 // KILL
// //
// LCD / Controller // LCD / Controller
// //
#define BEEPER_PIN 29 #define BEEPER_PIN EXP1_01_PIN
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#define LCD_PINS_RS 33 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN 30 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 35 #define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 32 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 37 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 36 #define LCD_PINS_D7 EXP1_08_PIN
#define BTN_EN1 47 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 48 #define BTN_EN2 EXP2_05_PIN
#define BTN_ENC 31 #define BTN_ENC EXP1_02_PIN
#define LCD_SDSS 53 #define LCD_SDSS EXP2_04_PIN
#endif #endif

5
Marlin/src/pins/pins.h
View file

@ -1053,6 +1053,11 @@
#endif #endif
//
// LCD / Controller Pins based on board expansion headers with adapters
//
#include "pins_lcd.h"
// //
// Post-process pins according to configured settings // Post-process pins according to configured settings
// //

45
Marlin/src/pins/pins_lcd.h Normal file
View file

@ -0,0 +1,45 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
/**
* pins_lcd.h - Define LCD pins based on the EXP connector / adapter
*/
/**
* Certain displays use LCD_PINS_RS as LCD_RESET_PIN
*/
#if !defined(LCD_RESET_PIN) && ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED, K3D_242_OLED_CONTROLLER)
#define LCD_RESET_PIN LCD_PINS_RS
#endif
/**
* Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
*/
#if HAS_MARLINUI_U8GLIB
#ifndef DOGLCD_SCK
#define DOGLCD_SCK SD_SCK_PIN
#endif
#ifndef DOGLCD_MOSI
#define DOGLCD_MOSI SD_MOSI_PIN
#endif
#endif

9
Marlin/src/pins/pins_postprocess.h
View file

@ -1723,3 +1723,12 @@
#undef DIAG_REMAPPED #undef DIAG_REMAPPED
#undef _E_DIAG_EXISTS #undef _E_DIAG_EXISTS
#undef E_DIAG_EXISTS #undef E_DIAG_EXISTS
// Get a NeoPixel pin from the LCD or board, if provided
#ifndef NEOPIXEL_PIN
#ifdef LCD_NEOPIXEL_PIN
#define NEOPIXEL_PIN LCD_NEOPIXEL_PIN
#elif defined(BOARD_NEOPIXEL_PIN)
#define NEOPIXEL_PIN BOARD_NEOPIXEL_PIN
#endif
#endif

62
Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View file

@ -169,6 +169,36 @@
#define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78 #define E_MUX2_PIN 78 // 84 in MK2 Firmware, with BEEPER as 78
#endif #endif
//
// EXP Headers
//
#define EXP1_01_PIN 84 // PH2
#define EXP1_02_PIN 9 // PH6
#define EXP1_03_PIN 18 // TX1
#define EXP1_04_PIN 82 // PD5
#define EXP1_05_PIN 19 // RX1
#define EXP1_06_PIN 70 // PG4
#define EXP1_07_PIN 85 // PH7
#define EXP1_08_PIN 71 // PG3
#define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 72 // PJ2
#define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 14 // TX3
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 15 // RX3
#define EXP2_08_PIN -1 // RESET
#define EXP3_01_PIN 62 // PK0 (A8)
#define EXP3_02_PIN 76 // PJ5
#define EXP3_03_PIN 20 // SDA
#define EXP3_04_PIN -1 // GND
#define EXP3_05_PIN 21 // SCL
#define EXP3_06_PIN 16 // RX2
#define EXP3_07_PIN -1 // GND
#define EXP3_08_PIN 17 // TX2
// //
// LCD / Controller // LCD / Controller
// //
@ -179,26 +209,26 @@
#if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE) #if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85 #define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_EN 71 #define LCD_PINS_EN EXP1_08_PIN
#define LCD_PINS_D4 70 #define LCD_PINS_D4 EXP1_06_PIN
#define BTN_EN1 18 #define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 19 #define BTN_EN2 EXP1_05_PIN
#else #else
#define LCD_PINS_RS 82 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN 18 // On 0.6b, use 61 #define LCD_PINS_EN EXP1_03_PIN // On 0.6b, use 61
#define LCD_PINS_D4 19 // On 0.6b, use 59 #define LCD_PINS_D4 EXP1_05_PIN // On 0.6b, use 59
#define LCD_PINS_D5 70 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 85 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 71 #define LCD_PINS_D7 EXP1_08_PIN
#define BTN_EN1 14 #define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 72 #define BTN_EN2 EXP2_03_PIN
#endif #endif
#define BTN_ENC 9 // AUX-2 #define BTN_ENC EXP1_02_PIN // AUX-2
#define BEEPER_PIN 84 // AUX-4 #define BEEPER_PIN EXP1_01_PIN // AUX-4
#define SD_DETECT_PIN 15 #define SD_DETECT_PIN EXP2_07_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder

98
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View file

@ -192,7 +192,7 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 53 #define SDSS EXP2_04_PIN
#define LED_PIN 13 #define LED_PIN 13
#define KILL_PIN 41 #define KILL_PIN 41
@ -201,80 +201,98 @@
#endif #endif
/** /**
* ----- ----- * ------ ------
* 5V/D41 | · · | GND 5V | · · | GND * (BEEPER) D37 | 1 2 | D35 (BTN_ENC) (MISO) D50 | 1 2 | D52 (SCK)
* RESET | · · | D49 (SD_DETECT) (LCD_D7) D29 | · · | D27 (LCD_D6) * (LCD_EN) D17 | 3 4 | D16 (LCD_RS) (BTN_EN1) D31 | 3 4 | D53 (SD_SS)
* (MOSI) D51 | · · D33 (BTN_EN2) (LCD_D5) D25 | · · D23 (LCD_D4) * (LCD_D4) D23 5 6 | D25 (LCD_D5) (BTN_EN2) D33 5 6 | D51 (MOSI)
* (SD_SS) D53 | · · | D31 (BTN_EN1) (LCD_RS) D16 | · · | D17 (LCD_EN) * (LCD_D6) D27 | 7 8 | D29 (LCD_D7) (SD_DETECT) D49 | 7 8 | RESET
* (SCK) D52 | · · | D50 (MISO) (BTN_ENC) D35 | · · | D37 (BEEPER) * GND | 9 10 | 5V GND | 9 10 | 5V / D41
* ----- ----- * ------ ------
* EXP2 EXP1 * EXP1 EXP2
*/ */
#define EXP1_01_PIN 37 // BEEPER
#define EXP1_02_PIN 35 // ENC
#define EXP1_03_PIN 17 // LCD_EN
#define EXP1_04_PIN 16 // LCD_RS
#define EXP1_05_PIN 23 // LCD_D4
#define EXP1_06_PIN 25 // LCD_D5
#define EXP1_07_PIN 27 // LCD_D6
#define EXP1_08_PIN 29 // LCD_D7
#define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 31 // EN1
#define EXP2_04_PIN 53 // SD_SS
#define EXP2_05_PIN 33 // EN2
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 // SD_DETECT
#define EXP2_08_PIN -1 // RESET
// //
// LCDs and Controllers // LCDs and Controllers
// //
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#if ENABLED(FYSETC_242_OLED_12864) #if ENABLED(FYSETC_242_OLED_12864)
#define BTN_EN1 37 #define BTN_EN1 EXP1_01_PIN
#define BTN_EN2 29 #define BTN_EN2 EXP1_08_PIN
#define BTN_ENC 35 #define BTN_ENC EXP1_02_PIN
#define BEEPER_PIN 31 #define BEEPER_PIN EXP2_03_PIN
#define LCD_PINS_DC 25 #define LCD_PINS_DC EXP1_06_PIN
#define LCD_PINS_RS 33 #define LCD_PINS_RS EXP2_05_PIN
#define DOGLCD_CS 16 #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_MOSI 23 #define DOGLCD_MOSI EXP1_05_PIN
#define DOGLCD_SCK 17 #define DOGLCD_SCK EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC #define DOGLCD_A0 LCD_PINS_DC
#undef KILL_PIN #undef KILL_PIN
#define NEOPIXEL_PIN 27 #define BOARD_NEOPIXEL_PIN EXP1_07_PIN
#else #else
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
// //
// See https://wiki.fysetc.com/Mini12864_Panel/ // See https://wiki.fysetc.com/Mini12864_Panel/
// //
#define DOGLCD_A0 16 #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS 17 #define DOGLCD_CS EXP1_03_PIN
#if ENABLED(FYSETC_GENERIC_12864_1_1) #if ENABLED(FYSETC_GENERIC_12864_1_1)
#define LCD_BACKLIGHT_PIN 27 #define LCD_BACKLIGHT_PIN EXP1_07_PIN
#endif #endif
#define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
// Seems to work best if left open. // Seems to work best if left open.
#if ANY(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 #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 25 #define RGB_LED_R_PIN EXP1_06_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 27 #define RGB_LED_G_PIN EXP1_07_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN 29 #define RGB_LED_B_PIN EXP1_08_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN 25 #define NEOPIXEL_PIN EXP1_06_PIN
#endif #endif
#elif HAS_MARLINUI_U8GLIB || HAS_MARLINUI_HD44780 #elif HAS_MARLINUI_U8GLIB || HAS_MARLINUI_HD44780
#define LCD_PINS_RS 16 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN 17 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 23 #define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 25 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 27 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 29 #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS 25 #define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_A0 27 #define DOGLCD_A0 EXP1_07_PIN
#endif #endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
@ -284,9 +302,9 @@
#endif #endif
#if IS_NEWPANEL #if IS_NEWPANEL
#define BTN_EN1 31 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_05_PIN
#define BTN_ENC 35 #define BTN_ENC EXP1_02_PIN
#endif #endif
#endif #endif

284
Marlin/src/pins/ramps/pins_RAMPS.h
View file

@ -142,18 +142,18 @@
// //
// Steppers // Steppers
// //
#define X_STEP_PIN 54 #define X_STEP_PIN 54 // (A0)
#define X_DIR_PIN 55 #define X_DIR_PIN 55 // (A1)
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
#ifndef X_CS_PIN #ifndef X_CS_PIN
#define X_CS_PIN 53 #define X_CS_PIN AUX3_06
#endif #endif
#define Y_STEP_PIN 60 #define Y_STEP_PIN 60
#define Y_DIR_PIN 61 #define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56 #define Y_ENABLE_PIN 56 // (A2)
#ifndef Y_CS_PIN #ifndef Y_CS_PIN
#define Y_CS_PIN 49 #define Y_CS_PIN AUX3_02
#endif #endif
#ifndef Z_STEP_PIN #ifndef Z_STEP_PIN
@ -166,7 +166,7 @@
#define Z_ENABLE_PIN 62 #define Z_ENABLE_PIN 62
#endif #endif
#ifndef Z_CS_PIN #ifndef Z_CS_PIN
#define Z_CS_PIN 40 #define Z_CS_PIN AUX2_06
#endif #endif
#ifndef E0_STEP_PIN #ifndef E0_STEP_PIN
@ -179,7 +179,7 @@
#define E0_ENABLE_PIN 24 #define E0_ENABLE_PIN 24
#endif #endif
#ifndef E0_CS_PIN #ifndef E0_CS_PIN
#define E0_CS_PIN 42 #define E0_CS_PIN AUX2_08
#endif #endif
#ifndef E1_STEP_PIN #ifndef E1_STEP_PIN
@ -192,7 +192,7 @@
#define E1_ENABLE_PIN 30 #define E1_ENABLE_PIN 30
#endif #endif
#ifndef E1_CS_PIN #ifndef E1_CS_PIN
#define E1_CS_PIN 44 #define E1_CS_PIN AUX2_07
#endif #endif
// //
@ -212,7 +212,7 @@
// SPI for MAX Thermocouple // SPI for MAX Thermocouple
// //
#ifndef TEMP_0_CS_PIN #ifndef TEMP_0_CS_PIN
#define TEMP_0_CS_PIN 66 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN) #define TEMP_0_CS_PIN AUX2_09 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
#endif #endif
// //
@ -273,12 +273,12 @@
// Misc. Functions // Misc. Functions
// //
#ifndef SDSS #ifndef SDSS
#define SDSS AUX3_06_PIN #define SDSS AUX3_06
#endif #endif
#define LED_PIN 13 #define LED_PIN 13
#ifndef FILWIDTH_PIN #ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 5 // Analog Input on AUX2 #define FILWIDTH_PIN 5 // (A5) Analog Input AUX2_03
#endif #endif
// RAMPS 1.4 DIO 4 on the servos connector // RAMPS 1.4 DIO 4 on the servos connector
@ -294,7 +294,7 @@
#if NUM_SERVOS <= 1 // Prefer the servo connector #if NUM_SERVOS <= 1 // Prefer the servo connector
#define CASE_LIGHT_PIN 6 // Hardware PWM #define CASE_LIGHT_PIN 6 // Hardware PWM
#elif HAS_FREE_AUX2_PINS #elif HAS_FREE_AUX2_PINS
#define CASE_LIGHT_PIN 44 // Hardware PWM #define CASE_LIGHT_PIN AUX2_07 // Hardware PWM
#endif #endif
#endif #endif
@ -303,15 +303,15 @@
// //
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN) #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS < 2 // Use servo connector if possible #if NUM_SERVOS < 2 // Use servo connector if possible
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#ifndef SPINDLE_LASER_PWM_PIN #ifndef SPINDLE_LASER_PWM_PIN
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM #define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#endif #endif
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 5 #define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS #elif HAS_FREE_AUX2_PINS
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM #define SPINDLE_LASER_PWM_PIN AUX2_07 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown! #define SPINDLE_LASER_ENA_PIN AUX2_06 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 65 #define SPINDLE_DIR_PIN AUX2_10
#else #else
#error "No auto-assignable Spindle/Laser pins available." #error "No auto-assignable Spindle/Laser pins available."
#endif #endif
@ -322,13 +322,13 @@
// //
#if HAS_TMC_SPI #if HAS_TMC_SPI
#ifndef TMC_SPI_MOSI #ifndef TMC_SPI_MOSI
#define TMC_SPI_MOSI 66 #define TMC_SPI_MOSI AUX2_09
#endif #endif
#ifndef TMC_SPI_MISO #ifndef TMC_SPI_MISO
#define TMC_SPI_MISO 44 #define TMC_SPI_MISO AUX2_07
#endif #endif
#ifndef TMC_SPI_SCK #ifndef TMC_SPI_SCK
#define TMC_SPI_SCK 64 #define TMC_SPI_SCK AUX2_05
#endif #endif
#endif #endif
@ -356,10 +356,10 @@
//#define E4_HARDWARE_SERIAL Serial1 //#define E4_HARDWARE_SERIAL Serial1
#ifndef X_SERIAL_TX_PIN #ifndef X_SERIAL_TX_PIN
#define X_SERIAL_TX_PIN 40 #define X_SERIAL_TX_PIN AUX2_06
#endif #endif
#ifndef X_SERIAL_RX_PIN #ifndef X_SERIAL_RX_PIN
#define X_SERIAL_RX_PIN 63 #define X_SERIAL_RX_PIN AUX2_04
#endif #endif
#ifndef X2_SERIAL_TX_PIN #ifndef X2_SERIAL_TX_PIN
#define X2_SERIAL_TX_PIN -1 #define X2_SERIAL_TX_PIN -1
@ -369,10 +369,10 @@
#endif #endif
#ifndef Y_SERIAL_TX_PIN #ifndef Y_SERIAL_TX_PIN
#define Y_SERIAL_TX_PIN 59 #define Y_SERIAL_TX_PIN AUX2_03
#endif #endif
#ifndef Y_SERIAL_RX_PIN #ifndef Y_SERIAL_RX_PIN
#define Y_SERIAL_RX_PIN 64 #define Y_SERIAL_RX_PIN AUX2_05
#endif #endif
#ifndef Y2_SERIAL_TX_PIN #ifndef Y2_SERIAL_TX_PIN
#define Y2_SERIAL_TX_PIN -1 #define Y2_SERIAL_TX_PIN -1
@ -382,10 +382,10 @@
#endif #endif
#ifndef Z_SERIAL_TX_PIN #ifndef Z_SERIAL_TX_PIN
#define Z_SERIAL_TX_PIN 42 #define Z_SERIAL_TX_PIN AUX2_08
#endif #endif
#ifndef Z_SERIAL_RX_PIN #ifndef Z_SERIAL_RX_PIN
#define Z_SERIAL_RX_PIN 65 #define Z_SERIAL_RX_PIN AUX2_10
#endif #endif
#ifndef Z2_SERIAL_TX_PIN #ifndef Z2_SERIAL_TX_PIN
#define Z2_SERIAL_TX_PIN -1 #define Z2_SERIAL_TX_PIN -1
@ -395,10 +395,10 @@
#endif #endif
#ifndef E0_SERIAL_TX_PIN #ifndef E0_SERIAL_TX_PIN
#define E0_SERIAL_TX_PIN 44 #define E0_SERIAL_TX_PIN AUX2_07
#endif #endif
#ifndef E0_SERIAL_RX_PIN #ifndef E0_SERIAL_RX_PIN
#define E0_SERIAL_RX_PIN 66 #define E0_SERIAL_RX_PIN AUX2_09
#endif #endif
#ifndef E1_SERIAL_TX_PIN #ifndef E1_SERIAL_TX_PIN
#define E1_SERIAL_TX_PIN -1 #define E1_SERIAL_TX_PIN -1
@ -449,13 +449,13 @@
// //
#if HAS_PRUSA_MMU1 #if HAS_PRUSA_MMU1
#ifndef E_MUX0_PIN #ifndef E_MUX0_PIN
#define E_MUX0_PIN 40 // Z_CS_PIN #define E_MUX0_PIN AUX2_06 // Z_CS_PIN
#endif #endif
#ifndef E_MUX1_PIN #ifndef E_MUX1_PIN
#define E_MUX1_PIN 42 // E0_CS_PIN #define E_MUX1_PIN AUX2_08 // E0_CS_PIN
#endif #endif
#ifndef E_MUX2_PIN #ifndef E_MUX2_PIN
#define E_MUX2_PIN 44 // E1_CS_PIN #define E_MUX2_PIN AUX2_07 // E1_CS_PIN
#endif #endif
#endif #endif
@ -465,10 +465,10 @@
// 1 3 5 7 // 1 3 5 7
// 5V GND A3 A4 // 5V GND A3 A4
// //
#define AUX1_05_PIN 57 // (A3) #define AUX1_05 57 // (A3)
#define AUX1_06_PIN 2 #define AUX1_06 2
#define AUX1_07_PIN 58 // (A4) #define AUX1_07 58 // (A4)
#define AUX1_08_PIN 1 #define AUX1_08 1
// //
// AUX2 GND A9 D40 D42 A11 // AUX2 GND A9 D40 D42 A11
@ -476,14 +476,14 @@
// 1 3 5 7 9 // 1 3 5 7 9
// VCC A5 A10 D44 A12 // VCC A5 A10 D44 A12
// //
#define AUX2_03_PIN 59 // (A5) #define AUX2_03 59 // (A5)
#define AUX2_04_PIN 63 // (A9) #define AUX2_04 63 // (A9)
#define AUX2_05_PIN 64 // (A10) #define AUX2_05 64 // (A10)
#define AUX2_06_PIN 40 #define AUX2_06 40
#define AUX2_07_PIN 44 #define AUX2_07 44
#define AUX2_08_PIN 42 #define AUX2_08 42
#define AUX2_09_PIN 66 // (A12) #define AUX2_09 66 // (A12)
#define AUX2_10_PIN 65 // (A11) #define AUX2_10 65 // (A11)
// //
// AUX3 GND D52 D50 5V // AUX3 GND D52 D50 5V
@ -491,31 +491,31 @@
// 8 6 4 2 // 8 6 4 2
// NC D53 D51 D49 // NC D53 D51 D49
// //
#define AUX3_02_PIN 49 #define AUX3_02 49
#define AUX3_03_PIN 50 #define AUX3_03 50
#define AUX3_04_PIN 51 #define AUX3_04 51
#define AUX3_05_PIN 52 #define AUX3_05 52
#define AUX3_06_PIN 53 #define AUX3_06 53
// //
// AUX4 5V GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16 // AUX4 5V GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16
// //
#define AUX4_03_PIN 32 #define AUX4_03 32
#define AUX4_04_PIN 47 #define AUX4_04 47
#define AUX4_05_PIN 45 #define AUX4_05 45
#define AUX4_06_PIN 43 #define AUX4_06 43
#define AUX4_07_PIN 41 #define AUX4_07 41
#define AUX4_08_PIN 39 #define AUX4_08 39
#define AUX4_09_PIN 37 #define AUX4_09 37
#define AUX4_10_PIN 35 #define AUX4_10 35
#define AUX4_11_PIN 33 #define AUX4_11 33
#define AUX4_12_PIN 31 #define AUX4_12 31
#define AUX4_13_PIN 29 #define AUX4_13 29
#define AUX4_14_PIN 27 #define AUX4_14 27
#define AUX4_15_PIN 25 #define AUX4_15 25
#define AUX4_16_PIN 23 #define AUX4_16 23
#define AUX4_17_PIN 17 #define AUX4_17 17
#define AUX4_18_PIN 16 #define AUX4_18 16
/** /**
* LCD adapters come in different variants. The socket keys can be * LCD adapters come in different variants. The socket keys can be
@ -523,60 +523,60 @@
*/ */
#ifndef EXP1_08_PIN #ifndef EXP1_08_PIN
#define EXP1_03_PIN AUX4_17_PIN #define EXP1_03_PIN AUX4_17 // 17
#define EXP1_04_PIN AUX4_18_PIN #define EXP1_04_PIN AUX4_18 // 16
#define EXP1_05_PIN AUX4_16_PIN #define EXP1_05_PIN AUX4_16 // 23
#define EXP1_06_PIN AUX4_15_PIN #define EXP1_06_PIN AUX4_15 // 25
#define EXP1_07_PIN AUX4_14_PIN #define EXP1_07_PIN AUX4_14 // 27
#define EXP1_08_PIN AUX4_13_PIN #define EXP1_08_PIN AUX4_13 // 29
#define EXP2_01_PIN AUX3_03_PIN #define EXP2_01_PIN AUX3_03 // 50 (MISO)
#define EXP2_02_PIN AUX3_05_PIN #define EXP2_02_PIN AUX3_05 // 52
#define EXP2_04_PIN AUX3_06_PIN #define EXP2_04_PIN AUX3_06 // 53
#define EXP2_06_PIN AUX3_04_PIN #define EXP2_06_PIN AUX3_04 // 51
#define EXP2_07_PIN AUX3_02_PIN #define EXP2_07_PIN AUX3_02 // 49
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
/** Gadgets3D Smart Adapter /** Gadgets3D Smart Adapter
* ------ ------ * ------ ------
* 4-11 | 1 2 | 4-12 (MISO) 3-03 | 1 2 | 3-05 (SCK) * 33 4-11 | 1 2 | 4-12 31 (MISO) 50 3-03 | 1 2 | 3-05 52 (SCK)
* 4-17 | 3 4 | 4-18 4-10 | 3 4 | 3-06 * 17 4-17 | 3 4 | 4-18 16 35 4-10 | 3 4 | 3-06 53
* 4-16 5 6 | 4-15 4-09 5 6 | 3-04 (MOSI) * 23 4-16 5 6 | 4-15 25 37 4-09 5 6 | 3-04 51 (MOSI)
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07 * 27 4-14 | 7 8 | 4-13 29 49 3-02 | 7 8 | 4-07 41
* (GND) 4-02 | 9 10 | 4-01 (5V) -- | 9 10 | -- * (GND) 4-02 | 9 10 | 4-01 (5V) -- | 9 10 | --
* ------ ------ * ------ ------
* EXP1 EXP2 * EXP1 EXP2
*/ */
#define EXP1_01_PIN AUX4_11_PIN #define EXP1_01_PIN AUX4_11 // 33
#define EXP1_02_PIN AUX4_12_PIN #define EXP1_02_PIN AUX4_12 // 31
#define EXP2_03_PIN AUX4_10_PIN #define EXP2_03_PIN AUX4_10 // 35
#define EXP2_05_PIN AUX4_09_PIN #define EXP2_05_PIN AUX4_09 // 37
#define EXP2_08_PIN AUX4_07_PIN #define EXP2_08_PIN AUX4_07 // 41
#else #else
/** Smart Adapter (c) RRD /** Smart Adapter (c) RRD
* ------ ------ * ------ ------
* 4-09 | 1 2 | 4-10 (MISO) 3-03 | 1 2 | 3-05 (SCK) * 37 4-09 | 1 2 | 4-10 (MISO) 3-03 | 1 2 | 3-05 52 (SCK)
* 4-17 | 3 4 | 4-18 4-12 | 3 4 | 3-06 * 17 4-17 | 3 4 | 4-18 31 4-12 | 3 4 | 3-06 53
* 4-16 5 6 | 4-15 4-11 5 6 | 3-04 (MOSI) * 23 4-16 5 6 | 4-15 33 4-11 5 6 | 3-04 51 (MOSI)
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07 * 27 4-14 | 7 8 | 4-13 49 3-02 | 7 8 | 4-07 41
* (GND) 3-07 | 9 10 | 3-01 (5V) (GND) 3-07 | 9 10 | -- * (GND) 3-07 | 9 10 | 3-01 (5V) (GND) 3-07 | 9 10 | --
* ------ ------ * ------ ------
* EXP1 EXP2 * EXP1 EXP2
*/ */
#define EXP1_01_PIN AUX4_09_PIN #define EXP1_01_PIN AUX4_09 // 37
#define EXP1_02_PIN AUX4_10_PIN #define EXP1_02_PIN AUX4_10 // 35
#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) #if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#define EXP2_03_PIN AUX4_11_PIN #define EXP2_03_PIN AUX4_11 // 33
#define EXP2_05_PIN AUX4_12_PIN #define EXP2_05_PIN AUX4_12 // 31
#define EXP2_08_PIN -1 // RESET #define EXP2_08_PIN -1 // RESET
#else #else
#define EXP2_03_PIN AUX4_12_PIN #define EXP2_03_PIN AUX4_12 // 31
#define EXP2_05_PIN AUX4_11_PIN #define EXP2_05_PIN AUX4_11 // 33
#define EXP2_08_PIN AUX4_07_PIN #define EXP2_08_PIN AUX4_07 // 41
#endif #endif
#endif #endif
@ -587,7 +587,11 @@
// LCDs and Controllers // // LCDs and Controllers //
////////////////////////// //////////////////////////
#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED) #ifdef LCD_PINS_DEFINED
// LCD pins already defined by including header
#elif HAS_WIRED_LCD
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
@ -602,12 +606,12 @@
#elif ALL(IS_NEWPANEL, PANEL_ONE) #elif ALL(IS_NEWPANEL, PANEL_ONE)
#define LCD_PINS_RS AUX2_06_PIN #define LCD_PINS_RS AUX2_06
#define LCD_PINS_EN AUX2_08_PIN #define LCD_PINS_EN AUX2_08
#define LCD_PINS_D4 AUX2_10_PIN #define LCD_PINS_D4 AUX2_10
#define LCD_PINS_D5 AUX2_09_PIN #define LCD_PINS_D5 AUX2_09
#define LCD_PINS_D6 AUX2_07_PIN #define LCD_PINS_D6 AUX2_07
#define LCD_PINS_D7 AUX2_05_PIN #define LCD_PINS_D7 AUX2_05
#elif ENABLED(TFTGLCD_PANEL_SPI) #elif ENABLED(TFTGLCD_PANEL_SPI)
@ -631,12 +635,12 @@
#error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif #endif
#define LCD_PINS_RS AUX2_05_PIN #define LCD_PINS_RS AUX2_05
#define LCD_PINS_EN AUX2_07_PIN #define LCD_PINS_EN AUX2_07
#define LCD_PINS_D4 AUX2_04_PIN #define LCD_PINS_D4 AUX2_04
#define LCD_PINS_D5 AUX2_06_PIN #define LCD_PINS_D5 AUX2_06
#define LCD_PINS_D6 AUX2_08_PIN #define LCD_PINS_D6 AUX2_08
#define LCD_PINS_D7 AUX2_10_PIN #define LCD_PINS_D7 AUX2_10
#elif ENABLED(AZSMZ_12864) #elif ENABLED(AZSMZ_12864)
@ -672,8 +676,8 @@
// Buttons attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK_PIN 38 //#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN AUX2_08_PIN //#define SHIFT_LD_PIN AUX2_08
//#define SHIFT_OUT_PIN AUX2_06_PIN //#define SHIFT_OUT_PIN AUX2_06
//#define SHIFT_EN_PIN EXP1_03_PIN //#define SHIFT_EN_PIN EXP1_03_PIN
#endif #endif
@ -707,30 +711,30 @@
#endif #endif
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
#define LCD_BACKLIGHT_PIN AUX4_08_PIN #define LCD_BACKLIGHT_PIN AUX4_08
#endif #endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define BTN_EN1 AUX2_05_PIN #define BTN_EN1 AUX2_05
#define BTN_EN2 AUX2_03_PIN #define BTN_EN2 AUX2_03
#define BTN_ENC AUX2_04_PIN #define BTN_ENC AUX2_04
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX2_08_PIN #define SD_DETECT_PIN AUX2_08
#endif #endif
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 AUX4_04_PIN #define BTN_EN1 AUX4_04
#define BTN_EN2 AUX4_06_PIN #define BTN_EN2 AUX4_06
#define BTN_ENC AUX4_03_PIN #define BTN_ENC AUX4_03
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
#define KILL_PIN EXP2_08_PIN #define KILL_PIN EXP2_08_PIN
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 AUX2_06_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08. #define BTN_EN1 AUX2_06 // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08.
#define BTN_EN2 AUX2_08_PIN #define BTN_EN2 AUX2_08
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
@ -740,19 +744,19 @@
#elif ANY(VIKI2, miniVIKI) #elif ANY(VIKI2, miniVIKI)
#define DOGLCD_CS AUX4_05_PIN #define DOGLCD_CS AUX4_05
#define DOGLCD_A0 AUX2_07_PIN #define DOGLCD_A0 AUX2_07
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 #define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_05_PIN #define BEEPER_PIN EXP2_05_PIN
#endif #endif
#define STAT_LED_RED_PIN AUX4_03_PIN #define STAT_LED_RED_PIN AUX4_03
#define STAT_LED_BLUE_PIN EXP1_02_PIN #define STAT_LED_BLUE_PIN EXP1_02_PIN
#define BTN_EN1 22 #define BTN_EN1 22
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC AUX4_08_PIN #define BTN_ENC AUX4_08
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
@ -837,19 +841,19 @@
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
#define BEEPER_PIN AUX2_08_PIN #define BEEPER_PIN AUX2_08_PIN
#endif #endif
#define LCD_BACKLIGHT_PIN AUX2_10_PIN #define LCD_BACKLIGHT_PIN AUX2_10
#define DOGLCD_A0 AUX2_07_PIN #define DOGLCD_A0 AUX2_07
#define DOGLCD_CS AUX2_09_PIN #define DOGLCD_CS AUX2_09
#define BTN_EN1 AUX2_06_PIN #define BTN_EN1 AUX2_06
#define BTN_EN2 AUX2_04_PIN #define BTN_EN2 AUX2_04
#define BTN_ENC AUX2_03_PIN #define BTN_ENC AUX2_03
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX3_02_PIN #define SD_DETECT_PIN AUX3_02
#endif #endif
#define KILL_PIN AUX2_05_PIN #define KILL_PIN AUX2_05
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
@ -883,9 +887,9 @@
#endif #endif
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2 #if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
#define BTN_EN1 AUX2_03_PIN #define BTN_EN1 AUX2_03
#define BTN_EN2 AUX2_04_PIN #define BTN_EN2 AUX2_04
#define BTN_ENC AUX3_02_PIN #define BTN_ENC AUX3_02
#else #else
#define BTN_EN1 EXP1_01_PIN #define BTN_EN1 EXP1_01_PIN
#define BTN_EN2 EXP1_02_PIN #define BTN_EN2 EXP1_02_PIN
@ -902,17 +906,17 @@
#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED #endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS #if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT_PIN AUX2_06_PIN #define SHIFT_OUT_PIN AUX2_06
#define SHIFT_CLK_PIN AUX2_07_PIN #define SHIFT_CLK_PIN AUX2_07
#define SHIFT_LD_PIN AUX2_08_PIN #define SHIFT_LD_PIN AUX2_08
#ifndef BTN_EN1 #ifndef BTN_EN1
#define BTN_EN1 AUX2_05_PIN #define BTN_EN1 AUX2_05
#endif #endif
#ifndef BTN_EN2 #ifndef BTN_EN2
#define BTN_EN2 AUX2_03_PIN #define BTN_EN2 AUX2_03
#endif #endif
#ifndef BTN_ENC #ifndef BTN_ENC
#define BTN_ENC AUX2_04_PIN #define BTN_ENC AUX2_04
#endif #endif
#endif #endif

42
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View file

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Arduino Mega with RAMPS v1.4Plus, also known as 3DYMY version, pin assignments * Arduino Mega with RAMPS v1.4Plus, aka 3DYMY version
* ATmega2560, ATmega1280 * ATmega2560, ATmega1280
* *
* Applies to the following boards: * Applies to the following boards:
@ -66,30 +66,30 @@
/** 3DYMY Expansion Headers /** 3DYMY Expansion Headers
* ------ ------ * ------ ------
* 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK) * (BEEP) 37 | 1 2 | 35 (ENC) (MISO) 50 | 1 2 | 52 (SCK)
* 31 | 3 4 | 41 29 | 3 4 | 53 * (LCD_EN) 31 | 3 4 | 41 (LCD_RS) (EN1) 29 | 3 4 | 53 (SDSS)
* 33 5 6 | 23 25 5 6 | 51 (MOSI) * (LCD_D4) 33 5 6 | 23 (LCD_D5) (EN2) 25 5 6 | 51 (MOSI)
* 42 | 7 8 | 44 49 | 7 8 | 27 * (LCD_D6) 42 | 7 8 | 44 (LCD_D7) (SD_DET) 49 | 7 8 | 27 (KILL)
* GND | 9 10 | 5V GND | 9 10 | -- * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------ * ------ ------
* EXP1 EXP2 * EXP1 EXP2
*/ */
#define EXP1_01_PIN 37 #define EXP1_01_PIN 37 // BEEPER
#define EXP1_02_PIN 35 #define EXP1_02_PIN 35 // ENC
#define EXP1_03_PIN 31 #define EXP1_03_PIN 31 // LCD_EN
#define EXP1_04_PIN 41 #define EXP1_04_PIN 41 // LCD_RS
#define EXP1_05_PIN 33 #define EXP1_05_PIN 33 // LCD_D4
#define EXP1_06_PIN 23 #define EXP1_06_PIN 23 // LCD_D5
#define EXP1_07_PIN 42 #define EXP1_07_PIN 42 // LCD_D6
#define EXP1_08_PIN 44 #define EXP1_08_PIN 44 // LCD_D7
#define EXP2_01_PIN 50 #define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 #define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 29 #define EXP2_03_PIN 29 // EN1
#define EXP2_04_PIN 53 #define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 25 #define EXP2_05_PIN 25 // EN2
#define EXP2_06_PIN 51 #define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 #define EXP2_07_PIN 49 // SD_DET
#define EXP2_08_PIN 27 #define EXP2_08_PIN 27 // KILL
#include "pins_RAMPS.h" #include "pins_RAMPS.h"

36
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View file

@ -77,31 +77,31 @@
/** Expansion Headers /** Expansion Headers
* ------ ------ * ------ ------
* 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK) * (BEEP) 37 | 1 2 | 35 (ENC) (MISO) 50 | 1 2 | 52 (SCK)
* 17 | 3 4 | 16 31 | 3 4 | 53 * (LCD_EN) 17 | 3 4 | 16 (LCD_RS) (EN1) 31 | 3 4 | 53 (SDSS)
* 23 5 6 | 25 33 5 6 | 51 (MOSI) * (LCD_D4) 23 5 6 | 25 (LCD_D5) (EN2) 33 5 6 | 51 (MOSI)
* 27 | 7 8 | 29 49 | 7 8 | 41 * (LCD_D6) 27 | 7 8 | 29 (LCD_D7) (SD_DET) 49 | 7 8 | 41 (KILL)
* (GND) | 9 10 | (5V) (GND) | 9 10 | RESET * GND | 9 10 | 5V GND | 9 10 | RESET
* ------ ------ * ------ ------
* EXP1 EXP2 * EXP1 EXP2
*/ */
#define EXP1_01_PIN 37 #define EXP1_01_PIN 37 // BEEPER
#define EXP1_02_PIN 35 #define EXP1_02_PIN 35 // ENC
#define EXP1_03_PIN 17 #define EXP1_03_PIN 17 // LCD_EN
#define EXP1_04_PIN 16 #define EXP1_04_PIN 16 // LCD_RS
#define EXP1_05_PIN 23 #define EXP1_05_PIN 23 // LCD_D4
#define EXP1_06_PIN 25 #define EXP1_06_PIN 25 // LCD_D5
#define EXP1_07_PIN 27 #define EXP1_07_PIN 27 // LCD_D6
#define EXP1_08_PIN 29 #define EXP1_08_PIN 29 // LCD_D7
#define EXP2_01_PIN 50 // MISO #define EXP2_01_PIN 50 // MISO
#define EXP2_02_PIN 52 // SCK #define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 31 #define EXP2_03_PIN 31 // EN1
#define EXP2_04_PIN 53 #define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 33 #define EXP2_05_PIN 33 // EN2
#define EXP2_06_PIN 51 // MOSI #define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 #define EXP2_07_PIN 49 // SD_DET
#define EXP2_08_PIN 41 #define EXP2_08_PIN 41 // KILL
// //
// AnyCubic pin mappings // AnyCubic pin mappings

82
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View file

@ -21,7 +21,11 @@
*/ */
#pragma once #pragma once
// ATmega2560 /**
* TT OSCAR by YM Tech.LTD
*
* ATmega2560
*/
#include "env_validate.h" #include "env_validate.h"
@ -73,12 +77,12 @@
#define Z_STEP_PIN 46 #define Z_STEP_PIN 46
#define Z_DIR_PIN 48 #define Z_DIR_PIN 48
#define Z_ENABLE_PIN 62 #define Z_ENABLE_PIN 62
#define Z_CS_PIN 53 #define Z_CS_PIN 53 // EXP2-4
#define E0_STEP_PIN 26 #define E0_STEP_PIN 26
#define E0_DIR_PIN 28 #define E0_DIR_PIN 28
#define E0_ENABLE_PIN 24 #define E0_ENABLE_PIN 24
#define E0_CS_PIN 49 #define E0_CS_PIN 49 // EXP2-7
#define E1_STEP_PIN 36 #define E1_STEP_PIN 36
#define E1_DIR_PIN 34 #define E1_DIR_PIN 34
@ -209,7 +213,7 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 53 #define SDSS 53 // EXP2-4
#define LED_PIN 13 #define LED_PIN 13
//#ifndef FILWIDTH_PIN //#ifndef FILWIDTH_PIN
@ -257,13 +261,49 @@
#define E_MUX0_PIN 58 // Y_CS_PIN #define E_MUX0_PIN 58 // Y_CS_PIN
#endif #endif
#ifndef E_MUX1_PIN #ifndef E_MUX1_PIN
#define E_MUX1_PIN 53 // Z_CS_PIN #define E_MUX1_PIN 53 // EXP2-4
#endif #endif
#ifndef E_MUX2_PIN #ifndef E_MUX2_PIN
#define E_MUX2_PIN 49 // En_CS_PIN #define E_MUX2_PIN 49 // EXP2-7
#endif #endif
#endif #endif
/** TT OSCAR Expansion Headers
* ------
* -- | 1 2 | --
* -- 3 4 | --
* -- 5 6 | --
* 49 | 7 8 | --
* ------
* AUX1
*
* ------ ------
* 37 | 1 2 | 35 (MISO) 44 | 1 2 | 52 (SCK)
* 17 | 3 4 | 41? 35 | 3 4 | 53
* 23 5 6 | 25 31 5 6 | 51 (MOSI)
* 27 | 7 8 | 29 49 | 7 8 | 41
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN 37 // BEEPER
#define EXP1_02_PIN 35 // ENC
#define EXP1_03_PIN 17 // ENC1
#define EXP1_04_PIN 41 // RESET
#define EXP1_05_PIN 23 // ENC2
#define EXP1_06_PIN 25 // D4
#define EXP1_07_PIN 27 // RS
#define EXP1_08_PIN 29 // EN
#define EXP2_01_PIN 44 // MISO
#define EXP2_02_PIN 52 // SCK
#define EXP2_03_PIN 35 // EN2 / EN1
#define EXP2_04_PIN 53 // SDSS
#define EXP2_05_PIN 31 // EN1 / EN2
#define EXP2_06_PIN 51 // MOSI
#define EXP2_07_PIN 49 // SD_DET
#define EXP2_08_PIN 41 // KILL / RESET
////////////////////////// //////////////////////////
// LCDs and Controllers // // LCDs and Controllers //
////////////////////////// //////////////////////////
@ -275,9 +315,9 @@
// //
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select #define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
#define LCD_PINS_EN 51 // SID (MOSI) #define LCD_PINS_EN EXP2_06_PIN // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock #define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
#elif ALL(IS_NEWPANEL, PANEL_ONE) #elif ALL(IS_NEWPANEL, PANEL_ONE)
@ -369,7 +409,7 @@
#endif #endif
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
//#define KILL_PIN 41 //#define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
@ -388,7 +428,7 @@
#define BTN_EN1 47 #define BTN_EN1 47
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS EXP2_04_PIN
//#define KILL_PIN 41 //#define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
@ -397,8 +437,8 @@
#define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13. #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS EXP2_04_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#elif ANY(VIKI2, miniVIKI) #elif ANY(VIKI2, miniVIKI)
@ -413,7 +453,7 @@
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC 39 #define BTN_ENC 39
#define SDSS 53 #define SDSS EXP2_04_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
//#define KILL_PIN 31 //#define KILL_PIN 31
@ -431,8 +471,8 @@
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define LCD_SDSS 53 #define LCD_SDSS EXP2_04_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
//#define KILL_PIN 41 //#define KILL_PIN 41
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
@ -447,8 +487,8 @@
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
//#define SDSS 53 //#define SDSS EXP2_04_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
//#define KILL_PIN 64 //#define KILL_PIN 64
//#define LCD_CONTRAST_INIT 190 //#define LCD_CONTRAST_INIT 190
@ -467,8 +507,8 @@
#define BTN_EN2 63 #define BTN_EN2 63
#define BTN_ENC 59 #define BTN_ENC 59
#define SDSS 53 #define SDSS EXP2_04_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
//#define KILL_PIN 64 //#define KILL_PIN 64
//#define LCD_CONTRAST_INIT 190 //#define LCD_CONTRAST_INIT 190
@ -498,7 +538,7 @@
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
//#define KILL_PIN 41 //#define KILL_PIN 41
#endif #endif

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

@ -336,9 +336,9 @@
#if ENABLED(ZONESTAR_12864LCD) #if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864" #define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_SDSS 16 #define LCD_SDSS 16
#define LCD_PINS_RS 16 // ST7920_CS_PIN LCD_PIN_RS (PIN4 of LCD module) #define LCD_PINS_RS 16 // ST7920 CS (LCD-4)
#define LCD_PINS_EN 23 // ST7920_DAT_PIN LCD_PIN_R/W (PIN5 of LCD module) #define LCD_PINS_EN 23 // ST7920 DAT LCD-R/W (LCD-5)
#define LCD_PINS_D4 17 // ST7920_CLK_PIN LCD_PIN_ENA (PIN6 of LCD module) #define LCD_PINS_D4 17 // ST7920 CLK LCD-ENA (LCD-6)
#define BTN_EN2 25 #define BTN_EN2 25
#define BTN_EN1 27 #define BTN_EN1 27
#define BTN_ENC 29 #define BTN_ENC 29
@ -347,9 +347,9 @@
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "Reprap LCD12864" #define LCDSCREEN_NAME "Reprap LCD12864"
// Use EXP1 & EXP2 connector // Use EXP1 & EXP2 connector
#define LCD_PINS_RS 16 // ST7920_CS_PIN LCD_PIN_RS #define LCD_PINS_RS 16 // ST7920 CS
#define LCD_PINS_EN 17 // ST7920_DAT_PIN LCD_PIN_ENA #define LCD_PINS_EN 17 // ST7920 DAT
#define LCD_PINS_D4 23 // ST7920_CLK_PIN LCD_PIN_R/W #define LCD_PINS_D4 23 // ST7920 CLK LCD-R/W
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35

2
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
View file

@ -62,7 +62,7 @@
// LED defines // LED defines
// //
//#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h) //#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
//#define NEOPIXEL_PIN 20 // LED driving pin on motherboard //#define BOARD_NEOPIXEL_PIN 20 // LED driving pin on motherboard
//#define NEOPIXEL_PIXELS 3 // Number of LEDs in the strip //#define NEOPIXEL_PIXELS 3 // Number of LEDs in the strip
//#define SDA0 20 // PB12 NeoPixel pin I2C data //#define SDA0 20 // PB12 NeoPixel pin I2C data
//#define SCL0 21 // PB13 I2C clock //#define SCL0 21 // PB13 I2C clock

5
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
View file

@ -134,7 +134,9 @@
#define SDSS 4 #define SDSS 4
#define LED_PIN 13 #define LED_PIN 13
/** ------ ------ /**
* RAMPS-FD LCD adapter
* ------ ------
* 37 | 1 2 | 35 (MISO) 50 | 1 2 | 76 (SCK) * 37 | 1 2 | 35 (MISO) 50 | 1 2 | 76 (SCK)
* 29 | 3 4 | 27 (EN2) 31 | 3 4 | 4 (SD_SS) * 29 | 3 4 | 27 (EN2) 31 | 3 4 | 4 (SD_SS)
* 25 5 6 | 23 (EN1) 33 5 6 | 75 (MOSI) * 25 5 6 | 23 (EN1) 33 5 6 | 75 (MOSI)
@ -165,7 +167,6 @@
// LCD / Controller // LCD / Controller
// //
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
// ramps-fd lcd adaptor
#define BEEPER_PIN EXP1_01_PIN #define BEEPER_PIN EXP1_01_PIN

24
Marlin/src/pins/sam/pins_RURAMPS4D_11.h
View file

@ -195,22 +195,22 @@
* ------ ------ * ------ ------
* EXP1 EXP2 * EXP1 EXP2
*/ */
#define EXP1_01_PIN 62 #define EXP1_01_PIN 62 // BEEPER
#define EXP1_02_PIN 40 #define EXP1_02_PIN 40 // ENC
#define EXP1_03_PIN 64 #define EXP1_03_PIN 64 // LCD_EN
#define EXP1_04_PIN 63 #define EXP1_04_PIN 63 // LCD_RS
#define EXP1_05_PIN 48 #define EXP1_05_PIN 48 // LCD_D4 / RESET
#define EXP1_06_PIN 50 #define EXP1_06_PIN 50 // LCD_D5
#define EXP1_07_PIN 52 #define EXP1_07_PIN 52 // LCD_D6
#define EXP1_08_PIN 53 #define EXP1_08_PIN 53 // LCD_D7 / ENABLE
#define EXP2_01_PIN 74 // MISO #define EXP2_01_PIN 74 // MISO
#define EXP2_02_PIN 76 // SCK #define EXP2_02_PIN 76 // SCK
#define EXP2_03_PIN 44 #define EXP2_03_PIN 44 // EN1
#define EXP2_04_PIN 10 #define EXP2_04_PIN 10 // SDSS
#define EXP2_05_PIN 42 #define EXP2_05_PIN 42 // EN2
#define EXP2_06_PIN 75 // MOSI #define EXP2_06_PIN 75 // MOSI
#define EXP2_07_PIN 51 #define EXP2_07_PIN 51 // SD DET
#define EXP2_08_PIN -1 // RESET #define EXP2_08_PIN -1 // RESET
// //

566
Marlin/src/pins/samd/pins_RAMPS_144.h
View file

@ -48,6 +48,21 @@
#define I2C_EEPROM // EEPROM on I2C-0 #define I2C_EEPROM // EEPROM on I2C-0
#define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256) #define MARLIN_EEPROM_SIZE 0x8000 // 32K (24lc256)
//
// Foam Cutter requirements
//
#if ENABLED(FOAMCUTTER_XYUV)
#define MOSFET_C_PIN -1
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN) && NUM_SERVOS < 2
#define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
#endif
#define Z_MIN_PIN -1
#define Z_MAX_PIN -1
#define I_STOP_PIN 18
#define J_STOP_PIN 19
#endif
// //
// Limit Switches // Limit Switches
// //
@ -260,79 +275,233 @@
#define SDSS 53 #define SDSS 53
#endif #endif
//
// Průša i3 MK2 Multiplexer Support
//
#if HAS_PRUSA_MMU1
#ifndef E_MUX0_PIN
#define E_MUX0_PIN AUX2_06 // Z_CS_PIN
#endif
#ifndef E_MUX1_PIN
#define E_MUX1_PIN AUX2_08 // E0_CS_PIN
#endif
#ifndef E_MUX2_PIN
#define E_MUX2_PIN AUX2_07 // E1_CS_PIN
#endif
#endif
//
// AUX1 VCC GND D2 D1
// 2 4 6 8
// 1 3 5 7
// VCC GND A3 A4
//
#define AUX1_05 57 // (A3)
#define AUX1_06 2
#define AUX1_07 58 // (A4)
#define AUX1_08 1
//
// AUX2 GND A9 D40 D42 A11
// 2 4 6 8 10
// 1 3 5 7 9
// VCC A5 A10 D44 A12
//
#define AUX2_03 59 // (A5)
#define AUX2_04 63 // (A9)
#define AUX2_05 64 // (A10)
#define AUX2_06 40
#define AUX2_07 44
#define AUX2_08 42
#define AUX2_09 66 // (A12)
#define AUX2_10 65 // (A11)
//
// AUX3
// SCK MISO
// RST GND D52 D50 VCC
// 9 7 5 3 1
// 10 8 6 4 2
// NC 5V D53 D51 D49
// MOSI
//
#define AUX3_02 49
#define AUX3_03 50
#define AUX3_04 51
#define AUX3_05 52
#define AUX3_06 53
//
// AUX4 VCC GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16
//
#define AUX4_03 32
#define AUX4_04 47
#define AUX4_05 45
#define AUX4_06 43
#define AUX4_07 41
#define AUX4_08 39
#define AUX4_09 37
#define AUX4_10 35
#define AUX4_11 33
#define AUX4_12 31
#define AUX4_13 29
#define AUX4_14 27
#define AUX4_15 25
#define AUX4_16 23
#define AUX4_17 17
#define AUX4_18 16
/**
* LCD adapters come in different variants. The socket keys can be
* on either side, and may be backwards on some boards / displays.
*/
#ifndef EXP1_08_PIN
#define EXP1_03_PIN AUX4_17
#define EXP1_04_PIN AUX4_18
#define EXP1_05_PIN AUX4_16
#define EXP1_06_PIN AUX4_15
#define EXP1_07_PIN AUX4_14
#define EXP1_08_PIN AUX4_13
#define EXP2_01_PIN AUX3_03
#define EXP2_02_PIN AUX3_05
#define EXP2_04_PIN AUX3_06
#define EXP2_06_PIN AUX3_04
#define EXP2_07_PIN AUX3_02
#if ENABLED(G3D_PANEL)
/** Gadgets3D Smart Adapter
* ------ ------
* 4-11 | 1 2 | 4-12 (MISO) 3-03 | 1 2 | 3-05 (SCK)
* 4-17 | 3 4 | 4-18 4-10 | 3 4 | 3-06
* 4-16 5 6 | 4-15 4-09 5 6 | 3-04 (MOSI)
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
* (GND) 4-02 | 9 10 | 4-01 (5V) -- | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN AUX4_11
#define EXP1_02_PIN AUX4_12
#define EXP2_03_PIN AUX4_10
#define EXP2_05_PIN AUX4_09
#define EXP2_08_PIN AUX4_07
#else
/** Smart Adapter (c) RRD
* ------ ------
* 4-09 | 1 2 | 4-10 (MISO) 3-03 | 1 2 | 3-05 (SCK)
* 4-17 | 3 4 | 4-18 4-12 | 3 4 | 3-06
* 4-16 5 6 | 4-15 4-11 5 6 | 3-04 (MOSI)
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
* (GND) 3-07 | 9 10 | 3-01 (5V) (GND) 3-07 | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN AUX4_09
#define EXP1_02_PIN AUX4_10
#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#define EXP2_03_PIN AUX4_11
#define EXP2_05_PIN AUX4_12
#define EXP2_08_PIN -1 // RESET
#else
#define EXP2_03_PIN AUX4_12
#define EXP2_05_PIN AUX4_11
#define EXP2_08_PIN AUX4_07
#endif
#endif
#endif
////////////////////////// //////////////////////////
// LCDs and Controllers // // LCDs and Controllers //
////////////////////////// //////////////////////////
#if HAS_WIRED_LCD #ifdef LCD_PINS_DEFINED
// LCD pins already defined by including header
#elif HAS_WIRED_LCD
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
// //
// LCD Display output pins // LCD Display output pins
// //
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
// TO TEST #define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
//#define LCD_PINS_RS 49 // CS chip select /SS chip slave select #define LCD_PINS_EN EXP2_06_PIN // SID (MOSI)
//#define LCD_PINS_EN 51 // SID (MOSI) #define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
//#define LCD_PINS_D4 52 // SCK (CLK) clock
#elif ALL(IS_NEWPANEL, PANEL_ONE) #elif ALL(IS_NEWPANEL, PANEL_ONE)
// TO TEST #define LCD_PINS_RS AUX2_06
//#define LCD_PINS_RS 40 #define LCD_PINS_EN AUX2_08
//#define LCD_PINS_EN 42 #define LCD_PINS_D4 AUX2_10
//#define LCD_PINS_D4 57 // Mega/Due:65 - AGCM4:57 #define LCD_PINS_D5 AUX2_09
//#define LCD_PINS_D5 58 // Mega/Due:66 - AGCM4:58 #define LCD_PINS_D6 AUX2_07
//#define LCD_PINS_D6 44 #define LCD_PINS_D7 AUX2_05
//#define LCD_PINS_D7 56 // Mega/Due:64 - AGCM4:56
#elif ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS EXP2_05_PIN
#else #else
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
// TO TEST #define LCD_PINS_RS EXP1_07_PIN
//#define LCD_PINS_RS 27 #define LCD_PINS_EN EXP1_08_PIN
//#define LCD_PINS_EN 29 #define LCD_PINS_D4 EXP1_06_PIN
//#define LCD_PINS_D4 25
#if !IS_NEWPANEL #if !IS_NEWPANEL
// TO TEST #define BEEPER_PIN EXP1_01_PIN
//#define BEEPER_PIN 37
#endif #endif
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
// TO TEST #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
//#define LCD_PINS_RS 56 // Mega/Due:64 - AGCM4:56 #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
//#define LCD_PINS_EN 44 #endif
//#define LCD_PINS_D4 55 // Mega/Due:63 - AGCM4:55
//#define LCD_PINS_D5 40 #define LCD_PINS_RS AUX2_05
//#define LCD_PINS_D6 42 #define LCD_PINS_EN AUX2_07
//#define LCD_PINS_D7 57 // Mega/Due:65 - AGCM4:57 #define LCD_PINS_D4 AUX2_04
#define LCD_PINS_D5 AUX2_06
#define LCD_PINS_D6 AUX2_08
#define LCD_PINS_D7 AUX2_10
#elif ENABLED(AZSMZ_12864)
// TODO
#else #else
#if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306) #if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306)
// TO TEST #define LCD_PINS_DC EXP1_06_PIN // Set as output on init
//#define LCD_PINS_DC 25 // Set as output on init #define LCD_PINS_RS EXP1_07_PIN // Pull low for 1s to init
//#define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support // DOGM SPI LCD Support
//#define DOGLCD_CS 16 #define DOGLCD_A0 LCD_PINS_DC
//#define DOGLCD_MOSI 17 #define DOGLCD_CS EXP1_04_PIN
//#define DOGLCD_SCK 23 #define DOGLCD_MOSI EXP1_03_PIN
//#define DOGLCD_A0 LCD_PINS_DC #define DOGLCD_SCK EXP1_05_PIN
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_EN 17 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 23 #define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 25 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 27 #define LCD_PINS_D6 EXP1_07_PIN
#endif #endif
#define LCD_PINS_D7 29 #define LCD_PINS_D7 EXP1_08_PIN
#if !IS_NEWPANEL #if !IS_NEWPANEL
#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_05_PIN
#endif #endif
#endif #endif
@ -341,13 +510,17 @@
// Buttons attached to a shift register // Buttons attached to a shift register
// Not wired yet // Not wired yet
//#define SHIFT_CLK_PIN 38 //#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN 42 //#define SHIFT_LD_PIN AUX2_08
//#define SHIFT_OUT_PIN 40 //#define SHIFT_OUT_PIN AUX2_06
//#define SHIFT_EN_PIN 17 //#define SHIFT_EN_PIN EXP1_03_PIN
#endif #endif
#endif #endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
// //
// LCD Display input pins // LCD Display input pins
// //
@ -355,215 +528,270 @@
#if IS_RRD_SC #if IS_RRD_SC
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
// TO TEST #define BTN_EN1 EXP1_03_PIN
//#define BTN_EN1 17 #define BTN_EN2 EXP1_05_PIN
//#define BTN_EN2 23
#else #else
#define BTN_EN1 31 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_05_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
#endif #endif
#define BTN_ENC 35 #define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#endif
#ifndef KILL_PIN
#define KILL_PIN EXP2_08_PIN
#endif #endif
#define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
//#define LCD_BACKLIGHT_PIN 39 // TO TEST #define LCD_BACKLIGHT_PIN AUX4_08 // Probably a slightly different adapter from RRD SC
#endif #endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
// TO TEST #define BTN_EN1 AUX2_05
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56 #define BTN_EN2 AUX2_03
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72 #define BTN_ENC AUX2_04
//#define BTN_ENC 55 #ifndef SD_DETECT_PIN
//#define SD_DETECT_PIN 42 #define SD_DETECT_PIN AUX2_08
#endif
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
// TO TEST #define BTN_EN1 AUX4_04
//#define BTN_EN1 47 #define BTN_EN2 AUX4_06
//#define BTN_EN2 43 #define BTN_ENC AUX4_03
//#define BTN_ENC 32 #define LCD_SDSS SDSS
//#define LCD_SDSS SDSS #define KILL_PIN AUX4_07
//#define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
// TO TEST #define BTN_EN1 AUX2_06 // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08.
//#define BTN_EN1 40 // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42. #define BTN_EN2 AUX2_08
//#define BTN_EN2 42 #define BTN_ENC -1
//#define BTN_ENC -1
//#define LCD_SDSS SDSS #define LCD_SDSS SDSS
//#define SD_DETECT_PIN 49 #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#elif ANY(VIKI2, miniVIKI) #elif ANY(VIKI2, miniVIKI)
// TO TEST #define DOGLCD_CS AUX4_05
//#define DOGLCD_CS 45 #define DOGLCD_A0 AUX2_07
//#define DOGLCD_A0 44 #define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
//#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_05_PIN
//#define STAT_LED_RED_PIN 32 #define STAT_LED_RED_PIN AUX4_03
//#define STAT_LED_BLUE_PIN 35 #define STAT_LED_BLUE_PIN EXP1_02_PIN
//#define BTN_EN1 22 #define BTN_EN1 22
//#define BTN_EN2 7 #define BTN_EN2 7
//#define BTN_ENC 39 #define BTN_ENC AUX4_08
//#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board #ifndef SD_DETECT_PIN
//#define KILL_PIN 31 #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#endif
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 #define KILL_PIN EXP2_03_PIN
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
// TO TEST #define DOGLCD_CS EXP1_08_PIN
//#define DOGLCD_CS 29 #define DOGLCD_A0 EXP1_07_PIN
//#define DOGLCD_A0 27
//#define BEEPER_PIN 23 #define BEEPER_PIN EXP1_05_PIN
//#define LCD_BACKLIGHT_PIN 33 #define LCD_BACKLIGHT_PIN EXP2_05_PIN
//#define BTN_EN1 35 #define BTN_EN1 EXP1_02_PIN
//#define BTN_EN2 37 #define BTN_EN2 EXP1_01_PIN
//#define BTN_ENC 31 #define BTN_ENC EXP2_03_PIN
//#define LCD_SDSS SDSS #define LCD_SDSS SDSS
//#define SD_DETECT_PIN 49 #ifndef SD_DETECT_PIN
//#define KILL_PIN 41 #define SD_DETECT_PIN EXP2_07_PIN
#endif
#define KILL_PIN EXP2_08_PIN
#elif ANY(MKS_MINI_12864, FYSETC_MINI_12864) #elif ANY(MKS_MINI_12864, FYSETC_MINI_12864)
// TO TEST #define BEEPER_PIN EXP1_01_PIN
//#define BEEPER_PIN 37 #define BTN_ENC EXP1_02_PIN
//#define BTN_ENC 35 #ifndef SD_DETECT_PIN
//#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_07_PIN
#endif
//#ifndef KILL_PIN #ifndef KILL_PIN
// #define KILL_PIN 41 #define KILL_PIN EXP2_08_PIN
//#endif #endif
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
// TO TEST #define DOGLCD_A0 EXP1_07_PIN
//#define DOGLCD_A0 27 #define DOGLCD_CS EXP1_06_PIN
//#define DOGLCD_CS 25
// not connected to a pin // not connected to a pin
//#define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57) #define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
//#define BTN_EN1 31 #define BTN_EN1 EXP2_03_PIN
//#define BTN_EN2 33 #define BTN_EN2 EXP2_05_PIN
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(FYSETC_MINI_12864) #elif ENABLED(FYSETC_MINI_12864)
// From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8 // From https://wiki.fysetc.com/Mini12864_Panel/
// TO TEST #define DOGLCD_A0 EXP1_04_PIN
//#define DOGLCD_A0 16 #define DOGLCD_CS EXP1_03_PIN
//#define DOGLCD_CS 17
//#define BTN_EN1 33 #define BTN_EN1 EXP2_05_PIN
//#define BTN_EN2 31 #define BTN_EN2 EXP2_03_PIN
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems //#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 // results in LCD soft SPI mode 3, SD soft SPI mode 0
//#define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
#if ANY(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 #ifndef RGB_LED_R_PIN
// TO TEST #define RGB_LED_R_PIN EXP1_06_PIN
//#define RGB_LED_R_PIN 25
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
// TO TEST #define RGB_LED_G_PIN EXP1_07_PIN
//#define RGB_LED_G_PIN 27
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
// TO TEST #define RGB_LED_B_PIN EXP1_08_PIN
//#define RGB_LED_B_PIN 29
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
// TO TEST #define NEOPIXEL_PIN EXP1_06_PIN
//#define NEOPIXEL_PIN 25
#endif #endif
#endif #endif
#elif ENABLED(MINIPANEL) #elif ENABLED(MINIPANEL)
// TO TEST #define BEEPER_PIN AUX2_08
//#define BEEPER_PIN 42 #define LCD_BACKLIGHT_PIN AUX2_10
// not connected to a pin
//#define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
//#define DOGLCD_A0 44 #define DOGLCD_A0 AUX2_07
//#define DOGLCD_CS 58 // Mega/Due:66 - AGCM4:58 #define DOGLCD_CS AUX2_09
//#define BTN_EN1 40 #define BTN_EN1 AUX2_06
//#define BTN_EN2 55 // Mega/Due:63 - AGCM4:55 #define BTN_EN2 AUX2_04
//#define BTN_ENC 72 // Mega/Due:59 - AGCM4:72 #define BTN_ENC AUX2_03
//#define SD_DETECT_PIN 49 #ifndef SD_DETECT_PIN
//#define KILL_PIN 56 // Mega/Due:64 - AGCM4:56 #define SD_DETECT_PIN AUX3_02
#endif
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 #define KILL_PIN AUX2_05
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
// TO TEST #define ADC_KEYPAD_PIN 12
//#define ADC_KEYPAD_PIN 12
#elif ENABLED(AZSMZ_12864) #elif ENABLED(AZSMZ_12864)
// TO TEST // TODO
#else #elif ENABLED(G3D_PANEL)
// Beeper on AUX-4 #define BEEPER_PIN EXP1_01_PIN
//#define BEEPER_PIN 33
// Buttons are directly attached to AUX-2 #ifndef SD_DETECT_PIN
#if IS_RRW_KEYPAD #define SD_DETECT_PIN EXP2_07_PIN
// TO TEST #endif
//#define SHIFT_OUT_PIN 40 #define KILL_PIN EXP2_08_PIN
//#define SHIFT_CLK_PIN 44
//#define SHIFT_LD_PIN 42 #define BTN_EN1 EXP2_05_PIN
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56 #define BTN_EN2 EXP2_03_PIN
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72 #define BTN_ENC EXP1_02_PIN
//#define BTN_ENC 55 // Mega/Due:63 - AGCM4:55
#elif ENABLED(PANEL_ONE) #elif IS_TFTGLCD_PANEL
// TO TEST
//#define BTN_EN1 72 // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72) #ifndef SD_DETECT_PIN
//#define BTN_EN2 55 // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55) #define SD_DETECT_PIN EXP2_07_PIN
//#define BTN_ENC 49 // AUX3 PIN 7
#else
// TO TEST
//#define BTN_EN1 37
//#define BTN_EN2 35
//#define BTN_ENC 31
#endif #endif
#if ENABLED(G3D_PANEL) #else
// TO TEST
//#define SD_DETECT_PIN 49 #define BEEPER_PIN EXP2_05_PIN
//#define KILL_PIN 41
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
#define BTN_EN1 AUX2_03
#define BTN_EN2 AUX2_04
#define BTN_ENC AUX3_02
#else
#define BTN_EN1 EXP1_01_PIN
#define BTN_EN2 EXP1_02_PIN
#define BTN_ENC EXP2_03_PIN
#endif #endif
#endif #endif
#endif // IS_NEWPANEL #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
#define SHIFT_CLK_PIN AUX2_07
#define SHIFT_LD_PIN AUX2_08
#ifndef BTN_EN1
#define BTN_EN1 AUX2_05
#endif
#ifndef BTN_EN2
#define BTN_EN2 AUX2_03
#endif
#ifndef BTN_ENC
#define BTN_ENC AUX2_04
#endif
#endif
#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
/**
* FYSETC TFT-81050 display pinout
*
* Board Display
* ------ ------
* (MISO) 50 | 1 2 | 52 (SCK) 5V |10 9 | GND
* (LCD_CS) 33 | 3 4 | 53 (SD_CS) RESET | 8 7 | (SD_DET)
* 31 5 6 | 51 (MOSI) (MOSI) 6 5 | (LCD_CS)
* (SD_DET) 49 | 7 8 | RESET (SD_CS) | 4 3 | (MOD_RESET)
* GND | 9 10 | -- (SCK) | 2 1 | (MISO)
* ------ ------
* EXP2 EXP1
*
* Needs custom cable:
*
* Board Adapter Display
* ----------------------------------
* EXP2-1 <--diode--- EXP1-1 MISO
* EXP2-2 ----------- EXP1-2 SCK
* EXP2-4 ----------- EXP1-3 MOD_RST
* EXP2-4 ----------- EXP1-4 SD_CS
* EXP2-3 ----------- EXP1-5 LCD_CS
* EXP2-6 ----------- EXP1-6 MOSI
* EXP2-7 ----------- EXP1-7 SD DET
* EXP2-8 ----------- EXP1-8 RESET
* EXP2-1 ----------- EXP1-9 MISO->GND
* EXP1-10 ---------- EXP1-10 5V
*
* NOTE: The MISO pin should not get a 5V signal.
* To fix, insert a 1N4148 diode in the MISO line.
*/
#define BEEPER_PIN EXP1_01_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
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

32
Marlin/src/pins/sanguino/pins_ANET_10.h
View file

@ -162,31 +162,29 @@
* Connector pinouts * Connector pinouts
* *
* ------ ------ ---- * ------ ------ ----
* (SDA) D17 | 1 2 | (A1) D30 3V3 | 1 2 | D4 (SS) J3_RX |1 2| J3_TX * (SDA) 17 | 1 2 | 30 (A1) 3V3 | 1 2 | 4 (SS) J3_RX |1 2| J3_TX
* (SCL) D16 | 3 4 | (A2) D29 GND | 3 4 | RESET (TXO) D9 |3 4| D8 (RX0) D8 * (SCL) 16 | 3 4 | 29 (A2) GND | 3 4 | RESET (TXO) 9 |3 4| 8 (RX0)
* D11 | 5 6 (A3) D28 (MOSI) D5 | 5 6 D7 (SCK) USB_RX |5 6| USB_TX * 11 | 5 6 28 (A3) (MOSI) 5 | 5 6 7 (SCK) USB_RX |5 6| USB_TX
* D10 | 7 8 | (A4) D27 5V | 7 8 | D6 (MISO) ---- * 10 | 7 8 | 27 (A4) 5V | 7 8 | 6 (MISO) ----
* 5V | 9 10 | GND J3_RX | 9 10 | J3_TX * 5V | 9 10 | GND J3_RX | 9 10 | J3_TX USB_BLE
* ------ ------ * ------ ------
* LCD J3 USB_BLE * LCD J3
*/ */
#define EXP1_01_PIN 17 // BEEPER / ENC
#define EXP1_01_PIN 17 #define EXP1_02_PIN 30 // LCD_D4 / SERVO
#define EXP1_02_PIN 30 #define EXP1_03_PIN 16 // ENC / LCD_EN
#define EXP1_03_PIN 16 #define EXP1_04_PIN 29 // SERVO / LCD_RS
#define EXP1_04_PIN 29 #define EXP1_05_PIN 11 // EN1 / LCD_D4
#define EXP1_05_PIN 11 #define EXP1_06_PIN 28 // LCD_EN / EN1
#define EXP1_06_PIN 28 #define EXP1_07_PIN 10 // EN2
#define EXP1_07_PIN 10 #define EXP1_08_PIN 27 // LCD_RS / BEEPER
#define EXP1_08_PIN 27
#define EXP1_09_PIN -1 // 5V
#define EXP1_10_PIN -1 // GND
/** /**
* LCD / Controller * LCD / Controller
* *
* Only the following displays are supported: * Only the following displays are supported:
* ZONESTAR_LCD * ZONESTAR_LCD
* ANET_FULL_GRAPHICS_LCD
* CTC_A10S_A13 * CTC_A10S_A13
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/ */

75
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View file

@ -38,59 +38,54 @@
#define BOARD_INFO_NAME "Melzi (Creality)" #define BOARD_INFO_NAME "Melzi (Creality)"
// Alter timing for graphical display /** ------
#if IS_U8GLIB_ST7920 * 27 | 1 2 | 16
#define BOARD_ST7920_DELAY_1 125 * 11 | 3 4 | RESET
#define BOARD_ST7920_DELAY_2 125 * 10 5 6 | 30
#define BOARD_ST7920_DELAY_3 125 * 28 | 7 8 | 17
#endif * GND | 9 10 | 5V
* ------
/** * EXP1
* EXP1 EXP1 as ENDER2 STOCKDISPLAY EXP1 as CR10 STOCKDISPLAY
* ------ ------ ------
* D27 | 1 2 | D16 SCK | 1 2 | BTN_E BEEPER_PIN | 1 2 | BTN_ENC
* D11 | 3 4 | RESET BTN_EN1 | 3 4 | RESET BTN_EN1 | 3 4 | RESET
* D10 5 6 | D30 BTN_EN2 5 6 | LCD_A0 BTN_EN2 5 6 | LCD_D4 (ST9720 CLK)
* D28 | 7 8 | D17 LCD_CS | 7 8 | MOSI (ST9720 CS) LCD_RS | 7 8 | LCD_EN (ST9720 DAT)
* GND | 9 10 | 5V GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------ ------
*/ */
#define EXP1_01_PIN 27 #define EXP1_01_PIN 27 // BEEP
#define EXP1_02_PIN 16 #define EXP1_02_PIN 16 // ENC
#define EXP1_03_PIN 11 #define EXP1_03_PIN 11 // EN1
#define EXP1_04_PIN -1 // RESET #define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN 10 #define EXP1_05_PIN 10 // EN2
#define EXP1_06_PIN 30 #define EXP1_06_PIN 30 // A0 / ST9720 CLK
#define EXP1_07_PIN 28 #define EXP1_07_PIN 28 // CS / ST9720 CS
#define EXP1_08_PIN 17 #define EXP1_08_PIN 17 // ST9720 DAT
// //
// LCD / Controller // LCD / Controller
// //
#if ANY(MKS_MINI_12864, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #if ANY(MKS_MINI_12864, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#if ENABLED(MKS_MINI_12864) #if ANY(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#error "CAUTION! MKS_MINI_12864 on MELZI_CREALITY requires wiring modifications. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 EXP1_06_PIN
#elif ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXP1_07_PIN // ST9720 CS #define LCD_PINS_RS EXP1_07_PIN // ST9720 CS
#define LCD_PINS_EN EXP1_08_PIN // ST9720 DAT #define LCD_PINS_EN EXP1_08_PIN // ST9720 DAT
#define LCD_PINS_D4 EXP1_06_PIN // ST9720 CLK #define LCD_PINS_D4 EXP1_06_PIN // ST9720 CLK
#define BEEPER_PIN EXP1_01_PIN #endif
#elif ENABLED(ENDER2_STOCKDISPLAY) #if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define DOGLCD_CS EXP1_07_PIN #define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 EXP1_06_PIN #define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_01_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#endif #endif
#define LCD_SDSS 31 // Controller's SD card
#define BTN_ENC EXP1_02_PIN #define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN #define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN #define BTN_EN2 EXP1_05_PIN
#define LCD_SDSS 31 // Controller's SD card #define BEEPER_PIN EXP1_01_PIN
#define LCD_PINS_DEFINED #define LCD_PINS_DEFINED
#endif
// Alter timing for graphical display
#if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 125
#define BOARD_ST7920_DELAY_3 125
#endif #endif
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11 #include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
@ -99,16 +94,14 @@
#ifndef SERVO0_PIN #ifndef SERVO0_PIN
#define SERVO0_PIN EXP1_01_PIN #define SERVO0_PIN EXP1_01_PIN
#endif #endif
#if SERVO0_PIN == BEEPER_PIN
#undef BEEPER_PIN
#endif
#elif HAS_FILAMENT_SENSOR #elif HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN #ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN EXP1_01_PIN #define FIL_RUNOUT_PIN EXP1_01_PIN
#endif #endif
#if FIL_RUNOUT_PIN == BEEPER_PIN
#undef BEEPER_PIN
#endif #endif
#if PIN_EXISTS(BEEPER) && (SERVO0_PIN == BEEPER_PIN || FIL_RUNOUT_PIN == BEEPER_PIN)
#undef BEEPER_PIN
#define BEEPER_PIN -1
#endif #endif
/** /**

7
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
View file

@ -29,12 +29,13 @@
#define BOARD_INFO_NAME "Melzi (Malyan)" #define BOARD_INFO_NAME "Melzi (Malyan)"
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define BTN_ENC 28
#define BTN_EN1 30
#define BTN_EN2 29
#define LCD_PINS_RS 17 // ST9720 CS #define LCD_PINS_RS 17 // ST9720 CS
#define LCD_PINS_EN 16 // ST9720 DAT #define LCD_PINS_EN 16 // ST9720 DAT
#define LCD_PINS_D4 11 // ST9720 CLK #define LCD_PINS_D4 11 // ST9720 CLK
#define BTN_EN1 30
#define BTN_EN2 29
#define BTN_ENC 28
#define LCD_PINS_DEFINED #define LCD_PINS_DEFINED
#endif #endif

8
Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
View file

@ -33,15 +33,17 @@
#define LCD_SDSS -1 #define LCD_SDSS -1
#if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI) #if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
#define BTN_ENC 26
#define BTN_EN1 10
#define BTN_EN2 11
#define LCD_PINS_RS 30 #define LCD_PINS_RS 30
#define LCD_PINS_EN 28 #define LCD_PINS_EN 28
#define LCD_PINS_D4 16 #define LCD_PINS_D4 16
#define LCD_PINS_D5 17 #define LCD_PINS_D5 17
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#define BTN_EN1 10
#define BTN_EN2 11
#define BTN_ENC 26
#define LCD_PINS_DEFINED #define LCD_PINS_DEFINED
#endif #endif

2
Marlin/src/pins/sanguino/pins_MELZI_V2.h
View file

@ -25,6 +25,8 @@
* Melzi V2.0 as found at https://www.reprap.org/wiki/Melzi * Melzi V2.0 as found at https://www.reprap.org/wiki/Melzi
* Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Melzi%20V2/Melzi-circuit.png * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Melzi%20V2/Melzi-circuit.png
* Origin: https://www.reprap.org/mediawiki/images/7/7d/Melzi-circuit.png * Origin: https://www.reprap.org/mediawiki/images/7/7d/Melzi-circuit.png
*
* ATmega644P
*/ */
#define BOARD_INFO_NAME "Melzi V2" #define BOARD_INFO_NAME "Melzi V2"

124
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View file

@ -112,6 +112,10 @@
#define Z_ENABLE_PIN 4 #define Z_ENABLE_PIN 4
#endif #endif
#define E0_ENABLE_PIN 4 #define E0_ENABLE_PIN 4
#else
#if !HAS_CUTTER && !ALL(HAS_WIRED_LCD, IS_NEWPANEL) // Use IO Header
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
#endif #endif
// //
@ -125,16 +129,12 @@
* Sanguino libraries! See #368. * Sanguino libraries! See #368.
*/ */
//#define SDSS 24 //#define SDSS 24
#define SDSS 31 #define SDSS AUX1_09
#if IS_MELZI #if IS_MELZI
#define LED_PIN 27 #define LED_PIN AUX1_01
#elif MB(STB_11) #elif MB(STB_11)
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED #define LCD_BACKLIGHT_PIN AUX1_04 // LCD backlight LED
#endif
#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !ALL(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif #endif
/** /**
@ -145,11 +145,25 @@
* GND GND D31 D30 D29 D28 D27 * GND GND D31 D30 D29 D28 D27
* A4 A3 A2 A1 A0 * A4 A3 A2 A1 A0
*/ */
#define AUX1_01 27 // A0
#define AUX1_02 16 // SCL
#define AUX1_03 28 // A1
#define AUX1_04 17 // SDA
#define AUX1_05 29 // A2
#define AUX1_06 10 // RX1
#define AUX1_07 30 // A3
#define AUX1_08 11 // TX1
#define AUX1_09 31 // A4
#define AUX1_10 12 // PWM
// //
// LCD / Controller // LCD / Controller
// //
#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED) #ifdef LCD_PINS_DEFINED
// LCD pins already defined by including header
#elif HAS_WIRED_LCD
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
@ -157,49 +171,53 @@
#if ENABLED(LCD_FOR_MELZI) #if ENABLED(LCD_FOR_MELZI)
#define LCD_PINS_RS 17 #define LCD_PINS_RS AUX1_04
#define LCD_PINS_EN 16 #define LCD_PINS_EN AUX1_02
#define LCD_PINS_D4 11 #define LCD_PINS_D4 AUX1_08
#define KILL_PIN 10 #define KILL_PIN AUX1_06
#define BEEPER_PIN 27 #define BEEPER_PIN AUX1_01
#elif IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0 #elif IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI #if IS_MELZI
#define LCD_PINS_RS 30 // CS chip select /SS chip slave select #define LCD_PINS_RS AUX1_07 // CS chip select /SS chip slave select
#define LCD_PINS_EN 29 // SID (MOSI) #define LCD_PINS_EN AUX1_05 // SID (MOSI)
#define LCD_PINS_D4 17 // SCK (CLK) clock #define LCD_PINS_D4 AUX1_04 // SCK (CLK) clock
// Pin 27 is taken by LED_PIN, but Melzi LED does nothing with // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
// Marlin so this can be used for BEEPER_PIN. You can use this pin // Marlin so this can be used for BEEPER_PIN. You can use this pin
// with M42 instead of BEEPER_PIN. // with M42 instead of BEEPER_PIN.
#define BEEPER_PIN 27 #define BEEPER_PIN AUX1_01
#else // Sanguinololu >=1.3 #else // Sanguinololu >=1.3
#define LCD_PINS_RS 4 #define LCD_PINS_RS 4
#define LCD_PINS_EN 17 #define LCD_PINS_EN AUX1_04
#define LCD_PINS_D4 30 #define LCD_PINS_D4 AUX1_07
#define LCD_PINS_D5 29 #define LCD_PINS_D5 AUX1_05
#define LCD_PINS_D6 28 #define LCD_PINS_D6 AUX1_03
#define LCD_PINS_D7 27 #define LCD_PINS_D7 AUX1_01
#endif #endif
#else #else
#define DOGLCD_A0 30 #define DOGLCD_A0 AUX1_07
#if ENABLED(MAKRPANEL) #if ENABLED(MAKRPANEL)
#define BEEPER_PIN 29 #define BEEPER_PIN AUX1_05
#define DOGLCD_CS 17 #define DOGLCD_CS AUX1_04
#define LCD_BACKLIGHT_PIN 28 // PA3 #define LCD_BACKLIGHT_PIN AUX1_03 // PA3
#elif IS_MELZI #elif IS_MELZI
#define BEEPER_PIN 27 #define BEEPER_PIN AUX1_01
#define DOGLCD_CS 28 #ifndef DOGLCD_CS
#define DOGLCD_CS AUX1_03
#endif
#else // !MAKRPANEL #else
#define DOGLCD_CS 29 #ifndef DOGLCD_CS
#define DOGLCD_CS AUX1_05
#endif
#endif #endif
@ -209,29 +227,29 @@
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
#define LCD_PINS_RS 28 #define LCD_PINS_RS AUX1_03
#define LCD_PINS_EN 29 #define LCD_PINS_EN AUX1_05
#define LCD_PINS_D4 10 #define LCD_PINS_D4 AUX1_06
#define LCD_PINS_D5 11 #define LCD_PINS_D5 AUX1_08
#define LCD_PINS_D6 16 #define LCD_PINS_D6 AUX1_02
#define LCD_PINS_D7 17 #define LCD_PINS_D7 AUX1_04
#else #else
#define LCD_PINS_RS 4 #define LCD_PINS_RS 4
#define LCD_PINS_EN 17 #define LCD_PINS_EN AUX1_04
#define LCD_PINS_D4 30 #define LCD_PINS_D4 AUX1_07
#define LCD_PINS_D5 29 #define LCD_PINS_D5 AUX1_05
#define LCD_PINS_D6 28 #define LCD_PINS_D6 AUX1_03
#define LCD_PINS_D7 27 #define LCD_PINS_D7 AUX1_01
#endif #endif
#if ENABLED(LCD_FOR_MELZI) #if ENABLED(LCD_FOR_MELZI)
#define BTN_ENC 28 #define BTN_ENC AUX1_03
#define BTN_EN1 29 #define BTN_EN1 AUX1_05
#define BTN_EN2 30 #define BTN_EN2 AUX1_07
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
@ -242,26 +260,26 @@
#elif ENABLED(LCD_I2C_PANELOLU2) #elif ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI #if IS_MELZI
#define BTN_ENC 29 #define BTN_ENC AUX1_05
#ifndef LCD_SDSS #ifndef LCD_SDSS
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi #define LCD_SDSS AUX1_07 // Panelolu2 SD card reader rather than the Melzi
#endif #endif
#else #else
#define BTN_ENC 30 #define BTN_ENC AUX1_07
#endif #endif
#else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2 #else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
#define BTN_ENC 16 #define BTN_ENC AUX1_02
#ifndef LCD_SDSS #ifndef LCD_SDSS
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #define LCD_SDSS AUX1_03 // Smart Controller SD card reader rather than the Melzi
#endif #endif
#endif #endif
#if IS_NEWPANEL && !defined(BTN_EN1) #if IS_NEWPANEL && !defined(BTN_EN1)
#define BTN_EN1 11 #define BTN_EN1 AUX1_08
#define BTN_EN2 10 #define BTN_EN2 AUX1_06
#endif #endif
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
@ -273,8 +291,8 @@
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !ALL(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !ALL(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM #define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown! #define SPINDLE_LASER_ENA_PIN AUX1_06 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 11 #define SPINDLE_DIR_PIN AUX1_08
#elif !MB(MELZI) // use X stepper motor socket #elif !MB(MELZI) // use X stepper motor socket

8
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View file

@ -170,7 +170,7 @@
* (CS) D11 | 3 4 | D10 (DC/D4) * (CS) D11 | 3 4 | D10 (DC/D4)
* (EN2) D12 5 6 | D4 or D3 (EN/RS) * (EN2) D12 5 6 | D4 or D3 (EN/RS)
* (ENC) D29 | 7 8 | D2 (EN1) * (ENC) D29 | 7 8 | D2 (EN1)
* (GND) | 9 10 | (5V) * GND | 9 10 | 5V
* ------ * ------
*/ */
#define EXP1_01_PIN 5 #define EXP1_01_PIN 5
@ -193,9 +193,9 @@
#define LCDSCREEN_NAME "ZONESTAR_12864LCD" #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
//#define LCD_SDSS EXP1_03_PIN //#define LCD_SDSS EXP1_03_PIN
#define LCD_PINS_RS EXP1_03_PIN // ST7920_CS_PIN (LCD module pin 4) #define LCD_PINS_RS EXP1_03_PIN // ST7920 CS (LCD-4)
#define LCD_PINS_EN EXP1_06_PIN // ST7920_DAT_PIN (LCD module pin 5) #define LCD_PINS_EN EXP1_06_PIN // ST7920 DAT (LCD-5)
#define LCD_PINS_D4 EXP1_04_PIN // ST7920_CLK_PIN (LCD module pin 6) #define LCD_PINS_D4 EXP1_04_PIN // ST7920 CLK (LCD-6)
#define BOARD_ST7920_DELAY_1 DELAY_2_NOP #define BOARD_ST7920_DELAY_1 DELAY_2_NOP
#define BOARD_ST7920_DELAY_2 DELAY_2_NOP #define BOARD_ST7920_DELAY_2 DELAY_2_NOP

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
View file

@ -176,8 +176,8 @@
// //
#define CASE_LIGHT_PIN PA13 #define CASE_LIGHT_PIN PA13
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA8 #define BOARD_NEOPIXEL_PIN PA8
#endif #endif
#define SUICIDE_PIN PC13 #define SUICIDE_PIN PC13

16
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View file

@ -183,6 +183,19 @@
#define EXP1_07_PIN PB8 #define EXP1_07_PIN PB8
#define EXP1_08_PIN PB7 #define EXP1_08_PIN PB7
/* -----
* | 1 | RST
* | 2 | PA3 RX2
* | 3 | PA2 TX2
* | 4 | GND
* | 5 | 5V
* -----
* TFT
*/
#define TFT_02 PA3
#define TFT_03 PA2
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
@ -347,9 +360,8 @@
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
// //
// SD Support // SD Card
// //
#ifndef SDCARD_CONNECTION #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#endif #endif

4
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
View file

@ -25,8 +25,8 @@
#define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2" #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2"
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PC7 // LED driving pin #define BOARD_NEOPIXEL_PIN PC7 // LED driving pin
#endif #endif
/** /**

10
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
View file

@ -55,7 +55,13 @@
* ------ * ------
* EXP1 * EXP1
*/ */
#define EXP1_01_PIN PB5
#define EXP1_02_PIN PA15 #define EXP1_02_PIN PA15
#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 PB15 #define EXP1_08_PIN PB15
#include "pins_BTT_SKR_MINI_E3_common.h" #include "pins_BTT_SKR_MINI_E3_common.h"
@ -63,8 +69,8 @@
// Release PA13/PA14 (led, usb control) from SWD pins // Release PA13/PA14 (led, usb control) from SWD pins
#define DISABLE_DEBUG #define DISABLE_DEBUG
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA8 // LED driving pin #define BOARD_NEOPIXEL_PIN PA8 // LED driving pin
#endif #endif
#ifndef PS_ON_PIN #ifndef PS_ON_PIN

23
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View file

@ -131,16 +131,29 @@
* ------ ------ * ------ ------
* EXP1 EXP1 * EXP1 EXP1
*/ */
#ifndef EXP1_02_PIN #ifndef EXP1_08_PIN
#define EXP1_02_PIN PB6
#define EXP1_08_PIN PB7
#endif
#define EXP1_01_PIN PB5 #define EXP1_01_PIN PB5
#define EXP1_02_PIN PB6
#define EXP1_03_PIN PA9 #define EXP1_03_PIN PA9
#define EXP1_04_PIN -1 // RESET #define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN PA10 #define EXP1_05_PIN PA10
#define EXP1_06_PIN PB9 #define EXP1_06_PIN PB9
#define EXP1_07_PIN PB8 #define EXP1_07_PIN PB8
#define EXP1_08_PIN PB7
#endif
/* -----
* | 1 | RST
* | 2 | PA3 RX2
* | 3 | PA2 TX2
* | 4 | GND
* | 5 | 5V
* -----
* TFT
*/
#define TFT_02 PA3
#define TFT_03 PA2
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/** /**
@ -303,7 +316,7 @@
* (RX2) PA3 | 2 | BTN_EN1 | 8 7 | (SS) * (RX2) PA3 | 2 | BTN_EN1 | 8 7 | (SS)
* (TX2) PA2 | 3 | BTN_EN2 | 6 5 | MOSI * (TX2) PA2 | 3 | BTN_EN2 | 6 5 | MOSI
* GND | 4 | (CD) | 4 3 | (RST) * GND | 4 | (CD) | 4 3 | (RST)
* 5V | 5 | (GND) | 2 1 | (KILL) * 5V | 5 | GND | 2 1 | (KILL)
* --- ------ * --- ------
* TFT EXP2 * TFT EXP2
* *

2
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
View file

@ -121,7 +121,7 @@
#define FAN2_PIN PB9 // FAN (fan1 on board) controller cool fan #define FAN2_PIN PB9 // FAN (fan1 on board) controller cool fan
// One NeoPixel onboard and a connector for other NeoPixels // One NeoPixel onboard and a connector for other NeoPixels
#define NEOPIXEL_PIN PC7 // The NEOPIXEL LED driving pin #define BOARD_NEOPIXEL_PIN PC7 // The NEOPIXEL LED driving pin
/** /**
* ------ * ------

12
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View file

@ -169,6 +169,18 @@
#define ONBOARD_SDIO #define ONBOARD_SDIO
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer #define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
/** Debug port
* -----
* | 1 | VCC
* | 2 | PA13
* | 3 | PA14
* | 4 | GND
* -----
*/
#define DEBUG_02_PIN PA13
#define DEBUG_03_PIN PA14
#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI) #if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
/** /**

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

@ -241,8 +241,8 @@
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
#define LED_PWM PC7 // IO1 #define LED_PWM PC7 // IO1
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN LED_PWM // USED WIFI IO0/IO1 PIN #define BOARD_NEOPIXEL_PIN LED_PWM // USED WIFI IO0/IO1 PIN
#endif #endif
#endif #endif

44
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View file

@ -272,6 +272,17 @@
* to let the bootloader init the screen. * to let the bootloader init the screen.
*/ */
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_WORDS 14400
#endif
#if HAS_SPI_TFT #if HAS_SPI_TFT
// Shared SPI TFT // Shared SPI TFT
@ -302,27 +313,16 @@
#define LCD_USE_DMA_SPI #define LCD_USE_DMA_SPI
#endif #elif HAS_WIRED_LCD
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_WORDS 14400
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT
#define BEEPER_PIN EXP1_01_PIN #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN #define BTN_ENC EXP1_02_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXP2_03_PIN #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN #define BTN_EN2 EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
@ -363,7 +363,7 @@
#endif #endif
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else // !MKS_MINI_12864 #else // !FYSETC_MINI_12864_2_1
#define LCD_PINS_D4 EXP1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL #if IS_ULTIPANEL
@ -381,10 +381,14 @@
#define BOARD_ST7920_DELAY_2 125 #define BOARD_ST7920_DELAY_2 125
#define BOARD_ST7920_DELAY_3 125 #define BOARD_ST7920_DELAY_3 125
#endif // !MKS_MINI_12864 #endif // !FYSETC_MINI_12864_2_1
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT #endif // HAS_WIRED_LCD && !HAS_SPI_TFT
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_01_PIN
#endif
#define SPI_FLASH #define SPI_FLASH
#if ENABLED(SPI_FLASH) #if ENABLED(SPI_FLASH)
#define SPI_FLASH_SIZE 0x1000000 // 16MB #define SPI_FLASH_SIZE 0x1000000 // 16MB
@ -394,10 +398,6 @@
#define SPI_FLASH_MOSI_PIN PB15 #define SPI_FLASH_MOSI_PIN PB15
#endif #endif
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_01_PIN
#endif
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5
#error "MKS Robin nano default BEEPER_PIN is not a SPEAKER." #error "MKS Robin nano default BEEPER_PIN is not a SPEAKER."
#endif #endif

13
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -220,7 +220,7 @@
#define SOFTWARE_SPI #define SOFTWARE_SPI
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else #else // !FYSETC_MINI_12864_2_1
#define LCD_PINS_D4 EXP1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL #if IS_ULTIPANEL
@ -234,7 +234,7 @@
#endif #endif
#endif // !MKS_MINI_12864 #endif // !FYSETC_MINI_12864_2_1
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
@ -252,19 +252,18 @@
#endif #endif
// LED driving pin // LED driving pin
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA2 #define BOARD_NEOPIXEL_PIN PA2
#endif #endif
// //
// SD Card // SD Card
// //
#define SDCARD_CONNECTION ONBOARD #define SDCARD_CONNECTION ONBOARD
#define SPI_DEVICE 2 // Maple #define ONBOARD_SPI_DEVICE 2 // Maple
#define ONBOARD_SPI_DEVICE 2
#define SDSS SD_SS_PIN #define SDSS SD_SS_PIN
#define ONBOARD_SD_CS_PIN SD_SS_PIN #define ONBOARD_SD_CS_PIN SD_SS_PIN
#define SD_DETECT_PIN PC10 // EXP2_07_PIN #define SD_DETECT_PIN EXP2_07_PIN
#define NO_SD_HOST_DRIVE #define NO_SD_HOST_DRIVE
// TODO: This is the only way to set SPI for SD on STM32 (for now) // TODO: This is the only way to set SPI for SD on STM32 (for now)

6
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
View file

@ -80,9 +80,9 @@
#define FIL_RUNOUT_PIN PB8 // MT_DET #define FIL_RUNOUT_PIN PB8 // MT_DET
/** ------ /** ------
* (BEEPER) PD2 | 1 2 | PB3 (BTN_ENC) * (BEEPER) PD2 | 1 2 | PB3 (ENC)
* (BTN_EN1) PB5 | 3 4 | PA11 (RESET?) * (EN1) PB5 | 3 4 | PA11 (RESET?)
* (BTN_EN2) PB4 5 6 | PC1 (LCD_D4) * (EN2) PB4 5 6 | PC1 (LCD_D4)
* (LCD_RS) PC3 | 7 8 | PC2 (LCD_EN) * (LCD_RS) PC3 | 7 8 | PC2 (LCD_EN)
* GND | 9 10 | 5V * GND | 9 10 | 5V
* ------ * ------

146
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View file

@ -255,13 +255,41 @@
#define ONBOARD_SD_CS_PIN PC11 #define ONBOARD_SD_CS_PIN PC11
#elif SD_CONNECTION_IS(LCD) #elif SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1 #define ENABLE_SPI1
#define SDSS PE10 #define SDSS EXP2_04_PIN
#define SD_SCK_PIN PA5 #define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN PA6 #define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN PA7 #define SD_MOSI_PIN EXP2_06_PIN
#define SD_DETECT_PIN PE12 #define SD_DETECT_PIN EXP2_07_PIN
#endif #endif
/**
* ------ ------
* PC5 | 1 2 | PE13 PA6 | 1 2 | PA5
* PD13 | 3 4 | PC6 PE8 | 3 4 | PE10
* PE14 | 5 6 PE15 PE11 | 5 6 PA7
* PD11 | 7 8 | PD10 PE12 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN PC5
#define EXP1_02_PIN PE13
#define EXP1_03_PIN PD13
#define EXP1_04_PIN PC6
#define EXP1_05_PIN PE14
#define EXP1_06_PIN PE15
#define EXP1_07_PIN PD11
#define EXP1_08_PIN PD10
#define EXP2_01_PIN PA6
#define EXP2_02_PIN PA5
#define EXP2_03_PIN PE8
#define EXP2_04_PIN PE10
#define EXP2_05_PIN PE11
#define EXP2_06_PIN PA7
#define EXP2_07_PIN PE12
#define EXP2_08_PIN -1 // RESET
// //
// LCD / Controller // LCD / Controller
// //
@ -272,29 +300,40 @@
* to let the bootloader init the screen. * to let the bootloader init the screen.
*/ */
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_WORDS 14400
#endif
#if HAS_SPI_TFT #if HAS_SPI_TFT
// Shared SPI TFT // Shared SPI TFT
#define LCD_BACKLIGHT_PIN PD13 #define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TOUCH_CS_PIN PE14 // SPI1_NSS #define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK #define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
#define TOUCH_MISO_PIN PA6 // SPI1_MISO #define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
#define TOUCH_MOSI_PIN PA7 // SPI1_MOSI #define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
#define BTN_EN1 PE8 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 PE11 #define BTN_EN2 EXP2_05_PIN
#define BTN_ENC PE13 #define BTN_ENC EXP1_02_PIN
#define TFT_CS_PIN PD11 #define TFT_CS_PIN EXP1_07_PIN
#define TFT_SCK_PIN PA5 #define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN PA6 #define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN PA7 #define TFT_MOSI_PIN EXP2_06_PIN
#define TFT_DC_PIN PD10 #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN #define TFT_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN PC6 #define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN #define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI #define TOUCH_BUTTONS_HW_SPI
@ -302,27 +341,16 @@
#define LCD_USE_DMA_SPI #define LCD_USE_DMA_SPI
#endif #elif HAS_WIRED_LCD
#if ENABLED(TFT_CLASSIC_UI) #define BEEPER_PIN EXP1_01_PIN
// Emulated DOGM SPI
#define LCD_PINS_EN PD13
#define LCD_PINS_RS PC6
#define BTN_ENC PE13
#define BTN_EN1 PE8
#define BTN_EN2 PE11
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_WORDS 14400
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT #define BTN_ENC EXP1_02_PIN
#define BEEPER_PIN PC5 #define BTN_EN1 EXP2_03_PIN
#define BTN_ENC PE13 #define BTN_EN2 EXP2_05_PIN
#define LCD_PINS_EN PD13
#define LCD_PINS_RS PC6 #define LCD_PINS_EN EXP1_03_PIN
#define BTN_EN1 PE8 #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN2 PE11
#define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
@ -331,18 +359,18 @@
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1 #define LCD_RESET_PIN -1
#define DOGLCD_A0 PD11 #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS PE15 #define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_SCK PA5 #define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI PA7 #define DOGLCD_MOSI EXP2_06_PIN
#elif IS_TFTGLCD_PANEL #elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)
#define PIN_SPI_SCK PA5 #define PIN_SPI_SCK EXP2_02_PIN
#define PIN_TFT_MISO PA6 #define PIN_TFT_MISO EXP2_01_PIN
#define PIN_TFT_MOSI PA7 #define PIN_TFT_MOSI EXP2_06_PIN
#define TFTGLCD_CS PE8 #define TFTGLCD_CS EXP2_03_PIN
#endif #endif
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
@ -350,26 +378,26 @@
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define LCD_PINS_DC PC6 #define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS PD13 #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 DOGLCD_A0 #define DOGLCD_A0 DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN PE14 #define LCD_RESET_PIN EXP1_05_PIN
#define NEOPIXEL_PIN PE15 #define NEOPIXEL_PIN EXP1_06_PIN
#define DOGLCD_MOSI PA7 #define DOGLCD_MOSI EXP2_06_PIN
#define DOGLCD_SCK PA5 #define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#endif #endif
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270 //#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else // !MKS_MINI_12864 #else // !FYSETC_MINI_12864_2_1
#define LCD_PINS_D4 PE14 #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 PE15 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 PD11 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 PD10 #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -383,7 +411,7 @@
#define BOARD_ST7920_DELAY_3 125 #define BOARD_ST7920_DELAY_3 125
#endif #endif
#endif // !MKS_MINI_12864 #endif // !FYSETC_MINI_12864_2_1
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT #endif // HAS_WIRED_LCD && !HAS_SPI_TFT
@ -397,7 +425,7 @@
#endif #endif
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
#define BEEPER_PIN PC5 #define BEEPER_PIN EXP1_01_PIN
#endif #endif
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5

156
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View file

@ -22,7 +22,8 @@
#pragma once #pragma once
/** /**
* MKS Robin pro (STM32F103ZET6) board pin assignments * MKS Robin Pro (STM32F103ZET6) board pin assignments
* Schematic: https://github.com/makerbase-mks/MKS-Robin-Pro/blob/master/hardware/MKS%20Robin%20Pro%20V1.0_001/MKS%20Robin%20Pro%20V1.0_001%20SCH.pdf
*/ */
#include "env_validate.h" #include "env_validate.h"
@ -111,6 +112,7 @@
#ifndef E2_CS_PIN #ifndef E2_CS_PIN
#define E2_CS_PIN PG9 #define E2_CS_PIN PG9
#endif #endif
// //
// SPI pins for TMC2130 stepper drivers // SPI pins for TMC2130 stepper drivers
// //
@ -211,11 +213,11 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN PG3 #define SD_DETECT_PIN EXP2_07_PIN
#define SD_SCK_PIN PB13 #define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN PB14 #define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN PB15 #define SD_MOSI_PIN EXP2_06_PIN
#define SD_SS_PIN PG6 #define SD_SS_PIN EXP2_04_PIN
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
#define ONBOARD_SDIO #define ONBOARD_SDIO
#define SD_DETECT_PIN PD12 #define SD_DETECT_PIN PD12
@ -224,6 +226,88 @@
#error "No custom SD drive cable defined for this board." #error "No custom SD drive cable defined for this board."
#endif #endif
/** ------ ------
* (BEEPER) PC5 | 1 2 | PG2 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SCK)
* (LCD_EN) PG0 | 3 4 | PG1 (LCD_RS) (BTN_EN1) PG5 | 3 4 | PG6 (SD_SS)
* (LCD_D4) PF14 5 6 | PF15 (LCD_D5) (BTN_EN2) PG4 5 6 | PB15 (MOSI)
* (LCD_D6) PF12 | 7 8 | PF13 (LCD_D7) (SD_DETECT) PG3 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN PC5
#define EXP1_02_PIN PG2
#define EXP1_03_PIN PG0
#define EXP1_04_PIN PG1
#define EXP1_05_PIN PF14
#define EXP1_06_PIN PF15
#define EXP1_07_PIN PF12
#define EXP1_08_PIN PF13
#define EXP2_01_PIN PB14
#define EXP2_02_PIN PB13
#define EXP2_03_PIN PG5
#define EXP2_04_PIN PG6
#define EXP2_05_PIN PG4
#define EXP2_06_PIN PB15
#define EXP2_07_PIN PG3
#define EXP2_08_PIN -1 // RESET
/** -------
* | 0 | DGND-|
* 3V3 | 1 2 | DGND-|
* (D0) PD14 | 3 4 | PD15 (D1)
* (D2) PD0 | 5 6 | PD1 (D3)
* (D4) PE7 | 7 8 | PE8 (D5)
* (D6) PE9 | 9 10 | PE10 (D7)
* (D8) PE11 | 11 12 | PE12 (D9)
* (D10) PE13 | 13 14 | PE14 (D11)
* (D12) PE15 | 15 16 | PD8 (D13)
* (D14) PD9 | 17 18 | PD10 (D15)
* (NE4) PD7 | 19 20 | PD11 (A0)
* (NWE) PD5 | 21 22 | PD4 (NOE)
* (RST) PC6? | 23 24 | PD13?(LIGHT)
* (MISO2) PB14 | 25 26 | --- (INT)
* (MOSI2) PB15 | 27 28 | PC5 (BEEPER)
* (SCK2) PB13 | 29 30 | VCC
* (NSS2) PA7 | 31 32 | DGND
* -------
* FSMC
*/
//#define FSMC_00_PIN -1 // GND
//#define FSMC_01_PIN -1 // 3.3V
//#define FSMC_02_PIN -1 // GND
#define FSMC_03_PIN PD14 // D0
#define FSMC_04_PIN PD15 // D1
#define FSMC_05_PIN PD0 // D2
#define FSMC_06_PIN PD1 // D3
#define FSMC_07_PIN PE7 // D4
#define FSMC_08_PIN PE8 // D5
#define FSMC_09_PIN PE9 // D6
#define FSMC_10_PIN PE10 // D7
#define FSMC_11_PIN PE11 // D8
#define FSMC_12_PIN PE12 // D9
#define FSMC_13_PIN PE13 // D10
#define FSMC_14_PIN PE14 // D11
#define FSMC_15_PIN PE15 // D12
#define FSMC_16_PIN PD8 // D13
#define FSMC_17_PIN PD9 // D14
#define FSMC_18_PIN PD10 // D15
#define FSMC_19_PIN PD7 // NE4
#define FSMC_20_PIN PD11 // A0
#define FSMC_21_PIN PD5 // NWE
#define FSMC_22_PIN PD4 // NOE
#define FSMC_23_PIN PC6 // RST
#define FSMC_24_PIN PD13 // LIGHT
#define FSMC_25_PIN PB14 // MISO2
#define FSMC_26_PIN -1 // INT
#define FSMC_27_PIN PB15 // MOSI2
#define FSMC_28_PIN PC5 // BEEPER
#define FSMC_29_PIN PB13 // SCK2
//#define FSMC_30_PIN -1 // VCC
#define FSMC_31_PIN PA7 // NSS2
//#define FSMC_32_PIN -1 // GND
// //
// TFT with FSMC interface // TFT with FSMC interface
// //
@ -236,29 +320,29 @@
#define TFT_RESET_PIN LCD_RESET_PIN #define TFT_RESET_PIN LCD_RESET_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN #define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define FSMC_CS_PIN PD7 // NE4 #define FSMC_CS_PIN FSMC_19_PIN // NE4
#define FSMC_RS_PIN PD11 // A0 #define FSMC_RS_PIN FSMC_20_PIN // A0
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT #define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define TFT_CS_PIN FSMC_CS_PIN #define TFT_CS_PIN FSMC_CS_PIN
#define TFT_RS_PIN FSMC_RS_PIN #define TFT_RS_PIN FSMC_RS_PIN
#define LCD_RESET_PIN PC6 #define LCD_RESET_PIN FSMC_23_PIN
#define LCD_BACKLIGHT_PIN PD13 #define LCD_BACKLIGHT_PIN FSMC_24_PIN
#define TFT_BUFFER_WORDS 14400 #define TFT_BUFFER_WORDS 14400
#if NEED_TOUCH_PINS #if NEED_TOUCH_PINS
#define TOUCH_BUTTONS_HW_SPI #define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2 #define TOUCH_BUTTONS_HW_SPI_DEVICE 2
#define TOUCH_CS_PIN PA7 // SPI2_NSS #define TOUCH_CS_PIN FSMC_31_PIN // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK #define TOUCH_SCK_PIN FSMC_29_PIN // SPI2_SCK
#define TOUCH_MISO_PIN PB14 // SPI2_MISO #define TOUCH_MISO_PIN FSMC_25_PIN // SPI2_MISO
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI #define TOUCH_MOSI_PIN FSMC_27_PIN // SPI2_MOSI
#else #else
#define BEEPER_PIN PC5 #define BEEPER_PIN FSMC_28_PIN
#define BTN_ENC PG2 #define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PG5 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 PG4 #define BTN_EN2 EXP2_05_PIN
#endif #endif
#elif IS_TFTGLCD_PANEL #elif IS_TFTGLCD_PANEL
@ -269,30 +353,30 @@
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#define BEEPER_PIN PC5 #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC PG2 #define BTN_ENC EXP1_02_PIN
#define LCD_PINS_EN PG0 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS PG1 #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 PG5 #define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 PG4 #define BTN_EN2 EXP2_05_PIN
// 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)
#if ENABLED(MKS_MINI_12864) #if ANY(ENDER2_STOCKDISPLAY, MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1 #define LCD_RESET_PIN -1
#define DOGLCD_A0 PF12 #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS PF15 #define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_SCK PB13 #define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI EXP2_06_PIN
#else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY #else // !ENDER2_STOCKDISPLAY && !MKS_MINI_12864
#define LCD_PINS_D4 PF14 #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 PF15 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 PF12 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 PF13 #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -300,10 +384,10 @@
#endif #endif
#endif // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#endif #endif
#endif // HAS_WIRED_LCD
// Alter timing for graphical display // Alter timing for graphical display
#if IS_U8GLIB_ST7920 #if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 125 #define BOARD_ST7920_DELAY_1 125

64
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
View file

@ -181,17 +181,15 @@
// //
// Misc. Functions // Misc. Functions
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PB7 // LED driving pin #define BOARD_NEOPIXEL_PIN PB7 // LED driving pin
#endif #endif
#ifndef PS_ON_PIN #ifndef PS_ON_PIN
#define PS_ON_PIN PE1 // Power Supply Control #define PS_ON_PIN PE1 // Power Supply Control
#endif #endif
/** /** ------
* BTT E3 RRF
* ------
* (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) * (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC)
* (BTN_EN1) PE7 | 3 4 | RESET * (BTN_EN1) PE7 | 3 4 | RESET
* (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) * (BTN_EN2) PB2 5 6 | PE10 (LCD_D4)
@ -200,20 +198,28 @@
* ------ * ------
* EXP1 * EXP1
*/ */
#define EXP1_01_PIN PE8
#define EXP1_02_PIN PE9
#define EXP1_03_PIN PE7
#define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN PB2
#define EXP1_06_PIN PE10
#define EXP1_07_PIN PB1
#define EXP1_08_PIN PE11
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI) #if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
#define BEEPER_PIN PE8 #define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC PE9 #define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PE7 #define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 PB2 #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_RS PB1 #define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_EN PE11 #define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_D4 PE10 #define LCD_PINS_EN EXP1_08_PIN
#if ENABLED(LCD_FOR_MELZI) #if ENABLED(LCD_FOR_MELZI)
@ -257,24 +263,24 @@
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)" #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif #endif
#define LCD_PINS_RS PE10 #define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_EN PE9 #define LCD_PINS_EN EXP1_02_PIN
#define LCD_PINS_D4 PB1 #define LCD_PINS_D4 EXP1_07_PIN
#define LCD_PINS_D5 PB2 #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 PE7 #define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 PE8 #define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN PB0 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD! #define ADC_KEYPAD_PIN PB0 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define BTN_ENC PE9 #define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PE7 #define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 PB2 #define BTN_EN2 EXP1_05_PIN
#define DOGLCD_CS PB1 #define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 PE10 #define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK PE8 #define DOGLCD_SCK EXP1_01_PIN
#define DOGLCD_MOSI PE11 #define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
@ -316,7 +322,7 @@
* EXP1-1 ----------- EXP1-7 SD_DET * EXP1-1 ----------- EXP1-7 SD_DET
*/ */
#define TFTGLCD_CS PE7 #define TFTGLCD_CS EXP1_03_PIN
#endif #endif
@ -373,10 +379,10 @@
#define CLCD_SPI_BUS 1 // SPI1 connector #define CLCD_SPI_BUS 1 // SPI1 connector
#define BEEPER_PIN PE9 #define BEEPER_PIN EXP1_02_PIN
#define CLCD_MOD_RESET PE7 #define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS PB1 #define CLCD_SPI_CS EXP1_07_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

5
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View file

@ -501,6 +501,7 @@
#endif #endif
#endif #endif
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
// Alter timing for graphical display // Alter timing for graphical display
@ -531,8 +532,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PB0 #define BOARD_NEOPIXEL_PIN PB0
#endif #endif
#if ENABLED(WIFISUPPORT) #if ENABLED(WIFISUPPORT)

4
Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
View file

@ -90,8 +90,8 @@
#define POWER_LOSS_PIN PC13 // Power Loss Detection: PWR-DET #define POWER_LOSS_PIN PC13 // Power Loss Detection: PWR-DET
#endif #endif
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA14 // LED driving pin #define BOARD_NEOPIXEL_PIN PA14 // LED driving pin
#endif #endif
#ifndef PS_ON_PIN #ifndef PS_ON_PIN

4
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file

@ -640,8 +640,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PE6 #define BOARD_NEOPIXEL_PIN PE6
#endif #endif
#if ENABLED(WIFISUPPORT) #if ENABLED(WIFISUPPORT)

2
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
View file

@ -255,7 +255,7 @@
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#define KILL_PIN -1 // NC #define KILL_PIN -1 // NC
#define NEOPIXEL_PIN EXP1_07_PIN #define BOARD_NEOPIXEL_PIN EXP1_07_PIN
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD

1
Marlin/src/pins/stm32f4/pins_LERDGE_K.h
View file

@ -206,7 +206,6 @@
// //
#define LED_PIN PA15 // Status LED #define LED_PIN PA15 // Status LED
//#define CASE_LIGHT_PIN PB6 // LED Ribbon Connector (PWM TIM4_CH1) //#define CASE_LIGHT_PIN PB6 // LED Ribbon Connector (PWM TIM4_CH1)
//#define NEOPIXEL_PIN -1
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN PB8 // swap R and G pin for compatibility with real wires #define RGB_LED_R_PIN PB8 // swap R and G pin for compatibility with real wires
#endif #endif

1
Marlin/src/pins/stm32f4/pins_LERDGE_X.h
View file

@ -113,7 +113,6 @@
// //
//#define CASE_LIGHT_PIN_CI -1 //#define CASE_LIGHT_PIN_CI -1
//#define CASE_LIGHT_PIN_DO -1 //#define CASE_LIGHT_PIN_DO -1
//#define NEOPIXEL_PIN -1
// //
// SD support (On board) // SD support (On board)

4
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
View file

@ -59,8 +59,6 @@
#endif #endif
// The FYSETC_MINI_12864_2_1 uses one of the EXP pins // The FYSETC_MINI_12864_2_1 uses one of the EXP pins
#if DISABLED(FYSETC_MINI_12864_2_1) && !defined(NEOPIXEL_PIN) #define BOARD_NEOPIXEL_PIN PC5
#define NEOPIXEL_PIN PC5
#endif
#include "pins_MKS_MONSTER8_common.h" #include "pins_MKS_MONSTER8_common.h"

4
Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
View file

@ -359,8 +359,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PC5 #define BOARD_NEOPIXEL_PIN PC5
#endif #endif
// //

4
Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
View file

@ -163,9 +163,9 @@
#define FAN_SOFT_PWM_REQUIRED #define FAN_SOFT_PWM_REQUIRED
// //
// Neopixel // NeoPixel
// //
#define NEOPIXEL_PIN PC7 #define BOARD_NEOPIXEL_PIN PC7
#define NEOPIXEL2_PIN PC8 #define NEOPIXEL2_PIN PC8
// //

4
Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h
View file

@ -163,9 +163,9 @@
#define FAN_SOFT_PWM_REQUIRED #define FAN_SOFT_PWM_REQUIRED
// //
// Neopixel // NeoPixel
// //
#define NEOPIXEL_PIN PC7 #define BOARD_NEOPIXEL_PIN PC7
#define NEOPIXEL2_PIN PC8 #define NEOPIXEL2_PIN PC8
// //

50
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
View file

@ -139,28 +139,56 @@
#define SD_DETECT_PIN PB0 #define SD_DETECT_PIN PB0
#define BEEPER_PIN PE8 #define BEEPER_PIN PE8
/**
* ------ ------
* (BEEPER) ???? | 1 2 | PE7 (BTN_ENC) (MISO) ???? | 1 2 | ???? (SCK)
* (LCD_EN) PE9 | 3 4 | PE10 (LCD_RS) (BTN_EN1) PB2 | 3 4 | ???? (SD_SS)
* (LCD_D4) PE12 | 5 6 PE13 (LCD_D5) (BTN_EN2) PB1 | 5 6 ???? (MOSI)
* (LCD_D6) PE14 | 7 8 | PE15 (LCD_D7) (SD_DETECT) ???? | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_01_PIN -1
#define EXP1_02_PIN PE7 // ENC
#define EXP1_03_PIN PE9
#define EXP1_04_PIN PE10
#define EXP1_05_PIN PE12
#define EXP1_06_PIN PE13 // CS
#define EXP1_07_PIN PE14 // A0
#define EXP1_08_PIN PE15
#define EXP2_01_PIN -1
#define EXP2_02_PIN -1
#define EXP2_03_PIN PB2 // EN1
#define EXP2_04_PIN -1
#define EXP2_05_PIN PB1 // EN2
#define EXP2_06_PIN -1
#define EXP2_07_PIN -1
#define EXP2_08_PIN -1
// //
// LCD / Controller // LCD / Controller
// //
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#define BTN_EN1 PB2 #define BTN_ENC EXP1_02_PIN
#define BTN_EN2 PB1 #define BTN_EN1 EXP2_03_PIN
#define BTN_ENC PE7 #define BTN_EN2 EXP2_05_PIN
#define LCD_PINS_RS PE10 #define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_EN PE9 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_D4 PE12 #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS PE13 #define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_A0 PE14 #define DOGLCD_A0 EXP1_07_PIN
#endif #endif
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 PE13 #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 PE14 #define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 PE15 #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder

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

@ -45,9 +45,9 @@
#endif #endif
// //
// Neopixels // NeoPixel
// //
#define NEOPIXEL_PIN PA8 #define BOARD_NEOPIXEL_PIN PA8
// //
// Servos // Servos

4
Marlin/src/pins/stm32g0/pins_BTT_EBB42_V1_1.h
View file

@ -133,8 +133,8 @@
// //
// Default NEOPIXEL_PIN // Default NEOPIXEL_PIN
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PD3 // LED driving pin #define BOARD_NEOPIXEL_PIN PD3 // LED driving pin
#endif #endif
// //

4
Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h
View file

@ -348,6 +348,6 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PC7 // RGB #define BOARD_NEOPIXEL_PIN PC7 // RGB
#endif #endif

4
Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h
View file

@ -303,8 +303,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PD0 #define BOARD_NEOPIXEL_PIN PD0
#endif #endif
#ifndef NEOPIXEL2_PIN #ifndef NEOPIXEL2_PIN

4
Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h
View file

@ -331,8 +331,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PC11 // RGB1 #define BOARD_NEOPIXEL_PIN PC11 // RGB1
#endif #endif
#ifndef NEOPIXEL2_PIN #ifndef NEOPIXEL2_PIN

4
Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_0.h
View file

@ -73,8 +73,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PC6 #define BOARD_NEOPIXEL_PIN PC6
#endif #endif
#ifndef NEOPIXEL2_PIN #ifndef NEOPIXEL2_PIN

4
Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_V1_1.h
View file

@ -72,8 +72,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA9 #define BOARD_NEOPIXEL_PIN PA9
#endif #endif
#ifndef NEOPIXEL2_PIN #ifndef NEOPIXEL2_PIN

20
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
View file

@ -169,6 +169,20 @@
#define EXP1_09_PIN -1 #define EXP1_09_PIN -1
#define EXP1_10_PIN -1 #define EXP1_10_PIN -1
/** SPI Port
* ------
* 5V | 1 2 | GND
* CS | 3 4 | CLK
* MOSI | 5 6 | MISO
* 3V3 | 7 8 | GND
* ------
* SPI1
*/
#define SPI1_03_PIN PD9
#define SPI1_04_PIN PA5
#define SPI1_05_PIN PA7
#define SPI1_06_PIN PA6
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/** /**
* ------ ------ ------ * ------ ------ ------
@ -442,8 +456,8 @@
#define SD_MOSI_PIN PA7 #define SD_MOSI_PIN PA7
// //
// Default NEOPIXEL_PIN // NeoPixel
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PA8 // LED driving pin #define BOARD_NEOPIXEL_PIN PA8 // LED driving pin
#endif #endif

4
Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h
View file

@ -448,8 +448,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PE10 #define BOARD_NEOPIXEL_PIN PE10
#endif #endif
#ifndef NEOPIXEL2_PIN #ifndef NEOPIXEL2_PIN
#define NEOPIXEL2_PIN PE9 #define NEOPIXEL2_PIN PE9

2
Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h
View file

@ -172,7 +172,7 @@
#define FAN1_PIN PA6 // "FAN1" #define FAN1_PIN PA6 // "FAN1"
#define FAN2_PIN PA7 // "FAN2" #define FAN2_PIN PA7 // "FAN2"
#define NEOPIXEL_PIN PH3 #define BOARD_NEOPIXEL_PIN PH3
#define NEOPIXEL2_PIN PB1 #define NEOPIXEL2_PIN PB1
#if HAS_LTDC_TFT #if HAS_LTDC_TFT

8
Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
View file

@ -23,6 +23,10 @@
#include "env_validate.h" #include "env_validate.h"
//
// https://github.com/bigtreetech/SKR-3
//
// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
//#define BTT_MOTOR_EXPANSION //#define BTT_MOTOR_EXPANSION
@ -627,8 +631,8 @@
// //
// NeoPixel LED // NeoPixel LED
// //
#ifndef NEOPIXEL_PIN #ifndef BOARD_NEOPIXEL_PIN
#define NEOPIXEL_PIN PE6 #define BOARD_NEOPIXEL_PIN PE6
#endif #endif
#if ENABLED(WIFISUPPORT) #if ENABLED(WIFISUPPORT)