zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

SAMD51: Some LCD pin fixes (#14915)

Browse source
This commit is contained in:
Giuliano Zaro 2019-08-11 02:19:52 +02:00 committed by Scott Lahteine
parent d78086ccdc
commit f085199f5b
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Marlin/src/pins/samd/pins_AGCM4_RURAMPS4D_13.h
View file

@ -170,20 +170,22 @@
// //
#if HAS_SPI_LCD #if HAS_SPI_LCD
#if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#error "Pin compatibility check needed!"
#define BEEPER_PIN 54 #define BEEPER_PIN 54
#define LCD_PINS_D4 48 #define LCD_PINS_D4 48
#define LCD_PINS_D7 53
#define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI
#define LCD_PINS_RS 55 #define LCD_PINS_RS 55
#define LCD_PINS_ENABLE 56 #define LCD_PINS_ENABLE 56
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #elif EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "Pin compatibility check needed!"
#define BEEPER_PIN 54 #define BEEPER_PIN 54
#define LCD_PINS_D4 48 #define LCD_PINS_D4 48
#define LCD_PINS_D5 -1 // 50 can't be used, it's MISO
#define LCD_PINS_D6 -1 // 52 can't be used, it's SCK
#define LCD_PINS_D7 53
#define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI
#define LCD_PINS_RS 55 #define LCD_PINS_RS 55
#define LCD_PINS_ENABLE 56 #define LCD_PINS_ENABLE 56
@ -197,7 +199,6 @@
#elif ENABLED(FYSETC_MINI_12864) #elif ENABLED(FYSETC_MINI_12864)
#error "Pin compatibility check needed!"
#define BEEPER_PIN 54 #define BEEPER_PIN 54
#define DOGLCD_CS 56 #define DOGLCD_CS 56
#define DOGLCD_A0 55 #define DOGLCD_A0 55
@ -208,27 +209,28 @@
#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) #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." #error "Pin compatibility check needed!"
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 50 // D5 #define RGB_LED_R_PIN 50 // 50 can't be used, it's MISO
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 52 // D6 #define RGB_LED_G_PIN 52 // 52 can't be used, it's SCK
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN 53 // D7 #define RGB_LED_B_PIN 53
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #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." #error "Pin compatibility check needed!"
#define NEOPIXEL_PIN 50 // D5 #define NEOPIXEL_PIN 50 // 50 can't be used, it's MISO
#endif #endif
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#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."
#error "Pin compatibility check needed!"
#define ORIG_BEEPER_PIN 75 #define ORIG_BEEPER_PIN 75
#define DOGLCD_A0 52 #define DOGLCD_A0 52 // 52 can't be used, it's SCK
#define DOGLCD_CS 50 #define DOGLCD_CS 50 // 50 can't be used, it's MISO
#define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI #define SD_DETECT_PIN -1 // 51 can't be used, it's MOSI