🚸 Renumber EXP pins to match schematics/RRF/Klipper

This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 96d3c66b64
commit 173eb3ff71
53 changed files with 2587 additions and 2589 deletions

View File

@ -157,11 +157,11 @@
/**
* ------
* (BEEPER) PA15 |10 9 | PB6 (BTN_ENC)
* (BTN_EN1) PA9 | 8 7 | RESET
* (BTN_EN2) PA10 6 5 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 4 3 | PB7 (LCD_EN)
* GND | 2 1 | 5V
* (BEEPER) PA15 | 1 2 | PB6 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN)
* GND | 9 10 | 5V
* ------
* EXP1
*/
@ -198,11 +198,11 @@
/** Creality Ender-2 display pinout
* ------
* (SCK) PA15 |10 9 | PB6 (BTN_ENC)
* (BTN_EN1) PA9 | 8 7 | RESET
* (BTN_EN2) PA10 6 5 | PB9 (LCD_A0)
* (LCD_RS) PB8 | 4 3 | PB7 (MOSI)
* GND | 2 1 | 5V
* (SCK) PA15 | 1 2 | PB6 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_A0)
* (LCD_RS) PB8 | 7 8 | PB7 (MOSI)
* GND | 9 10 | 5V
* ------
* EXP1
*/
@ -234,11 +234,11 @@
*
* Board Display
* ------ ------
* (SD_DET) PA15 |10 9 | PB6 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PA9 | 8 7 | RESET (RESET) | 8 7 | (SD_DET)
* (SD_CS) PA10 6 5 | PB9 (MOSI) 6 5 | (LCD_CS)
* (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (MOD_RESET)
* GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
* (SD_DET) PA15 | 1 2 | PB6 (BEEPER) 5V | 1 2 | GND
* (MOD_RESET) PA9 | 3 4 | RESET (RESET) | 3 4 | (SD_DET)
* (SD_CS) PA10 5 6 | PB9 (MOSI) 5 6 | (LCD_CS)
* (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (MOD_RESET)
* GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*

View File

@ -120,11 +120,11 @@
/**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* ------ ------
* (BEEPER) PB5 |10 9 | PB6 (BTN_ENC) (BEEPER) PB5 |10 9 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 8 7 | RESET (BTN_EN1) PA9 | 8 7 | RESET
* (BTN_EN2) PA10 6 5 | PB9 (LCD_D4) (BTN_EN2) PA10 6 5 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 4 3 | PB7 (LCD_EN) (LCD_RS) PB8 | 4 3 | PB15 (LCD_EN)
* GND | 2 1 | 5V GND | 2 1 | 5V
* (BEEPER) PB5 | 1 2 | PB6 (BTN_ENC) (BEEPER) PB5 | 1 2 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4) (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN) (LCD_RS) PB8 | 7 8 | PB15 (LCD_EN)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP1
*/
@ -139,11 +139,11 @@
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
* ------ ------ ------
* (ENT) |10 9 | (BEEP) |10 9 | |10 9 |
* (RX) | 8 7 | (RX) | 8 7 | (TX) RX | 8 7 | TX
* (TX) 6 5 | (ENT) 6 5 | (BEEP) ENT | 6 5 | BEEP
* (B) | 4 3 | (A) (B) | 4 3 | (A) B | 4 3 | A
* GND | 2 1 | (VCC) GND | 2 1 | VCC GND | 2 1 | VCC
* (ENT) | 1 2 | (BEEP) | 1 2 | | 1 2 |
* (RX) | 3 4 | (RX) | 3 4 | (TX) RX | 3 4 | TX
* (TX) 5 6 | (ENT) 5 6 | (BEEP) ENT | 5 6 | BEEP
* (B) | 7 8 | (A) (B) | 7 8 | (A) B | 7 8 | A
* GND | 9 10 | (VCC) GND | 9 10 | VCC GND | 9 10 | VCC
* ------ ------ ------
* EXP1 DWIN DWIN (plug)
*
@ -214,11 +214,11 @@
*
* Board Display
* ------ ------
* (SD_DET) PB5 |10 9 | PB6 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PA9 | 8 7 | RESET -- | 8 7 | (SD_DET)
* (SD_CS) PA10 6 5 | PB9 (MOSI) | 6 5 | --
* (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (LCD_CS)
* GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
* (SD_DET) PB5 | 1 2 | PB6 (BEEPER) 5V | 1 2 | GND
* (MOD_RESET) PA9 | 3 4 | RESET -- | 3 4 | (SD_DET)
* (SD_CS) PA10 5 6 | PB9 (MOSI) | 5 6 | --
* (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (LCD_CS)
* GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
@ -253,20 +253,20 @@
*
* Board Display
* ------ ------
* PB5 |10 9 | PA15 (BEEP) |10 9 | BTN_ENC
* PA9 | 8 7 | RESET LCD_CS | 8 7 | LCD A0
* PA10 | 6 5 | PB9 LCD_RST | 6 5 | RED
* PB8 | 4 3 | PB15 (GREEN) | 4 3 | (BLUE)
* GND | 2 1 | 5V GND | 2 1 | 5V
* PB5 | 1 2 | PA15 (BEEP) | 1 2 | BTN_ENC
* PA9 | 3 4 | RESET LCD_CS | 3 4 | LCD A0
* PA10 | 5 6 | PB9 LCD_RST | 5 6 | RED
* PB8 | 7 8 | PB15 (GREEN) | 7 8 | (BLUE)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP1
*
* --- ------
* RST | 1 | (MISO) |10 9 | SCK
* (RX2) PA2 | 2 | BTN_EN1 | 8 7 | (SS)
* (TX2) PA3 | 3 | BTN_EN2 | 6 5 | MOSI
* GND | 4 | (CD) | 4 3 | (RST)
* 5V | 5 | (GND) | 2 1 | (KILL)
* RST | 1 | (MISO) | 1 2 | SCK
* (RX2) PA2 | 2 | BTN_EN1 | 3 4 | (SS)
* (TX2) PA3 | 3 | BTN_EN2 | 5 6 | MOSI
* GND | 4 | (CD) | 7 8 | (RST)
* 5V | 5 | (GND) | 9 10 | (KILL)
* --- ------
* TFT EXP2
*
@ -325,11 +325,11 @@
*
* Board Display
* ------ ------
* (SD_DET) PB5 |10 9 | PB6 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PA9 | 8 7 | RESET (RESET) | 8 7 | (SD_DET)
* (SD_CS) PA10 6 5 | PB9 (MOSI) | 6 5 | (LCD_CS)
* (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (MOD_RESET)
* GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
* (SD_DET) PB5 | 1 2 | PB6 (BEEPER) 5V | 1 2 | GND
* (MOD_RESET) PA9 | 3 4 | RESET (RESET) | 3 4 | (SD_DET)
* (SD_CS) PA10 5 6 | PB9 (MOSI) | 5 6 | (LCD_CS)
* (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (MOD_RESET)
* GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*

View File

@ -111,47 +111,47 @@
#define TEMP_0_PIN PA0 // Analog Input
/** ------ ------
* (BEEPER) PC10 |10 9 | PC11 (BTN_ENC) (MISO) PB4 |10 9 | PB3 (SCK)
* (LCD_EN) PB6 | 8 7 | PC12 (LCD_RS) (BTN_EN1) PD2 | 8 7 | PA15 (SD_SS)
* (LCD_D4) PC13 6 5 | PB7 (LCD_D5) (BTN_EN2) PB8 6 5 | PB5 (MOSI)
* (LCD_D6) PC15 | 4 3 | PC14 (LCD_D7) (SD_DETECT) PB9 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | --
* (BEEPER) PC10 | 1 2 | PC11 (BTN_ENC) (MISO) PB4 | 1 2 | PB3 (SCK)
* (LCD_EN) PB6 | 3 4 | PC12 (LCD_RS) (BTN_EN1) PD2 | 3 4 | PA15 (SD_SS)
* (LCD_D4) PC13 5 6 | PB7 (LCD_D5) (BTN_EN2) PB8 5 6 | PB5 (MOSI)
* (LCD_D6) PC15 | 7 8 | PC14 (LCD_D7) (SD_DETECT) PB9 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_03_PIN PC14
#define EXP1_04_PIN PC15
#define EXP1_05_PIN PB7
#define EXP1_06_PIN PC13
#define EXP1_07_PIN PC12
#define EXP1_08_PIN PB6
#define EXP1_09_PIN PC11
#define EXP1_10_PIN PC10
#define EXP1_08_PIN PC14
#define EXP1_07_PIN PC15
#define EXP1_06_PIN PB7
#define EXP1_05_PIN PC13
#define EXP1_04_PIN PC12
#define EXP1_03_PIN PB6
#define EXP1_02_PIN PC11
#define EXP1_01_PIN PC10
#define EXP2_03_PIN -1 // RESET
#define EXP2_04_PIN PB9
#define EXP2_05_PIN PB5
#define EXP2_06_PIN PB8
#define EXP2_07_PIN PA15
#define EXP2_08_PIN PD2
#define EXP2_09_PIN PB3
#define EXP2_10_PIN PB4
#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN PB9
#define EXP2_06_PIN PB5
#define EXP2_05_PIN PB8
#define EXP2_04_PIN PA15
#define EXP2_03_PIN PD2
#define EXP2_02_PIN PB3
#define EXP2_01_PIN PB4
//
// LCD / Controller
//
#if HAS_WIRED_LCD
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#elif IS_TFTGLCD_PANEL
@ -159,56 +159,56 @@
#undef BTN_ENC
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS EXP2_08_PIN
#define TFTGLCD_CS EXP2_03_PIN
#endif
#define SD_DETECT_PIN EXP2_04_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#else
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#if ENABLED(FYSETC_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXP1_06_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define LCD_RESET_PIN EXP1_05_PIN
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define FORCE_SOFT_SPI // SPI MODE3
#define LED_PIN EXP1_05_PIN // red pwm
//#define LED_PIN EXP1_04_PIN // green
//#define LED_PIN EXP1_03_PIN // blue
#define LED_PIN EXP1_06_PIN // red pwm
//#define LED_PIN EXP1_07_PIN // green
//#define LED_PIN EXP1_08_PIN // blue
//#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
// #ifndef RGB_LED_R_PIN
// #define RGB_LED_R_PIN EXP1_05_PIN
// #define RGB_LED_R_PIN EXP1_06_PIN
// #endif
// #ifndef RGB_LED_G_PIN
// #define RGB_LED_G_PIN EXP1_04_PIN
// #define RGB_LED_G_PIN EXP1_07_PIN
// #endif
// #ifndef RGB_LED_B_PIN
// #define RGB_LED_B_PIN EXP1_03_PIN
// #define RGB_LED_B_PIN EXP1_08_PIN
// #endif
//#elif ENABLED(FYSETC_MINI_12864_2_1)
// #define NEOPIXEL_PIN EXP1_05_PIN
// #define NEOPIXEL_PIN EXP1_06_PIN
//#endif
#else // !FYSETC_MINI_12864
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -241,11 +241,11 @@
#if SD_CONNECTION_IS(LCD)
#define SPI_DEVICE 3
#define SD_DETECT_PIN EXP2_04_PIN
#define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXP2_05_PIN
#define SD_SS_PIN EXP2_07_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define SD_SS_PIN EXP2_04_PIN
#elif SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PA3
#define SD_SCK_PIN PA5

View File

@ -123,35 +123,35 @@
/**
* ------
* PB5 |10 9 | PB6
* PA2 | 8 7 | RESET
* PA3 6 5 | PB8
* PB7 | 4 3 | PA4
* GND | 2 1 | VCC5
* PB5 | 1 2 | PB6
* PA2 | 3 4 | RESET
* PA3 5 6 | PB8
* PB7 | 7 8 | PA4
* GND | 9 10 | VCC5
* ------
* EXP1
*/
#define EXP1_03_PIN PA4
#define EXP1_04_PIN PB7
#define EXP1_05_PIN PB8
#define EXP1_06_PIN PA3
#define EXP1_07_PIN -1 // RESET
#define EXP1_08_PIN PA2
#define EXP1_09_PIN PB6
#define EXP1_10_PIN PB5
#define EXP1_08_PIN PA4
#define EXP1_07_PIN PB7
#define EXP1_06_PIN PB8
#define EXP1_05_PIN PA3
#define EXP1_04_PIN -1 // RESET
#define EXP1_03_PIN PA2
#define EXP1_02_PIN PB6
#define EXP1_01_PIN PB5
//
// LCD / Controller
//
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN EXP1_10_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_09_PIN
#define BEEPER_PIN EXP1_01_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_02_PIN
#define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_05_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
#define LCD_PINS_RS EXP1_07_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_06_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_08_PIN // DATA MOSI
#endif
// Alter timing for graphical display

View File

@ -168,11 +168,11 @@
/**
* RET6 12864 LCD
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
* PB14 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 5V
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PE8
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
* EXP1
*/
@ -194,11 +194,11 @@
/**
* VET6 12864 LCD
* ------
* ? |10 9 | PC5
* PB10 | 8 7 | ?
* PA6 6 5 | PA5
* PA4 | 4 3 | PA7
* GND | 2 1 | 5V
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
* EXP1
*/

View File

@ -150,58 +150,58 @@
/**
* RET6 12864 LCD
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
* PB14 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 5V
* PC6 | 1 2 | PB2
* PB10 | 3 4 | PE8
* PB14 5 6 | PB13
* PB12 | 7 8 | PB15
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_03_PIN PB15
#define EXP1_04_PIN PB12
#define EXP1_05_PIN PB13
#define EXP1_06_PIN PB14
#define EXP1_07_PIN PE8
#define EXP1_08_PIN PB10
#define EXP1_09_PIN PB2
#define EXP1_10_PIN PC6
#define EXP1_08_PIN PB15
#define EXP1_07_PIN PB12
#define EXP1_06_PIN PB13
#define EXP1_05_PIN PB14
#define EXP1_04_PIN PE8
#define EXP1_03_PIN PB10
#define EXP1_02_PIN PB2
#define EXP1_01_PIN PC6
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_01_PIN
#elif ENABLED(VET6_12864_LCD)
/**
* VET6 12864 LCD
* ------
* ? |10 9 | PC5
* PB10 | 8 7 | ?
* PA6 6 5 | PA5
* PA4 | 4 3 | PA7
* GND | 2 1 | 5V
* ? | 1 2 | PC5
* PB10 | 3 4 | ?
* PA6 5 6 | PA5
* PA4 | 7 8 | PA7
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_03_PIN PA7
#define EXP1_04_PIN PA4
#define EXP1_05_PIN PA5
#define EXP1_06_PIN PA6
#define EXP1_07_PIN -1
#define EXP1_08_PIN PB10
#define EXP1_09_PIN PC5
#define EXP1_10_PIN -1
#define EXP1_08_PIN PA7
#define EXP1_07_PIN PA4
#define EXP1_06_PIN PA5
#define EXP1_05_PIN PA6
#define EXP1_04_PIN -1
#define EXP1_03_PIN PB10
#define EXP1_02_PIN PC5
#define EXP1_01_PIN -1
#else
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI

View File

@ -85,13 +85,13 @@
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI EXP2_05_PIN
#define TMC_SW_MOSI EXP2_06_PIN
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO EXP2_10_PIN
#define TMC_SW_MISO EXP2_01_PIN
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK EXP2_09_PIN
#define TMC_SW_SCK EXP2_02_PIN
#endif
#endif
@ -123,31 +123,31 @@
#define TEMP_0_PIN PC1 // Analog Input
/** ------ ------
* (BEEPER) PC14 |10 9 | PC13 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SD_SCK)
* (LCD_EN) PB9 | 8 7 | PB8 (LCD_RS) (BTN_EN1) PB3 | 8 7 | PB12 (SD_CS2)
* (LCD_D4) PB7 6 5 | PB6 (LCD_D5) (BTN_EN2) PD2 6 5 | PB15 (SD_MOSI)
* (LCD_D6) PB5 | 4 3 | PB4 (LCD_D7) (SD_DETECT) PB11 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | --
* (BEEPER) PC14 | 1 2 | PC13 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK)
* (LCD_EN) PB9 | 3 4 | PB8 (LCD_RS) (BTN_EN1) PB3 | 3 4 | PB12 (SD_CS2)
* (LCD_D4) PB7 5 6 | PB6 (LCD_D5) (BTN_EN2) PD2 5 6 | PB15 (SD_MOSI)
* (LCD_D6) PB5 | 7 8 | PB4 (LCD_D7) (SD_DETECT) PB11 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
#define EXP1_03_PIN PB4
#define EXP1_04_PIN PB5
#define EXP1_05_PIN PB6
#define EXP1_06_PIN PB7
#define EXP1_07_PIN PB8
#define EXP1_08_PIN PB9
#define EXP1_09_PIN PC13
#define EXP1_10_PIN PC14
#define EXP1_08_PIN PB4
#define EXP1_07_PIN PB5
#define EXP1_06_PIN PB6
#define EXP1_05_PIN PB7
#define EXP1_04_PIN PB8
#define EXP1_03_PIN PB9
#define EXP1_02_PIN PC13
#define EXP1_01_PIN PC14
#define EXP2_03_PIN -1 // RESET
#define EXP2_04_PIN PB11
#define EXP2_05_PIN PB15
#define EXP2_06_PIN PD2
#define EXP2_07_PIN PB12
#define EXP2_08_PIN PB3
#define EXP2_09_PIN PB13
#define EXP2_10_PIN PB14
#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN PB11
#define EXP2_06_PIN PB15
#define EXP2_05_PIN PD2
#define EXP2_04_PIN PB12
#define EXP2_03_PIN PB3
#define EXP2_02_PIN PB13
#define EXP2_01_PIN PB14
//
// LCD / Controller
@ -155,26 +155,26 @@
#if HAS_WIRED_LCD
#define SPI_DEVICE 2
#define SD_SS_PIN EXP2_07_PIN
#define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXP2_05_PIN
#define SD_SS_PIN EXP2_04_PIN
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define SDSS SD_SS_PIN
#define SD_DETECT_PIN EXP2_04_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_01_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#define BTN_EN1 EXP2_06_PIN
#define BTN_EN2 EXP2_08_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 EXP2_03_PIN
#define BTN_ENC EXP1_02_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder

View File

@ -133,11 +133,11 @@
/**
* EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
* ------
* (BEEPER) PC9 |10 9 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 8 7 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 6 5 | PB13 (SCK)
* (LCD_EN) PB12 | 4 3 | PB15 (MOSI)
* GND | 2 1 | 5V
* (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
* (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
* (BTN_EN1) PC10 5 6 | PB13 (SCK)
* (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
* GND | 9 10 | 5V
* ------
* EXP1
*
@ -146,23 +146,23 @@
* - Functionally the pins are assigned in the same order as on the Ender-3 board.
* - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
#define EXP1_03_PIN PB15
#define EXP1_04_PIN PB12
#define EXP1_05_PIN PB13
#define EXP1_06_PIN PC10
#define EXP1_07_PIN PB14
#define EXP1_08_PIN PC11
#define EXP1_09_PIN PC12
#define EXP1_10_PIN PC9
#define EXP1_08_PIN PB15
#define EXP1_07_PIN PB12
#define EXP1_06_PIN PB13
#define EXP1_05_PIN PC10
#define EXP1_04_PIN PB14
#define EXP1_03_PIN PC11
#define EXP1_02_PIN PC12
#define EXP1_01_PIN PC9
#if HAS_WIRED_LCD
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_01_PIN
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_SCK EXP1_05_PIN
#define DOGLCD_MOSI EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_SCK EXP1_06_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
#define FORCE_SOFT_SPI
@ -170,30 +170,30 @@
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_05_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
#define LCD_PINS_RS EXP1_07_PIN // CS -- SOFT SPI for ENDER3 LCD
#define LCD_PINS_D4 EXP1_06_PIN // SCLK
#define LCD_PINS_ENABLE EXP1_08_PIN // DATA MOSI
//#define LCD_CONTRAST_INIT 190
#if IS_NEWPANEL
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_08_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_02_PIN
#endif
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN EXP1_10_PIN
#define CLCD_MOD_RESET EXP1_08_PIN
#define CLCD_SPI_CS EXP1_04_PIN
#define BEEPER_PIN EXP1_01_PIN
#define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS EXP1_07_PIN
//#define CLCD_USE_SOFT_SPI // the Cheetah can use hardware-SPI so we do not really need this
#if ENABLED(CLCD_USE_SOFT_SPI)
#define CLCD_SOFT_SPI_MOSI EXP1_03_PIN
#define CLCD_SOFT_SPI_MISO EXP1_07_PIN
#define CLCD_SOFT_SPI_SCLK EXP1_05_PIN
#define CLCD_SOFT_SPI_MOSI EXP1_08_PIN
#define CLCD_SOFT_SPI_MISO EXP1_04_PIN
#define CLCD_SOFT_SPI_SCLK EXP1_06_PIN
#else
#define CLCD_SPI_BUS 2
#endif

View File

@ -207,31 +207,31 @@
/**
* ------ ------
* PC5 |10 9 | PE13 PA6 |10 9 | PA5
* PD13 | 8 7 | PC6 PE8 | 8 7 | PE10
* PE14 | 6 5 PE15 PE11 | 6 5 PA7
* PD11 | 4 3 | PD10 PE12 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | 3.3V
* 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_03_PIN PD10
#define EXP1_04_PIN PD11
#define EXP1_05_PIN PE15
#define EXP1_06_PIN PE14
#define EXP1_07_PIN PC6
#define EXP1_08_PIN PD13
#define EXP1_09_PIN PE13
#define EXP1_10_PIN PC5
#define EXP1_08_PIN PD10
#define EXP1_07_PIN PD11
#define EXP1_06_PIN PE15
#define EXP1_05_PIN PE14
#define EXP1_04_PIN PC6
#define EXP1_03_PIN PD13
#define EXP1_02_PIN PE13
#define EXP1_01_PIN PC5
#define EXP2_03_PIN -1
#define EXP2_04_PIN PE12
#define EXP2_05_PIN PA7
#define EXP2_06_PIN PE11
#define EXP2_07_PIN PE10
#define EXP2_08_PIN PE8
#define EXP2_09_PIN PA5
#define EXP2_10_PIN PA6
#define EXP2_08_PIN -1
#define EXP2_07_PIN PE12
#define EXP2_06_PIN PA7
#define EXP2_05_PIN PE11
#define EXP2_04_PIN PE10
#define EXP2_03_PIN PE8
#define EXP2_02_PIN PA5
#define EXP2_01_PIN PA6
//
// SD Card
@ -247,11 +247,11 @@
#define ONBOARD_SD_CS_PIN PC11
#elif SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
#define SDSS EXP2_07_PIN
#define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXP2_05_PIN
#define SD_DETECT_PIN EXP2_04_PIN
#define SDSS EXP2_04_PIN
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
//
@ -268,25 +268,25 @@
// Shared SPI TFT
#define LCD_BACKLIGHT_PIN EXP1_08_PIN
#define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
#define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
#define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
#define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
#define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
#define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
#define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
#define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define BTN_ENC EXP1_02_PIN
#define TFT_CS_PIN EXP1_04_PIN
#define TFT_SCK_PIN EXP2_09_PIN
#define TFT_MISO_PIN EXP2_10_PIN
#define TFT_MOSI_PIN EXP2_05_PIN
#define TFT_DC_PIN EXP1_03_PIN
#define TFT_CS_PIN EXP1_07_PIN
#define TFT_SCK_PIN EXP2_02_PIN
#define TFT_MISO_PIN EXP2_01_PIN
#define TFT_MOSI_PIN EXP2_06_PIN
#define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN EXP1_07_PIN
#define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@ -298,22 +298,22 @@
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define LCD_PINS_ENABLE 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_SIZE 14400
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864)
@ -323,18 +323,18 @@
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define PIN_SPI_SCK EXP2_09_PIN
#define PIN_TFT_MISO EXP2_10_PIN
#define PIN_TFT_MOSI EXP2_05_PIN
#define TFTGLCD_CS EXP2_08_PIN
#define PIN_SPI_SCK EXP2_02_PIN
#define PIN_TFT_MISO EXP2_01_PIN
#define PIN_TFT_MOSI EXP2_06_PIN
#define TFTGLCD_CS EXP2_03_PIN
#endif
#ifndef BEEPER_PIN
@ -342,14 +342,14 @@
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define LCD_PINS_DC EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXP1_06_PIN
#define NEOPIXEL_PIN EXP1_05_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define LCD_RESET_PIN EXP1_05_PIN
#define NEOPIXEL_PIN EXP1_06_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@ -357,11 +357,11 @@
#else // !MKS_MINI_12864
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -387,7 +387,7 @@
#endif
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_01_PIN
#endif
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5

View File

@ -141,82 +141,82 @@
/**
* ------ ------ ------
* (BEEPER) PC1 |10 9 | PC3 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SD_SCK) (BEEPER) PC1 |10 9 | PC3 (BTN_ENC)
* (LCD_EN) PA4 | 8 7 | PA5 (LCD_RS) (BTN_EN1) PB11 | 8 7 | PA15 (SD_SS) (BTN_EN1) PB11 | 8 7 | RESET
* (LCD_D4) PA6 6 5 | PA7 (LCD_D5) (BTN_EN2) PB0 6 5 | PB15 (SD_MOSI) (BTN_EN2) PB0 6 5 | PA6 (LCD_D4)
* (LCD_D6) PC4 | 4 3 | PC5 (LCD_D7) (SD_DETECT) PC10 | 4 3 | RESET (LCD_RS) PA5 | 4 3 | PA4 (LCD_EN)
* GND | 2 1 | 5V GND | 2 1 | -- GND | 2 1 | 5V
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (BTN_EN1) PB11 | 3 4 | RESET
* (LCD_D4) PA6 5 6 | PA7 (LCD_D5) (BTN_EN2) PB0 5 6 | PB15 (SD_MOSI) (BTN_EN2) PB0 5 6 | PA6 (LCD_D4)
* (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7) (SD_DETECT) PC10 | 7 8 | RESET (LCD_RS) PA5 | 7 8 | PA4 (LCD_EN)
* GND | 9 10 | 5V GND | 9 10 | -- GND | 9 10 | 5V
* ------ ------ ------
* EXP1 EXP2 "Ender-3 EXP1"
*/
#define EXP1_03_PIN PC5
#define EXP1_04_PIN PC4
#define EXP1_05_PIN PA7
#define EXP1_06_PIN PA6
#define EXP1_07_PIN PA5
#define EXP1_08_PIN PA4
#define EXP1_09_PIN PC3
#define EXP1_10_PIN PC1
#define EXP1_08_PIN PC5
#define EXP1_07_PIN PC4
#define EXP1_06_PIN PA7
#define EXP1_05_PIN PA6
#define EXP1_04_PIN PA5
#define EXP1_03_PIN PA4
#define EXP1_02_PIN PC3
#define EXP1_01_PIN PC1
#define EXP2_03_PIN -1 // RESET
#define EXP2_04_PIN PC10
#define EXP2_05_PIN PB15
#define EXP2_06_PIN PB0
#define EXP2_07_PIN PA15
#define EXP2_08_PIN PB11
#define EXP2_09_PIN PB13
#define EXP2_10_PIN PB14
#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN PC10
#define EXP2_06_PIN PB15
#define EXP2_05_PIN PB0
#define EXP2_04_PIN PA15
#define EXP2_03_PIN PB11
#define EXP2_02_PIN PB13
#define EXP2_01_PIN PB14
// "Ender-3 EXP1"
#define E3_EXP1_03_PIN PA4
#define E3_EXP1_04_PIN PA5
#define E3_EXP1_05_PIN PA6
#define E3_EXP1_06_PIN PB0
#define E3_EXP1_07_PIN -1 // RESET
#define E3_EXP1_08_PIN PB11
#define E3_EXP1_09_PIN PC3
#define E3_EXP1_10_PIN PC1
#define EXP3_08_PIN PA4
#define EXP3_07_PIN PA5
#define EXP3_06_PIN PA6
#define EXP3_05_PIN PB0
#define EXP3_04_PIN -1 // RESET
#define EXP3_03_PIN PB11
#define EXP3_02_PIN PC3
#define EXP3_01_PIN PC1
#if HAS_WIRED_LCD
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_05_PIN
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define LCD_PINS_DC EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXP1_06_PIN
#define NEOPIXEL_PIN EXP1_05_PIN
#define DOGLCD_MOSI EXP2_05_PIN
#define DOGLCD_SCK EXP2_09_PIN
#define LCD_RESET_PIN EXP1_05_PIN
#define NEOPIXEL_PIN EXP1_06_PIN
#define DOGLCD_MOSI EXP2_06_PIN
#define DOGLCD_SCK EXP2_02_PIN
#define FORCE_SOFT_SPI
#define SOFTWARE_SPI
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_07_PIN
#define LCD_PINS_D7 EXP1_08_PIN
#if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -254,12 +254,12 @@
#define ONBOARD_SPI_DEVICE 2
#define SDSS SD_SS_PIN
#define ONBOARD_SD_CS_PIN SD_SS_PIN
#define SD_DETECT_PIN PC10 // EXP2_04_PIN
#define SD_DETECT_PIN PC10 // EXP2_07_PIN
#define NO_SD_HOST_DRIVE
// TODO: This is the only way to set SPI for SD on STM32 (for now)
#define ENABLE_SPI2
#define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXP2_05_PIN
#define SD_SS_PIN EXP2_07_PIN
#define SD_SCK_PIN EXP2_02_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_MOSI_PIN EXP2_06_PIN
#define SD_SS_PIN EXP2_04_PIN

View File

@ -80,50 +80,50 @@
#define FIL_RUNOUT_PIN PB8 // MT_DET
/** ------
* (BEEPER) PD2 |10 9 | PB3 (BTN_ENC)
* (BTN_EN1) PB5 | 8 7 | PA11 (RESET?)
* (BTN_EN2) PB4 6 5 | PC1 (LCD_D4)
* (LCD_RS) PC3 | 4 3 | PC2 (LCD_EN)
* GND | 2 1 | 5V
* (BEEPER) PD2 | 1 2 | PB3 (BTN_ENC)
* (BTN_EN1) PB5 | 3 4 | PA11 (RESET?)
* (BTN_EN2) PB4 5 6 | PC1 (LCD_D4)
* (LCD_RS) PC3 | 7 8 | PC2 (LCD_EN)
* GND | 9 10 | 5V
* ------
* "E3" EXP1
*/
#define E3_EXP1_01_PIN -1 // 5V
#define E3_EXP1_02_PIN -1 // GND
#define E3_EXP1_03_PIN PC2
#define E3_EXP1_04_PIN PC3
#define E3_EXP1_05_PIN PC1
#define E3_EXP1_06_PIN PB4
#define E3_EXP1_07_PIN PA11 // RESET?
#define E3_EXP1_08_PIN PB5
#define E3_EXP1_09_PIN PB3
#define E3_EXP1_10_PIN PD2
#define EXP3_10_PIN -1 // 5V
#define EXP3_09_PIN -1 // GND
#define EXP3_08_PIN PC2
#define EXP3_07_PIN PC3
#define EXP3_06_PIN PC1
#define EXP3_05_PIN PB4
#define EXP3_04_PIN PA11 // RESET?
#define EXP3_03_PIN PB5
#define EXP3_02_PIN PB3
#define EXP3_01_PIN PD2
//
// LCD Pins
//
#if HAS_WIRED_LCD
#define BEEPER_PIN E3_EXP1_10_PIN
#define BTN_ENC E3_EXP1_09_PIN
#define LCD_PINS_RS E3_EXP1_04_PIN
#define BEEPER_PIN EXP3_01_PIN
#define BTN_ENC EXP3_02_PIN
#define LCD_PINS_RS EXP3_07_PIN
#define BTN_EN1 E3_EXP1_08_PIN
#define BTN_EN2 E3_EXP1_06_PIN
#define BTN_EN1 EXP3_03_PIN
#define BTN_EN2 EXP3_05_PIN
#define LCD_PINS_ENABLE E3_EXP1_03_PIN
#define LCD_PINS_ENABLE EXP3_08_PIN
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 E3_EXP1_05_PIN
#define DOGLCD_CS E3_EXP1_03_PIN
#define DOGLCD_A0 EXP3_06_PIN
#define DOGLCD_CS EXP3_08_PIN
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#else // !MKS_MINI_12864
#define LCD_PINS_D4 E3_EXP1_05_PIN
#define LCD_PINS_D4 EXP3_06_PIN
#if IS_ULTIPANEL
#define LCD_PINS_D5 -1
#define LCD_PINS_D6 -1
@ -164,12 +164,12 @@
// EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
#if ENABLED(EASYTHREED_UI)
#define BTN_HOME E3_EXP1_04_PIN // INPUT_PULLUP (unused)
#define BTN_FEED E3_EXP1_09_PIN // Run E Forward
#define BTN_RETRACT E3_EXP1_08_PIN // Run E Backward
#define BTN_PRINT E3_EXP1_07_PIN // Start File Print
#define BTN_HOME_GND E3_EXP1_03_PIN // OUTPUT (LOW)
#define BTN_FEED_GND E3_EXP1_06_PIN // OUTPUT (LOW)
#define BTN_RETRACT_GND E3_EXP1_05_PIN // OUTPUT (LOW)
#define EASYTHREED_LED_PIN E3_EXP1_10_PIN // Indicator LED
#define BTN_HOME EXP3_07_PIN // INPUT_PULLUP (unused)
#define BTN_FEED EXP3_02_PIN // Run E Forward
#define BTN_RETRACT EXP3_03_PIN // Run E Backward
#define BTN_PRINT EXP3_04_PIN // Start File Print
#define BTN_HOME_GND EXP3_08_PIN // OUTPUT (LOW)
#define BTN_FEED_GND EXP3_05_PIN // OUTPUT (LOW)
#define BTN_RETRACT_GND EXP3_06_PIN // OUTPUT (LOW)
#define EASYTHREED_LED_PIN EXP3_01_PIN // Indicator LED
#endif

View File

@ -72,14 +72,14 @@
// 2 +5V
// 1 GND
#define EXP1_03_PIN PB11
#define EXP1_04_PIN PB10
#define EXP1_05_PIN PB2
#define EXP1_06_PIN PC5
#define EXP1_07_PIN PA10
#define EXP1_08_PIN PA9
#define EXP1_09_PIN PB0
#define EXP1_10_PIN PB1
#define EXP1_08_PIN PB11
#define EXP1_07_PIN PB10
#define EXP1_06_PIN PB2
#define EXP1_05_PIN PC5
#define EXP1_04_PIN PA10
#define EXP1_03_PIN PA9
#define EXP1_02_PIN PB0
#define EXP1_01_PIN PB1
// AUX1 connector
// 1 +5V
@ -193,14 +193,14 @@
// 1 GND
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_05_PIN
#define LCD_PINS_D4 EXP1_07_PIN
//#define KILL_PIN EXP1_10_PIN
#define BEEPER_PIN EXP1_09_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#define LCD_PINS_RS EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_06_PIN
#define LCD_PINS_D4 EXP1_04_PIN
//#define KILL_PIN EXP1_01_PIN
#define BEEPER_PIN EXP1_02_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_07_PIN
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 200
#define BOARD_ST7920_DELAY_3 125
@ -221,15 +221,15 @@
#define FORCE_SOFT_SPI
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define LCD_PINS_RS EXP1_05_PIN // = LCD_RESET_PIN
#define LCD_PINS_DC EXP1_07_PIN // DC
#define DOGLCD_CS EXP1_08_PIN // CS
#define LCD_PINS_RS EXP1_06_PIN // = LCD_RESET_PIN
#define LCD_PINS_DC EXP1_04_PIN // DC
#define DOGLCD_CS EXP1_03_PIN // CS
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_MOSI EXP1_10_PIN // SDA
#define DOGLCD_SCK EXP1_09_PIN // SCK
#define DOGLCD_MOSI EXP1_01_PIN // SDA
#define DOGLCD_SCK EXP1_02_PIN // SCK
// Encoder
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_07_PIN
#endif

View File

@ -89,14 +89,14 @@
// 2 +5V +5V
// 1 GND GND
#define EXP1_03_PIN PE14
#define EXP1_04_PIN PE15
#define EXP1_05_PIN PE9
#define EXP1_06_PIN PE8
#define EXP1_07_PIN PE10
#define EXP1_08_PIN PE12
#define EXP1_09_PIN PE11
#define EXP1_10_PIN PE13
#define EXP1_08_PIN PE14
#define EXP1_07_PIN PE15
#define EXP1_06_PIN PE9
#define EXP1_05_PIN PE8
#define EXP1_04_PIN PE10
#define EXP1_03_PIN PE12
#define EXP1_02_PIN PE11
#define EXP1_01_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
@ -111,12 +111,12 @@
// 2 +5V +5V
// 1 GND GND
#define EXP2_03_PIN PB3
#define EXP2_04_PIN PB5
#define EXP2_05_PIN PB4
#define EXP2_06_PIN PA15
#define EXP2_07_PIN PA10
#define EXP2_08_PIN PA9
#define EXP2_08_PIN PB3
#define EXP2_07_PIN PB5
#define EXP2_06_PIN PB4
#define EXP2_05_PIN PA15
#define EXP2_04_PIN PA10
#define EXP2_03_PIN PA9
// AUX1 connector
// 1 +5V
@ -279,55 +279,55 @@
//
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_04_PIN
#define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_06_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_04_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_02_PIN
#define KILL_PIN -1 // EXP1_01_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_08_PIN
#define BTN_ENC EXP1_07_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_07_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_05_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN EXP2_04_PIN
#define BTN_EN1 EXP2_05_PIN
#define BTN_EN2 EXP2_07_PIN
#define BTN_ENC EXP1_10_PIN
#define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_04_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_06_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_02_PIN
#define KILL_PIN EXP2_07_PIN
#define BTN_EN1 EXP2_06_PIN
#define BTN_EN2 EXP2_04_PIN
#define BTN_ENC EXP1_01_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN EXP2_06_PIN
#define BEEPER_PIN EXP2_05_PIN
#define KILL_PIN PC0
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_04_PIN
#define BTN_ENC EXP2_05_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_07_PIN
#define BTN_ENC EXP2_06_PIN
#endif
#if ENABLED(ZONESTAR_LCD2004_KNOB)
#define LCDSCREEN_NAME "LCD2004 KNOB"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_07_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_04_PIN
#define BTN_EN1 EXP2_07_PIN
#define BTN_EN2 EXP2_05_PIN
#define BTN_ENC EXP1_10_PIN
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN EXP2_04_PIN
#define LCD_PINS_RS EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_04_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_08_PIN
#define LCD_PINS_D7 EXP1_07_PIN
#define BTN_EN1 EXP2_04_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_ENC EXP1_01_PIN
#define BEEPER_PIN EXP1_02_PIN
#define KILL_PIN EXP2_07_PIN
#elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
#define LCDSCREEN_NAME "LCD2004 5KEY"
#define LCD_PINS_RS EXP1_08_PIN
#define LCD_PINS_ENABLE EXP1_07_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_04_PIN
#define LCD_PINS_RS EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_04_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_08_PIN
#define LCD_PINS_D7 EXP1_07_PIN
#define ADC_KEYPAD_PIN PC0 // PIN6 of AUX1
#endif
@ -341,16 +341,16 @@
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
#define BLTOUCH_PROBE_PIN EXP1_06_PIN
#define BLTOUCH_GND_PIN EXP1_04_PIN
#define BLTOUCH_PROBE_PIN EXP1_05_PIN
#define BLTOUCH_GND_PIN EXP1_07_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP1_03_PIN
#define SERVO0_PIN EXP1_08_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
#define BLTOUCH_PROBE_PIN EXP2_03_PIN
#define BLTOUCH_GND_PIN EXP2_04_PIN
#define BLTOUCH_PROBE_PIN EXP2_08_PIN
#define BLTOUCH_GND_PIN EXP2_07_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP2_06_PIN
#define SERVO0_PIN EXP2_05_PIN
#else
#define BLTOUCH_PROBE_PIN PB13
#endif

View File

@ -90,14 +90,14 @@
// 2 +5V
// 1 GND
#define EXP1_03_PIN PE14
#define EXP1_04_PIN PE15
#define EXP1_05_PIN PE9
#define EXP1_06_PIN PE8
#define EXP1_07_PIN PE10
#define EXP1_08_PIN PE12
#define EXP1_09_PIN PE11
#define EXP1_10_PIN PE13
#define EXP1_08_PIN PE14
#define EXP1_07_PIN PE15
#define EXP1_06_PIN PE9
#define EXP1_05_PIN PE8
#define EXP1_04_PIN PE10
#define EXP1_03_PIN PE12
#define EXP1_02_PIN PE11
#define EXP1_01_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
@ -112,14 +112,14 @@
// 2 +5V
// 1 GND
#define EXP2_03_PIN PB3
#define EXP2_04_PIN PB5
#define EXP2_05_PIN PB4
#define EXP2_06_PIN PA15
#define EXP2_07_PIN PA10
#define EXP2_08_PIN PA9
#define EXP2_09_PIN PE7
#define EXP2_10_PIN PC0
#define EXP2_08_PIN PB3
#define EXP2_07_PIN PB5
#define EXP2_06_PIN PB4
#define EXP2_05_PIN PA15
#define EXP2_04_PIN PA10
#define EXP2_03_PIN PA9
#define EXP2_02_PIN PE7
#define EXP2_01_PIN PC0
// AUX1 connector
// 1 +5V
@ -276,32 +276,32 @@
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_09_PIN
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXP1_03_PIN
#define BTN_ENC EXP1_04_PIN
#define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP1_06_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP1_04_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP1_02_PIN
#define KILL_PIN -1 // EXP1_01_PIN
#define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXP1_08_PIN
#define BTN_ENC EXP1_07_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS EXP2_08_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP2_05_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP2_07_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP2_10_PIN
#define KILL_PIN EXP2_09_PIN
#define BTN_EN1 EXP2_03_PIN
#define BTN_EN2 EXP2_06_PIN
#define BTN_ENC EXP2_04_PIN
#define LCD_PINS_RS EXP2_03_PIN // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE EXP2_06_PIN // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 EXP2_04_PIN // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN EXP2_01_PIN
#define KILL_PIN EXP2_02_PIN
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_05_PIN
#define BTN_ENC EXP2_07_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN EXP2_06_PIN // PE11
#define KILL_PIN -1 // EXP1_10_PIN
#define BTN_EN2 EXP2_04_PIN // PE8
#define BTN_EN1 EXP2_03_PIN // PE14
#define BTN_ENC EXP2_05_PIN // PE15
#define BEEPER_PIN EXP2_05_PIN // PE11
#define KILL_PIN -1 // EXP1_01_PIN
#define BTN_EN2 EXP2_07_PIN // PE8
#define BTN_EN1 EXP2_08_PIN // PE14
#define BTN_ENC EXP2_06_PIN // PE15
#endif
// Alter timing for graphical display
@ -314,16 +314,16 @@
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
#define BLTOUCH_PROBE_PIN EXP1_06_PIN
#define BLTOUCH_GND_PIN EXP1_04_PIN
#define BLTOUCH_PROBE_PIN EXP1_05_PIN
#define BLTOUCH_GND_PIN EXP1_07_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP1_03_PIN
#define SERVO0_PIN EXP1_08_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
#define BLTOUCH_PROBE_PIN EXP2_03_PIN
#define BLTOUCH_GND_PIN EXP2_04_PIN
#define BLTOUCH_PROBE_PIN EXP2_08_PIN
#define BLTOUCH_GND_PIN EXP2_07_PIN
#undef SERVO0_PIN
#define SERVO0_PIN EXP2_06_PIN
#define SERVO0_PIN EXP2_05_PIN
#else
#define BLTOUCH_PROBE_PIN PB13 // Z1_MAX
#endif