From da7c51d8208610b0daec622379450aef599d2bc4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 17 Feb 2018 21:24:04 -0600 Subject: [PATCH] Space out some pins lines --- Marlin/src/pins/pins_ANET_10.h | 2 +- Marlin/src/pins/pins_AZTEEG_X3_PRO.h | 2 +- Marlin/src/pins/pins_BEAST.h | 3 +++ Marlin/src/pins/pins_CHITU3D.h | 2 ++ Marlin/src/pins/pins_DUE3DOM.h | 6 +++++- Marlin/src/pins/pins_DUE3DOM_MINI.h | 10 +++++++--- Marlin/src/pins/pins_MAKEBOARD_MINI.h | 2 +- Marlin/src/pins/pins_MEGACONTROLLER.h | 2 ++ Marlin/src/pins/pins_RADDS.h | 7 ++++++- Marlin/src/pins/pins_RAMPS.h | 2 +- Marlin/src/pins/pins_RAMPS_DUO.h | 9 +++++++++ Marlin/src/pins/pins_RURAMPS4D.h | 9 +++++++-- Marlin/src/pins/pins_STM32F1R.h | 2 ++ Marlin/src/pins/pins_STM3R_MINI.h | 3 +++ 14 files changed, 50 insertions(+), 11 deletions(-) diff --git a/Marlin/src/pins/pins_ANET_10.h b/Marlin/src/pins/pins_ANET_10.h index 91159cf892..c13236a7c6 100644 --- a/Marlin/src/pins/pins_ANET_10.h +++ b/Marlin/src/pins/pins_ANET_10.h @@ -148,7 +148,7 @@ * ZONESTAR_LCD * ANET_FULL_GRAPHICS_LCD * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER -*/ + */ #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #define LCD_SDSS 28 diff --git a/Marlin/src/pins/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/pins_AZTEEG_X3_PRO.h index 61810d98e9..159cd0f76f 100644 --- a/Marlin/src/pins/pins_AZTEEG_X3_PRO.h +++ b/Marlin/src/pins/pins_AZTEEG_X3_PRO.h @@ -41,7 +41,7 @@ #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #endif -//DIGIPOT slave addresses +// DIGIPOT slave addresses #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1) #define DIGIPOT_I2C_ADDRESS_B 0x2E // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1) diff --git a/Marlin/src/pins/pins_BEAST.h b/Marlin/src/pins/pins_BEAST.h index ee572f9be2..8502888124 100644 --- a/Marlin/src/pins/pins_BEAST.h +++ b/Marlin/src/pins/pins_BEAST.h @@ -213,6 +213,7 @@ #define STAT_LED_BLUE_PIN 35 #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) + #define BTN_EN1 35 #define BTN_EN2 37 #define BTN_ENC 31 @@ -223,7 +224,9 @@ #define DOGLCD_CS 29 #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 + #elif ENABLED(MINIPANEL) + #define BEEPER_PIN 42 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 44 diff --git a/Marlin/src/pins/pins_CHITU3D.h b/Marlin/src/pins/pins_CHITU3D.h index 258f7f7230..2fd1b525ec 100644 --- a/Marlin/src/pins/pins_CHITU3D.h +++ b/Marlin/src/pins/pins_CHITU3D.h @@ -222,7 +222,9 @@ #define DOGLCD_CS 29 #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 + #elif ENABLED(MINIPANEL) + #define BEEPER_PIN 42 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 44 diff --git a/Marlin/src/pins/pins_DUE3DOM.h b/Marlin/src/pins/pins_DUE3DOM.h index 06e73ac8e7..8b0a16352b 100644 --- a/Marlin/src/pins/pins_DUE3DOM.h +++ b/Marlin/src/pins/pins_DUE3DOM.h @@ -111,6 +111,7 @@ // LCD / Controller // #if ENABLED(ULTRA_LCD) + #define LCD_PINS_RS 42 #define LCD_PINS_ENABLE 43 #define LCD_PINS_D4 44 @@ -119,6 +120,7 @@ #define LCD_PINS_D7 47 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #define BEEPER_PIN 41 #define BTN_EN1 50 @@ -128,8 +130,8 @@ #define SDSS 4 #define SD_DETECT_PIN 14 - // RADDS LCD panel #elif ENABLED(RADDS_DISPLAY) + #define BEEPER_PIN 41 #define BTN_EN1 50 @@ -143,6 +145,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) + #define BTN_EN1 50 #define BTN_EN2 52 #define BTN_ENC 48 @@ -151,6 +154,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(SPARK_FULL_GRAPHICS) + #define LCD_PINS_D4 29 #define LCD_PINS_ENABLE 27 #define LCD_PINS_RS 25 diff --git a/Marlin/src/pins/pins_DUE3DOM_MINI.h b/Marlin/src/pins/pins_DUE3DOM_MINI.h index c3523fc41d..7ea23835a1 100644 --- a/Marlin/src/pins/pins_DUE3DOM_MINI.h +++ b/Marlin/src/pins/pins_DUE3DOM_MINI.h @@ -77,9 +77,9 @@ // SPI for Max6675 or Max31855 Thermocouple #if DISABLED(SDSUPPORT) - #define MAX6675_SS 53 + #define MAX6675_SS 53 #else - #define MAX6675_SS 53 + #define MAX6675_SS 53 #endif // @@ -103,6 +103,7 @@ // LCD / Controller // #if ENABLED(ULTRA_LCD) + #define LCD_PINS_RS 42 #define LCD_PINS_ENABLE 43 #define LCD_PINS_D4 44 @@ -111,6 +112,7 @@ #define LCD_PINS_D7 47 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #define BEEPER_PIN 41 #define BTN_EN1 50 @@ -120,8 +122,8 @@ #define SDSS 4 #define SD_DETECT_PIN 14 - // RADDS LCD panel #elif ENABLED(RADDS_DISPLAY) + #define BEEPER_PIN 41 #define BTN_EN1 50 @@ -135,6 +137,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) + #define BTN_EN1 50 #define BTN_EN2 52 #define BTN_ENC 48 @@ -143,6 +146,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(SPARK_FULL_GRAPHICS) + #define LCD_PINS_D4 29 #define LCD_PINS_ENABLE 27 #define LCD_PINS_RS 25 diff --git a/Marlin/src/pins/pins_MAKEBOARD_MINI.h b/Marlin/src/pins/pins_MAKEBOARD_MINI.h index 8a6491abb3..5dcf1e2180 100644 --- a/Marlin/src/pins/pins_MAKEBOARD_MINI.h +++ b/Marlin/src/pins/pins_MAKEBOARD_MINI.h @@ -36,4 +36,4 @@ #undef Z_MAX_PIN #define X_STOP_PIN 2 #define Y_STOP_PIN 15 -#define Z_STOP_PIN 19 \ No newline at end of file +#define Z_STOP_PIN 19 diff --git a/Marlin/src/pins/pins_MEGACONTROLLER.h b/Marlin/src/pins/pins_MEGACONTROLLER.h index c4a10705ab..f5660547aa 100644 --- a/Marlin/src/pins/pins_MEGACONTROLLER.h +++ b/Marlin/src/pins/pins_MEGACONTROLLER.h @@ -133,6 +133,7 @@ // LCD / Controller // #if ENABLED(MINIPANEL) + #define BEEPER_PIN 46 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 47 @@ -152,6 +153,7 @@ #define BTN_ENC 10 #define SD_DETECT_PIN 49 + #endif // MINIPANEL // diff --git a/Marlin/src/pins/pins_RADDS.h b/Marlin/src/pins/pins_RADDS.h index 68d8f3cbec..e4944ba488 100644 --- a/Marlin/src/pins/pins_RADDS.h +++ b/Marlin/src/pins/pins_RADDS.h @@ -157,8 +157,9 @@ // LCD / Controller // #if ENABLED(ULTRA_LCD) - // RADDS LCD panel + #if ENABLED(RADDS_DISPLAY) + #define LCD_PINS_RS 42 #define LCD_PINS_ENABLE 43 #define LCD_PINS_D4 44 @@ -179,6 +180,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) + #define LCD_PINS_RS 46 #define LCD_PINS_ENABLE 47 #define LCD_PINS_D4 44 @@ -190,6 +192,7 @@ #define BTN_ENC 48 #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) + #define BTN_EN1 50 #define BTN_EN2 52 #define BTN_ENC 48 @@ -198,6 +201,7 @@ #define SD_DETECT_PIN 14 #elif ENABLED(SPARK_FULL_GRAPHICS) + #define LCD_PINS_D4 29 #define LCD_PINS_ENABLE 27 #define LCD_PINS_RS 25 @@ -207,4 +211,5 @@ #define BTN_ENC 37 #endif // SPARK_FULL_GRAPHICS + #endif // ULTRA_LCD diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h index 2fe422b590..4e01bad76c 100644 --- a/Marlin/src/pins/pins_RAMPS.h +++ b/Marlin/src/pins/pins_RAMPS.h @@ -155,7 +155,7 @@ //#define X2_HARDWARE_SERIAL Serial1 //#define Y_HARDWARE_SERIAL Serial1 //#define Y2_HARDWARE_SERIAL Serial1 - //#define Z_HARDWARE_SERIAL Serial3 + //#define Z_HARDWARE_SERIAL Serial1 //#define Z2_HARDWARE_SERIAL Serial1 //#define E0_HARDWARE_SERIAL Serial1 //#define E1_HARDWARE_SERIAL Serial1 diff --git a/Marlin/src/pins/pins_RAMPS_DUO.h b/Marlin/src/pins/pins_RAMPS_DUO.h index 264cf4167c..c252851321 100644 --- a/Marlin/src/pins/pins_RAMPS_DUO.h +++ b/Marlin/src/pins/pins_RAMPS_DUO.h @@ -77,6 +77,7 @@ // LCD / Controller // #if ENABLED(ULTRA_LCD) + #if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE) #undef LCD_PINS_D4 #define LCD_PINS_D4 68 @@ -89,13 +90,17 @@ #endif #if ENABLED(NEWPANEL) + #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) + #undef BTN_EN1 #define BTN_EN1 67 #undef BTN_ENC #define BTN_ENC 66 + #elif ENABLED(MINIPANEL) + #undef DOGLCD_CS #define DOGLCD_CS 69 @@ -107,7 +112,9 @@ #undef BTN_EN2 #define BTN_EN2 66 + #else + #if ENABLED(REPRAPWORLD_KEYPAD) #undef BTN_EN1 #define BTN_EN1 67 // encoder @@ -119,5 +126,7 @@ #define BTN_EN2 66 // AUX2 PIN 4 #endif #endif + #endif // NEWPANEL + #endif // ULTRA_LCD diff --git a/Marlin/src/pins/pins_RURAMPS4D.h b/Marlin/src/pins/pins_RURAMPS4D.h index 2ad365e00f..5aa8ede239 100644 --- a/Marlin/src/pins/pins_RURAMPS4D.h +++ b/Marlin/src/pins/pins_RURAMPS4D.h @@ -190,8 +190,9 @@ // LCD / Controller // #if ENABLED(ULTRA_LCD) - // RADDS LCD panel + #if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #define LCD_PINS_RS 63 #define LCD_PINS_ENABLE 64 #define LCD_PINS_D4 48 @@ -208,6 +209,7 @@ #define SD_DETECT_PIN 51 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) + #define LCD_PINS_RS 52 #define LCD_PINS_ENABLE 53 #define LCD_PINS_D4 48 @@ -225,6 +227,7 @@ #endif #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) + #define BTN_EN1 44 #define BTN_EN2 42 #define BTN_ENC 40 @@ -233,14 +236,16 @@ #define SD_DETECT_PIN 51 #elif ENABLED(SPARK_FULL_GRAPHICS) + //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_ENABLE 27//? //#define LCD_PINS_RS 25//? //#define BTN_EN1 35//? //#define BTN_EN2 33//? //#define BTN_ENC 37//? + #endif // SPARK_FULL_GRAPHICS #endif // ULTRA_LCD diff --git a/Marlin/src/pins/pins_STM32F1R.h b/Marlin/src/pins/pins_STM32F1R.h index 43b00e7e3d..acbc2f47cf 100644 --- a/Marlin/src/pins/pins_STM32F1R.h +++ b/Marlin/src/pins/pins_STM32F1R.h @@ -218,7 +218,9 @@ #define DOGLCD_CS 29 #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 + #elif ENABLED(MINIPANEL) + #define BEEPER_PIN 42 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 44 diff --git a/Marlin/src/pins/pins_STM3R_MINI.h b/Marlin/src/pins/pins_STM3R_MINI.h index dbcc1a949d..c36b740960 100644 --- a/Marlin/src/pins/pins_STM3R_MINI.h +++ b/Marlin/src/pins/pins_STM3R_MINI.h @@ -216,6 +216,7 @@ #define STAT_LED_BLUE_PIN 35 #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) + #define BTN_EN1 35 #define BTN_EN2 37 #define BTN_ENC 31 @@ -226,7 +227,9 @@ #define DOGLCD_CS 29 #define DOGLCD_A0 27 #define LCD_BACKLIGHT_PIN 33 + #elif ENABLED(MINIPANEL) + #define BEEPER_PIN 42 // Pins for DOGM SPI LCD Support #define DOGLCD_A0 44