mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-12-18 00:07:50 +00:00
Space out some pins lines
This commit is contained in:
parent
e05673a379
commit
da7c51d820
@ -213,6 +213,7 @@
|
|||||||
#define STAT_LED_BLUE_PIN 35
|
#define STAT_LED_BLUE_PIN 35
|
||||||
|
|
||||||
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 35
|
#define BTN_EN1 35
|
||||||
#define BTN_EN2 37
|
#define BTN_EN2 37
|
||||||
#define BTN_ENC 31
|
#define BTN_ENC 31
|
||||||
@ -223,7 +224,9 @@
|
|||||||
#define DOGLCD_CS 29
|
#define DOGLCD_CS 29
|
||||||
#define DOGLCD_A0 27
|
#define DOGLCD_A0 27
|
||||||
#define LCD_BACKLIGHT_PIN 33
|
#define LCD_BACKLIGHT_PIN 33
|
||||||
|
|
||||||
#elif ENABLED(MINIPANEL)
|
#elif ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#define BEEPER_PIN 42
|
#define BEEPER_PIN 42
|
||||||
// Pins for DOGM SPI LCD Support
|
// Pins for DOGM SPI LCD Support
|
||||||
#define DOGLCD_A0 44
|
#define DOGLCD_A0 44
|
||||||
|
@ -222,7 +222,9 @@
|
|||||||
#define DOGLCD_CS 29
|
#define DOGLCD_CS 29
|
||||||
#define DOGLCD_A0 27
|
#define DOGLCD_A0 27
|
||||||
#define LCD_BACKLIGHT_PIN 33
|
#define LCD_BACKLIGHT_PIN 33
|
||||||
|
|
||||||
#elif ENABLED(MINIPANEL)
|
#elif ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#define BEEPER_PIN 42
|
#define BEEPER_PIN 42
|
||||||
// Pins for DOGM SPI LCD Support
|
// Pins for DOGM SPI LCD Support
|
||||||
#define DOGLCD_A0 44
|
#define DOGLCD_A0 44
|
||||||
|
@ -111,6 +111,7 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
|
|
||||||
#define LCD_PINS_RS 42
|
#define LCD_PINS_RS 42
|
||||||
#define LCD_PINS_ENABLE 43
|
#define LCD_PINS_ENABLE 43
|
||||||
#define LCD_PINS_D4 44
|
#define LCD_PINS_D4 44
|
||||||
@ -119,6 +120,7 @@
|
|||||||
#define LCD_PINS_D7 47
|
#define LCD_PINS_D7 47
|
||||||
|
|
||||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||||
|
|
||||||
#define BEEPER_PIN 41
|
#define BEEPER_PIN 41
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
@ -128,8 +130,8 @@
|
|||||||
#define SDSS 4
|
#define SDSS 4
|
||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
// RADDS LCD panel
|
|
||||||
#elif ENABLED(RADDS_DISPLAY)
|
#elif ENABLED(RADDS_DISPLAY)
|
||||||
|
|
||||||
#define BEEPER_PIN 41
|
#define BEEPER_PIN 41
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
@ -143,6 +145,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
#define BTN_EN2 52
|
#define BTN_EN2 52
|
||||||
#define BTN_ENC 48
|
#define BTN_ENC 48
|
||||||
@ -151,6 +154,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
||||||
|
|
||||||
#define LCD_PINS_D4 29
|
#define LCD_PINS_D4 29
|
||||||
#define LCD_PINS_ENABLE 27
|
#define LCD_PINS_ENABLE 27
|
||||||
#define LCD_PINS_RS 25
|
#define LCD_PINS_RS 25
|
||||||
|
@ -103,6 +103,7 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
|
|
||||||
#define LCD_PINS_RS 42
|
#define LCD_PINS_RS 42
|
||||||
#define LCD_PINS_ENABLE 43
|
#define LCD_PINS_ENABLE 43
|
||||||
#define LCD_PINS_D4 44
|
#define LCD_PINS_D4 44
|
||||||
@ -111,6 +112,7 @@
|
|||||||
#define LCD_PINS_D7 47
|
#define LCD_PINS_D7 47
|
||||||
|
|
||||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||||
|
|
||||||
#define BEEPER_PIN 41
|
#define BEEPER_PIN 41
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
@ -120,8 +122,8 @@
|
|||||||
#define SDSS 4
|
#define SDSS 4
|
||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
// RADDS LCD panel
|
|
||||||
#elif ENABLED(RADDS_DISPLAY)
|
#elif ENABLED(RADDS_DISPLAY)
|
||||||
|
|
||||||
#define BEEPER_PIN 41
|
#define BEEPER_PIN 41
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
@ -135,6 +137,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
#define BTN_EN2 52
|
#define BTN_EN2 52
|
||||||
#define BTN_ENC 48
|
#define BTN_ENC 48
|
||||||
@ -143,6 +146,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
||||||
|
|
||||||
#define LCD_PINS_D4 29
|
#define LCD_PINS_D4 29
|
||||||
#define LCD_PINS_ENABLE 27
|
#define LCD_PINS_ENABLE 27
|
||||||
#define LCD_PINS_RS 25
|
#define LCD_PINS_RS 25
|
||||||
|
@ -133,6 +133,7 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(MINIPANEL)
|
#if ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#define BEEPER_PIN 46
|
#define BEEPER_PIN 46
|
||||||
// Pins for DOGM SPI LCD Support
|
// Pins for DOGM SPI LCD Support
|
||||||
#define DOGLCD_A0 47
|
#define DOGLCD_A0 47
|
||||||
@ -152,6 +153,7 @@
|
|||||||
#define BTN_ENC 10
|
#define BTN_ENC 10
|
||||||
|
|
||||||
#define SD_DETECT_PIN 49
|
#define SD_DETECT_PIN 49
|
||||||
|
|
||||||
#endif // MINIPANEL
|
#endif // MINIPANEL
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -157,8 +157,9 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
// RADDS LCD panel
|
|
||||||
#if ENABLED(RADDS_DISPLAY)
|
#if ENABLED(RADDS_DISPLAY)
|
||||||
|
|
||||||
#define LCD_PINS_RS 42
|
#define LCD_PINS_RS 42
|
||||||
#define LCD_PINS_ENABLE 43
|
#define LCD_PINS_ENABLE 43
|
||||||
#define LCD_PINS_D4 44
|
#define LCD_PINS_D4 44
|
||||||
@ -179,6 +180,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||||
|
|
||||||
#define LCD_PINS_RS 46
|
#define LCD_PINS_RS 46
|
||||||
#define LCD_PINS_ENABLE 47
|
#define LCD_PINS_ENABLE 47
|
||||||
#define LCD_PINS_D4 44
|
#define LCD_PINS_D4 44
|
||||||
@ -190,6 +192,7 @@
|
|||||||
#define BTN_ENC 48
|
#define BTN_ENC 48
|
||||||
|
|
||||||
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 50
|
#define BTN_EN1 50
|
||||||
#define BTN_EN2 52
|
#define BTN_EN2 52
|
||||||
#define BTN_ENC 48
|
#define BTN_ENC 48
|
||||||
@ -198,6 +201,7 @@
|
|||||||
#define SD_DETECT_PIN 14
|
#define SD_DETECT_PIN 14
|
||||||
|
|
||||||
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
||||||
|
|
||||||
#define LCD_PINS_D4 29
|
#define LCD_PINS_D4 29
|
||||||
#define LCD_PINS_ENABLE 27
|
#define LCD_PINS_ENABLE 27
|
||||||
#define LCD_PINS_RS 25
|
#define LCD_PINS_RS 25
|
||||||
@ -207,4 +211,5 @@
|
|||||||
#define BTN_ENC 37
|
#define BTN_ENC 37
|
||||||
|
|
||||||
#endif // SPARK_FULL_GRAPHICS
|
#endif // SPARK_FULL_GRAPHICS
|
||||||
|
|
||||||
#endif // ULTRA_LCD
|
#endif // ULTRA_LCD
|
||||||
|
@ -155,7 +155,7 @@
|
|||||||
//#define X2_HARDWARE_SERIAL Serial1
|
//#define X2_HARDWARE_SERIAL Serial1
|
||||||
//#define Y_HARDWARE_SERIAL Serial1
|
//#define Y_HARDWARE_SERIAL Serial1
|
||||||
//#define Y2_HARDWARE_SERIAL Serial1
|
//#define Y2_HARDWARE_SERIAL Serial1
|
||||||
//#define Z_HARDWARE_SERIAL Serial3
|
//#define Z_HARDWARE_SERIAL Serial1
|
||||||
//#define Z2_HARDWARE_SERIAL Serial1
|
//#define Z2_HARDWARE_SERIAL Serial1
|
||||||
//#define E0_HARDWARE_SERIAL Serial1
|
//#define E0_HARDWARE_SERIAL Serial1
|
||||||
//#define E1_HARDWARE_SERIAL Serial1
|
//#define E1_HARDWARE_SERIAL Serial1
|
||||||
|
@ -77,6 +77,7 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
|
|
||||||
#if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
|
#if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
|
||||||
#undef LCD_PINS_D4
|
#undef LCD_PINS_D4
|
||||||
#define LCD_PINS_D4 68
|
#define LCD_PINS_D4 68
|
||||||
@ -89,13 +90,17 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
|
|
||||||
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||||
|
|
||||||
#undef BTN_EN1
|
#undef BTN_EN1
|
||||||
#define BTN_EN1 67
|
#define BTN_EN1 67
|
||||||
|
|
||||||
#undef BTN_ENC
|
#undef BTN_ENC
|
||||||
#define BTN_ENC 66
|
#define BTN_ENC 66
|
||||||
|
|
||||||
#elif ENABLED(MINIPANEL)
|
#elif ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#undef DOGLCD_CS
|
#undef DOGLCD_CS
|
||||||
#define DOGLCD_CS 69
|
#define DOGLCD_CS 69
|
||||||
|
|
||||||
@ -107,7 +112,9 @@
|
|||||||
|
|
||||||
#undef BTN_EN2
|
#undef BTN_EN2
|
||||||
#define BTN_EN2 66
|
#define BTN_EN2 66
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||||
#undef BTN_EN1
|
#undef BTN_EN1
|
||||||
#define BTN_EN1 67 // encoder
|
#define BTN_EN1 67 // encoder
|
||||||
@ -119,5 +126,7 @@
|
|||||||
#define BTN_EN2 66 // AUX2 PIN 4
|
#define BTN_EN2 66 // AUX2 PIN 4
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // NEWPANEL
|
#endif // NEWPANEL
|
||||||
|
|
||||||
#endif // ULTRA_LCD
|
#endif // ULTRA_LCD
|
||||||
|
@ -190,8 +190,9 @@
|
|||||||
// LCD / Controller
|
// LCD / Controller
|
||||||
//
|
//
|
||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
// RADDS LCD panel
|
|
||||||
#if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
#if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||||
|
|
||||||
#define LCD_PINS_RS 63
|
#define LCD_PINS_RS 63
|
||||||
#define LCD_PINS_ENABLE 64
|
#define LCD_PINS_ENABLE 64
|
||||||
#define LCD_PINS_D4 48
|
#define LCD_PINS_D4 48
|
||||||
@ -208,6 +209,7 @@
|
|||||||
#define SD_DETECT_PIN 51
|
#define SD_DETECT_PIN 51
|
||||||
|
|
||||||
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||||
|
|
||||||
#define LCD_PINS_RS 52
|
#define LCD_PINS_RS 52
|
||||||
#define LCD_PINS_ENABLE 53
|
#define LCD_PINS_ENABLE 53
|
||||||
#define LCD_PINS_D4 48
|
#define LCD_PINS_D4 48
|
||||||
@ -225,6 +227,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 44
|
#define BTN_EN1 44
|
||||||
#define BTN_EN2 42
|
#define BTN_EN2 42
|
||||||
#define BTN_ENC 40
|
#define BTN_ENC 40
|
||||||
@ -233,14 +236,16 @@
|
|||||||
#define SD_DETECT_PIN 51
|
#define SD_DETECT_PIN 51
|
||||||
|
|
||||||
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
#elif ENABLED(SPARK_FULL_GRAPHICS)
|
||||||
|
|
||||||
//http://doku.radds.org/dokumentation/other-electronics/sparklcd/
|
//http://doku.radds.org/dokumentation/other-electronics/sparklcd/
|
||||||
#error "Oops! SPARK_FULL_GRAPHICS not supported with this board"
|
#error "Oops! SPARK_FULL_GRAPHICS not supported with RURAMPS4D."
|
||||||
//#define LCD_PINS_D4 29//?
|
//#define LCD_PINS_D4 29//?
|
||||||
//#define LCD_PINS_ENABLE 27//?
|
//#define LCD_PINS_ENABLE 27//?
|
||||||
//#define LCD_PINS_RS 25//?
|
//#define LCD_PINS_RS 25//?
|
||||||
//#define BTN_EN1 35//?
|
//#define BTN_EN1 35//?
|
||||||
//#define BTN_EN2 33//?
|
//#define BTN_EN2 33//?
|
||||||
//#define BTN_ENC 37//?
|
//#define BTN_ENC 37//?
|
||||||
|
|
||||||
#endif // SPARK_FULL_GRAPHICS
|
#endif // SPARK_FULL_GRAPHICS
|
||||||
|
|
||||||
#endif // ULTRA_LCD
|
#endif // ULTRA_LCD
|
||||||
|
@ -218,7 +218,9 @@
|
|||||||
#define DOGLCD_CS 29
|
#define DOGLCD_CS 29
|
||||||
#define DOGLCD_A0 27
|
#define DOGLCD_A0 27
|
||||||
#define LCD_BACKLIGHT_PIN 33
|
#define LCD_BACKLIGHT_PIN 33
|
||||||
|
|
||||||
#elif ENABLED(MINIPANEL)
|
#elif ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#define BEEPER_PIN 42
|
#define BEEPER_PIN 42
|
||||||
// Pins for DOGM SPI LCD Support
|
// Pins for DOGM SPI LCD Support
|
||||||
#define DOGLCD_A0 44
|
#define DOGLCD_A0 44
|
||||||
|
@ -216,6 +216,7 @@
|
|||||||
#define STAT_LED_BLUE_PIN 35
|
#define STAT_LED_BLUE_PIN 35
|
||||||
|
|
||||||
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||||
|
|
||||||
#define BTN_EN1 35
|
#define BTN_EN1 35
|
||||||
#define BTN_EN2 37
|
#define BTN_EN2 37
|
||||||
#define BTN_ENC 31
|
#define BTN_ENC 31
|
||||||
@ -226,7 +227,9 @@
|
|||||||
#define DOGLCD_CS 29
|
#define DOGLCD_CS 29
|
||||||
#define DOGLCD_A0 27
|
#define DOGLCD_A0 27
|
||||||
#define LCD_BACKLIGHT_PIN 33
|
#define LCD_BACKLIGHT_PIN 33
|
||||||
|
|
||||||
#elif ENABLED(MINIPANEL)
|
#elif ENABLED(MINIPANEL)
|
||||||
|
|
||||||
#define BEEPER_PIN 42
|
#define BEEPER_PIN 42
|
||||||
// Pins for DOGM SPI LCD Support
|
// Pins for DOGM SPI LCD Support
|
||||||
#define DOGLCD_A0 44
|
#define DOGLCD_A0 44
|
||||||
|
Loading…
Reference in New Issue
Block a user