From 75eca5c4f818f0065d363bf1f8495c82de462a31 Mon Sep 17 00:00:00 2001 From: Bob Kuhn Date: Fri, 10 May 2019 19:29:28 -0500 Subject: [PATCH] Fysetc pins updates for RAMPS and SKR 1.3 (#13963) --- Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h | 5 +- Marlin/src/pins/pins_RAMPS.h | 78 ++++++++++++------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h index 1d3115cbf6..730610214d 100644 --- a/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h +++ b/Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h @@ -207,10 +207,13 @@ #if ENABLED(FYSETC_MINI_12864) #define DOGLCD_CS P1_18 #define DOGLCD_A0 P1_19 + #define DOGLCD_SCK P0_15 + #define DOGLCD_MOSI P0_18 + #define FORCE_SOFT_SPI #define LCD_BACKLIGHT_PIN -1 - //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems + #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 P1_20 // Must be high or open for LCD to operate normally. diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h index a0980dbf86..88249ada31 100644 --- a/Marlin/src/pins/pins_RAMPS.h +++ b/Marlin/src/pins/pins_RAMPS.h @@ -502,62 +502,60 @@ #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #elif ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 - - #define DOGLCD_A0 27 - #define DOGLCD_CS 25 - - // GLCD features - // Uncomment screen orientation - //#define LCD_SCREEN_ROT_90 - //#define LCD_SCREEN_ROT_180 - //#define LCD_SCREEN_ROT_270 + #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864) #define BEEPER_PIN 37 - // not connected to a pin - #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 - - #define BTN_EN1 31 - #define BTN_EN2 33 #define BTN_ENC 35 - #define SD_DETECT_PIN 49 #define KILL_PIN 41 - #elif ENABLED(FYSETC_MINI_12864) // Added in Marlin 1.1.9+ + #if ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 - // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8 - #define BEEPER_PIN 37 + #define DOGLCD_A0 27 + #define DOGLCD_CS 25 - #define DOGLCD_A0 16 - #define DOGLCD_CS 17 + // GLCD features + // Uncomment screen orientation + //#define LCD_SCREEN_ROT_90 + //#define LCD_SCREEN_ROT_180 + //#define LCD_SCREEN_ROT_270 - #define BTN_EN1 31 - #define BTN_EN2 33 - #define BTN_ENC 35 + // not connected to a pin + #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65 - #define SD_DETECT_PIN 49 + #define BTN_EN1 31 + #define BTN_EN2 33 + #elif ENABLED(FYSETC_MINI_12864) + // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8 - //#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 DOGLCD_A0 16 + #define DOGLCD_CS 17 - #define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally. + #define BTN_EN1 33 + #define BTN_EN2 31 - #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) - #ifndef RGB_LED_R_PIN - #define RGB_LED_R_PIN 25 - #endif - #ifndef RGB_LED_G_PIN - #define RGB_LED_G_PIN 27 - #endif - #ifndef RGB_LED_B_PIN - #define RGB_LED_B_PIN 29 + //#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 23 // 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 25 + #endif + #ifndef RGB_LED_G_PIN + #define RGB_LED_G_PIN 27 + #endif + #ifndef RGB_LED_B_PIN + #define RGB_LED_B_PIN 29 + #endif + #elif ENABLED(FYSETC_MINI_12864_2_1) + #define NEOPIXEL_PIN 25 #endif - #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN 25 - #endif + + #endif #elif ENABLED(MINIPANEL)