From a7e41459c84f105b275974da3e636dd682b2f61f Mon Sep 17 00:00:00 2001 From: GMagician Date: Fri, 9 Aug 2019 22:33:36 +0200 Subject: [PATCH 1/2] Fix lcd pins --- .../src/pins/samd/pins_AGCM4_RURAMPS4D_13.h | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h b/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h index ee5f16a1e66a..e3ee39a26527 100644 --- a/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h +++ b/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h @@ -172,37 +172,40 @@ #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER) - #define BEEPER_PIN 75 - #define LCD_PINS_D4 48 - #define LCD_PINS_D7 53 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI - #define LCD_PINS_RS 76 - #define LCD_PINS_ENABLE 77 + #error "Pin compatibility check needed!" + #define BEEPER_PIN 54 + #define LCD_PINS_D4 48 + #define LCD_PINS_D7 53 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #define LCD_PINS_RS 55 + #define LCD_PINS_ENABLE 56 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) - #define BEEPER_PIN 75 - #define LCD_PINS_D4 48 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI - #define LCD_PINS_RS 76 - #define LCD_PINS_ENABLE 77 + #define BEEPER_PIN 54 + #define LCD_PINS_D4 48 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #define LCD_PINS_RS 55 + #define LCD_PINS_ENABLE 56 #elif HAS_SSD1306_OLED_I2C - #define BEEPER_PIN 75 - #define LCD_SDSS 10 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #error "Pin compatibility check needed!" + #define BEEPER_PIN 54 + #define LCD_SDSS 10 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI #elif ENABLED(FYSETC_MINI_12864) - #define BEEPER_PIN 75 - #define DOGLCD_CS 77 - #define DOGLCD_A0 76 + #error "Pin compatibility check needed!" + #define BEEPER_PIN 54 + #define DOGLCD_CS 56 + #define DOGLCD_A0 55 - //#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 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 48 // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally. #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #error "Pin compatibility check needed! Grand central M4 pins 50, 51 and 52 are not GPIO pins, they are wired to MISO, MOSI, and SCK." From 0e2fd5c50ac0610fbe07921ce450399950f99c1e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 00:56:30 -0500 Subject: [PATCH 2/2] Update pins_AGCM4_RURAMPS4D_13.h --- .../src/pins/samd/pins_AGCM4_RURAMPS4D_13.h | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h b/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h index e3ee39a26527..570c598947c2 100644 --- a/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h +++ b/Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h @@ -102,7 +102,7 @@ #if HAS_FILAMENT_SENSOR #ifndef FIL_RUNOUT_PIN - #define FIL_RUNOUT_PIN Y_MIN_PIN + #define FIL_RUNOUT_PIN Y_MIN_PIN #endif #endif @@ -173,39 +173,39 @@ #if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER) #error "Pin compatibility check needed!" - #define BEEPER_PIN 54 - #define LCD_PINS_D4 48 - #define LCD_PINS_D7 53 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI - #define LCD_PINS_RS 55 + #define BEEPER_PIN 54 + #define LCD_PINS_D4 48 + #define LCD_PINS_D7 53 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #define LCD_PINS_RS 55 #define LCD_PINS_ENABLE 56 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) - #define BEEPER_PIN 54 - #define LCD_PINS_D4 48 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI - #define LCD_PINS_RS 55 + #define BEEPER_PIN 54 + #define LCD_PINS_D4 48 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #define LCD_PINS_RS 55 #define LCD_PINS_ENABLE 56 #elif HAS_SSD1306_OLED_I2C #error "Pin compatibility check needed!" - #define BEEPER_PIN 54 - #define LCD_SDSS 10 - #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI + #define BEEPER_PIN 54 + #define LCD_SDSS 10 + #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI #elif ENABLED(FYSETC_MINI_12864) #error "Pin compatibility check needed!" - #define BEEPER_PIN 54 - #define DOGLCD_CS 56 - #define DOGLCD_A0 55 + #define BEEPER_PIN 54 + #define DOGLCD_CS 56 + #define DOGLCD_A0 55 - //#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 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 48 // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN 48 // Must be high or open for LCD to operate normally. #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #error "Pin compatibility check needed! Grand central M4 pins 50, 51 and 52 are not GPIO pins, they are wired to MISO, MOSI, and SCK." @@ -220,7 +220,7 @@ #endif #elif ENABLED(FYSETC_MINI_12864_2_1) #error "Pin compatibility check needed! Grand central M4 pins 50, 51 and 52 are not GPIO pins, they are wired to MISO, MOSI, and SCK." - #define NEOPIXEL_PIN 50 // D5 + #define NEOPIXEL_PIN 50 // D5 #endif #elif ENABLED(MKS_MINI_12864)