🚸 Renumber EXP pins to match schematics/RRF/Klipper
This commit is contained in:
Scott Lahteine
@@ -513,62 +513,62 @@
|
||||
* LCD adapters come in different variants. The socket keys can be
|
||||
* on either side, and may be backwards on some boards / displays.
|
||||
*/
|
||||
#ifndef EXP1_03_PIN
|
||||
#ifndef EXP1_08_PIN
|
||||
|
||||
#define EXP1_03_PIN AUX4_13_PIN
|
||||
#define EXP1_04_PIN AUX4_14_PIN
|
||||
#define EXP1_05_PIN AUX4_15_PIN
|
||||
#define EXP1_06_PIN AUX4_16_PIN
|
||||
#define EXP1_07_PIN AUX4_18_PIN
|
||||
#define EXP1_08_PIN AUX4_17_PIN
|
||||
#define EXP1_08_PIN AUX4_13_PIN
|
||||
#define EXP1_07_PIN AUX4_14_PIN
|
||||
#define EXP1_06_PIN AUX4_15_PIN
|
||||
#define EXP1_05_PIN AUX4_16_PIN
|
||||
#define EXP1_04_PIN AUX4_18_PIN
|
||||
#define EXP1_03_PIN AUX4_17_PIN
|
||||
|
||||
#define EXP2_04_PIN AUX3_02_PIN
|
||||
#define EXP2_05_PIN AUX3_04_PIN
|
||||
#define EXP2_07_PIN AUX3_06_PIN
|
||||
#define EXP2_09_PIN AUX3_05_PIN
|
||||
#define EXP2_10_PIN AUX3_03_PIN
|
||||
#define EXP2_07_PIN AUX3_02_PIN
|
||||
#define EXP2_06_PIN AUX3_04_PIN
|
||||
#define EXP2_04_PIN AUX3_06_PIN
|
||||
#define EXP2_02_PIN AUX3_05_PIN
|
||||
#define EXP2_01_PIN AUX3_03_PIN
|
||||
|
||||
#if ENABLED(G3D_PANEL)
|
||||
/** Gadgets3D Smart Adapter
|
||||
* ------ ------
|
||||
* 4-11 |10 9 | 4-12 (MISO) 3-03 |10 9 | 3-05 (SCK)
|
||||
* 4-17 | 8 7 | 4-18 4-10 | 8 7 | 3-06
|
||||
* 4-16 6 5 | 4-15 4-09 6 5 | 3-04 (MOSI)
|
||||
* 4-14 | 4 3 | 4-13 3-02 | 4 3 | 4-07
|
||||
* (GND) 4-02 | 2 1 | 4-01 (5V) -- | 2 1 | --
|
||||
* 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_09_PIN AUX4_12_PIN
|
||||
#define EXP1_10_PIN AUX4_11_PIN
|
||||
#define EXP1_02_PIN AUX4_12_PIN
|
||||
#define EXP1_01_PIN AUX4_11_PIN
|
||||
|
||||
#define EXP2_03_PIN AUX4_07_PIN
|
||||
#define EXP2_06_PIN AUX4_09_PIN
|
||||
#define EXP2_08_PIN AUX4_10_PIN
|
||||
#define EXP2_08_PIN AUX4_07_PIN
|
||||
#define EXP2_05_PIN AUX4_09_PIN
|
||||
#define EXP2_03_PIN AUX4_10_PIN
|
||||
|
||||
#else
|
||||
|
||||
/** Smart Adapter (c) RRD
|
||||
* ------ ------
|
||||
* 4-09 |10 9 | 4-10 (MISO) 3-03 |10 9 | 3-05 (SCK)
|
||||
* 4-17 | 8 7 | 4-18 4-12 | 8 7 | 3-06
|
||||
* 4-16 6 5 | 4-15 4-11 6 5 | 3-04 (MOSI)
|
||||
* 4-14 | 4 3 | 4-13 3-02 | 4 3 | 4-07
|
||||
* (GND) 3-07 | 2 1 | 3-01 (5V) (GND) 3-07 | 2 1 | --
|
||||
* 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_09_PIN AUX4_10_PIN
|
||||
#define EXP1_10_PIN AUX4_09_PIN
|
||||
#define EXP1_02_PIN AUX4_10_PIN
|
||||
#define EXP1_01_PIN AUX4_09_PIN
|
||||
|
||||
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
|
||||
#define EXP2_03_PIN -1 // RESET
|
||||
#define EXP2_06_PIN AUX4_12_PIN
|
||||
#define EXP2_08_PIN AUX4_11_PIN
|
||||
#define EXP2_08_PIN -1 // RESET
|
||||
#define EXP2_05_PIN AUX4_12_PIN
|
||||
#define EXP2_03_PIN AUX4_11_PIN
|
||||
#else
|
||||
#define EXP2_03_PIN AUX4_07_PIN
|
||||
#define EXP2_06_PIN AUX4_11_PIN
|
||||
#define EXP2_08_PIN AUX4_12_PIN
|
||||
#define EXP2_08_PIN AUX4_07_PIN
|
||||
#define EXP2_05_PIN AUX4_11_PIN
|
||||
#define EXP2_03_PIN AUX4_12_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -588,9 +588,9 @@
|
||||
//
|
||||
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||
|
||||
#define LCD_PINS_RS EXP2_04_PIN // CS chip select /SS chip slave select
|
||||
#define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
|
||||
#define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
|
||||
#define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
|
||||
#define LCD_PINS_ENABLE EXP2_06_PIN // SID (MOSI)
|
||||
#define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
|
||||
|
||||
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
|
||||
|
||||
@@ -603,18 +603,18 @@
|
||||
|
||||
#elif ENABLED(TFTGLCD_PANEL_SPI)
|
||||
|
||||
#define TFTGLCD_CS EXP2_06_PIN
|
||||
#define TFTGLCD_CS EXP2_05_PIN
|
||||
|
||||
#else
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
#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
|
||||
|
||||
#if !IS_NEWPANEL
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
#endif
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD)
|
||||
@@ -637,25 +637,25 @@
|
||||
#else
|
||||
|
||||
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
|
||||
#define LCD_PINS_DC EXP1_05_PIN // Set as output on init
|
||||
#define LCD_PINS_RS EXP1_04_PIN // Pull low for 1s to init
|
||||
#define LCD_PINS_DC EXP1_06_PIN // Set as output on init
|
||||
#define LCD_PINS_RS EXP1_07_PIN // Pull low for 1s to init
|
||||
// DOGM SPI LCD Support
|
||||
#define DOGLCD_A0 LCD_PINS_DC
|
||||
#define DOGLCD_CS EXP1_07_PIN
|
||||
#define DOGLCD_MOSI EXP1_08_PIN
|
||||
#define DOGLCD_SCK EXP1_06_PIN
|
||||
#define DOGLCD_CS EXP1_04_PIN
|
||||
#define DOGLCD_MOSI EXP1_03_PIN
|
||||
#define DOGLCD_SCK EXP1_05_PIN
|
||||
#else
|
||||
#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_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
|
||||
#endif
|
||||
|
||||
#define LCD_PINS_D7 EXP1_03_PIN
|
||||
#define LCD_PINS_D7 EXP1_08_PIN
|
||||
|
||||
#if !IS_NEWPANEL
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -666,7 +666,7 @@
|
||||
//#define SHIFT_CLK_PIN 38
|
||||
//#define SHIFT_LD_PIN AUX2_08_PIN
|
||||
//#define SHIFT_OUT_PIN AUX2_06_PIN
|
||||
//#define SHIFT_EN_PIN EXP1_08_PIN
|
||||
//#define SHIFT_EN_PIN EXP1_03_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -682,22 +682,22 @@
|
||||
|
||||
#if IS_RRD_SC
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
#define BTN_EN1 EXP1_08_PIN
|
||||
#define BTN_EN2 EXP1_06_PIN
|
||||
#define BTN_EN1 EXP1_03_PIN
|
||||
#define BTN_EN2 EXP1_05_PIN
|
||||
#else
|
||||
#define BTN_EN1 EXP2_08_PIN
|
||||
#define BTN_EN2 EXP2_06_PIN
|
||||
#define BTN_EN1 EXP2_03_PIN
|
||||
#define BTN_EN2 EXP2_05_PIN
|
||||
#endif
|
||||
|
||||
#define BTN_ENC EXP1_09_PIN
|
||||
#define BTN_ENC EXP1_02_PIN
|
||||
#ifndef SD_DETECT_PIN
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#endif
|
||||
#ifndef KILL_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#endif
|
||||
|
||||
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
|
||||
@@ -717,7 +717,7 @@
|
||||
#define BTN_EN2 AUX4_06_PIN
|
||||
#define BTN_ENC AUX4_03_PIN
|
||||
#define LCD_SDSS SDSS
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
|
||||
#elif ENABLED(LCD_I2C_VIKI)
|
||||
|
||||
@@ -726,7 +726,7 @@
|
||||
#define BTN_ENC -1
|
||||
|
||||
#define LCD_SDSS SDSS
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#elif EITHER(VIKI2, miniVIKI)
|
||||
|
||||
@@ -734,83 +734,83 @@
|
||||
#define DOGLCD_A0 AUX2_07_PIN
|
||||
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
|
||||
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
#define STAT_LED_RED_PIN AUX4_03_PIN
|
||||
#define STAT_LED_BLUE_PIN EXP1_09_PIN
|
||||
#define STAT_LED_BLUE_PIN EXP1_02_PIN
|
||||
|
||||
#define BTN_EN1 22
|
||||
#define BTN_EN2 7
|
||||
#define BTN_ENC AUX4_08_PIN
|
||||
|
||||
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
|
||||
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||
|
||||
#define DOGLCD_CS EXP1_03_PIN
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_08_PIN
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
|
||||
#define BEEPER_PIN EXP1_06_PIN
|
||||
#define LCD_BACKLIGHT_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP1_05_PIN
|
||||
#define LCD_BACKLIGHT_PIN EXP2_05_PIN
|
||||
|
||||
#define BTN_EN1 EXP1_09_PIN
|
||||
#define BTN_EN2 EXP1_10_PIN
|
||||
#define BTN_ENC EXP2_08_PIN
|
||||
#define BTN_EN1 EXP1_02_PIN
|
||||
#define BTN_EN2 EXP1_01_PIN
|
||||
#define BTN_ENC EXP2_03_PIN
|
||||
|
||||
#define LCD_SDSS SDSS
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
|
||||
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BTN_ENC EXP1_09_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
#define BTN_ENC EXP1_02_PIN
|
||||
#ifndef SD_DETECT_PIN
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#endif
|
||||
|
||||
#ifndef KILL_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#endif
|
||||
|
||||
#if ENABLED(MKS_MINI_12864)
|
||||
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_05_PIN
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
#define DOGLCD_CS EXP1_06_PIN
|
||||
|
||||
// not connected to a pin
|
||||
#define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
|
||||
|
||||
#define BTN_EN1 EXP2_08_PIN
|
||||
#define BTN_EN2 EXP2_06_PIN
|
||||
#define BTN_EN1 EXP2_03_PIN
|
||||
#define BTN_EN2 EXP2_05_PIN
|
||||
|
||||
#elif ENABLED(FYSETC_MINI_12864)
|
||||
|
||||
// From https://wiki.fysetc.com/Mini12864_Panel/
|
||||
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
#define DOGLCD_CS EXP1_08_PIN
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_03_PIN
|
||||
|
||||
#define BTN_EN1 EXP2_06_PIN
|
||||
#define BTN_EN2 EXP2_08_PIN
|
||||
#define BTN_EN1 EXP2_05_PIN
|
||||
#define BTN_EN2 EXP2_03_PIN
|
||||
|
||||
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
|
||||
// results in LCD soft SPI mode 3, SD soft SPI mode 0
|
||||
|
||||
#define LCD_RESET_PIN EXP1_06_PIN // 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 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
|
||||
|
||||
#endif
|
||||
@@ -840,31 +840,31 @@
|
||||
|
||||
#elif ENABLED(G3D_PANEL)
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#define KILL_PIN EXP2_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
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#else
|
||||
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
|
||||
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
|
||||
#define BTN_EN1 AUX2_03_PIN
|
||||
#define BTN_EN2 AUX2_04_PIN
|
||||
#define BTN_ENC AUX3_02_PIN
|
||||
#else
|
||||
#define BTN_EN1 EXP1_10_PIN
|
||||
#define BTN_EN2 EXP1_09_PIN
|
||||
#define BTN_ENC EXP2_08_PIN
|
||||
#define BTN_EN1 EXP1_01_PIN
|
||||
#define BTN_EN2 EXP1_02_PIN
|
||||
#define BTN_ENC EXP2_03_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -898,11 +898,11 @@
|
||||
*
|
||||
* Board Display
|
||||
* ------ ------
|
||||
* (MISO) 50 |10 9 | 52 (SCK) 5V |10 9 | GND
|
||||
* (BTN_EN2) 33 | 8 7 | 53 (SD_CS) RESET | 8 7 | (SD_DET)
|
||||
* (BTN_EN1) 31 6 5 | 51 (MOSI) (MOSI) 6 5 | (LCD_CS)
|
||||
* (SD_DET) 49 | 4 3 | RESET (SD_CS) | 4 3 | (MOD_RESET)
|
||||
* GND | 2 1 | -- (SCK) | 2 1 | (MISO)
|
||||
* (MISO) 50 | 1 2 | 52 (SCK) 5V | 1 2 | GND
|
||||
* (BTN_EN2) 33 | 3 4 | 53 (SD_CS) RESET | 3 4 | (SD_DET)
|
||||
* (BTN_EN1) 31 5 6 | 51 (MOSI) (MOSI) 5 6 | (LCD_CS)
|
||||
* (SD_DET) 49 | 7 8 | RESET (SD_CS) | 7 8 | (MOD_RESET)
|
||||
* GND | 9 10 | -- (SCK) | 9 10 | (MISO)
|
||||
* ------ ------
|
||||
* EXP2
|
||||
*
|
||||
@@ -925,11 +925,11 @@
|
||||
* To fix, insert a 1N4148 diode in the MISO line.
|
||||
*/
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#define CLCD_MOD_RESET EXP2_06_PIN
|
||||
#define CLCD_SPI_CS EXP2_08_PIN
|
||||
#define CLCD_MOD_RESET EXP2_05_PIN
|
||||
#define CLCD_SPI_CS EXP2_03_PIN
|
||||
|
||||
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
|
||||
|
||||
Reference in New Issue
Block a user