SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fysetc pins updates for RAMPS and SKR 1.3 (#13963)

Browse source
This commit is contained in:
Bob Kuhn 2019-05-10 19:29:28 -05:00 committed by Scott Lahteine
parent 9cd9d39319
commit 75eca5c4f8
2 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h
View file

@ -207,10 +207,13 @@
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS P1_18 #define DOGLCD_CS P1_18
#define DOGLCD_A0 P1_19 #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 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 // 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. #define LCD_RESET_PIN P1_20 // Must be high or open for LCD to operate normally.

78
Marlin/src/pins/pins_RAMPS.h
View file

@ -502,62 +502,60 @@
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define KILL_PIN 41 #define KILL_PIN 41
#elif ENABLED(MKS_MINI_12864) // Added in Marlin 1.1.6 #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
#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
#define BEEPER_PIN 37 #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 BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define KILL_PIN 41 #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 DOGLCD_A0 27
#define BEEPER_PIN 37 #define DOGLCD_CS 25
#define DOGLCD_A0 16 // GLCD features
#define DOGLCD_CS 17 // Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 31 // not connected to a pin
#define BTN_EN2 33 #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
#define BTN_ENC 35
#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 #define DOGLCD_A0 16
// results in LCD soft SPI mode 3, SD soft SPI mode 0 #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) //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
#ifndef RGB_LED_R_PIN // results in LCD soft SPI mode 3, SD soft SPI mode 0
#define RGB_LED_R_PIN 25
#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 #endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 27 #endif
#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(MINIPANEL) #elif ENABLED(MINIPANEL)