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

Fix SKR 1.4 LCD / ADC Keypad sanity-check (#18670)

Browse source
This commit is contained in:
ellensp 2020-07-16 14:45:08 +12:00 committed by Scott Lahteine
parent 05c999a809
commit 0223ca8abb
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View file

@ -261,6 +261,10 @@
#define LCD_PINS_ENABLE EXPA1_03_PIN #define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN #define LCD_PINS_D4 EXPA1_05_PIN
#elif HAS_ADC_BUTTONS
#error "ADC BUTTONS do not work unmodifed on SKR 1.3, The ADC ports cannot take more than 3.3v."
#else // !CR10_STOCKDISPLAY #else // !CR10_STOCKDISPLAY
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXPA1_07_PIN

12
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -250,7 +250,7 @@
#define LCD_PINS_ENABLE P1_23 #define LCD_PINS_ENABLE P1_23
#define LCD_PINS_D4 P1_21 #define LCD_PINS_D4 P1_21
#elif HAS_GRAPHICAL_LCD #else
#define BTN_ENC P0_28 // (58) open-drain #define BTN_ENC P0_28 // (58) open-drain
#define LCD_PINS_RS P1_19 #define LCD_PINS_RS P1_19
@ -312,14 +312,14 @@
#endif // !FYSETC_MINI_12864 #endif // !FYSETC_MINI_12864
#elif HAS_CHARACTER_LCD #endif // HAS_GRAPHICAL_LCD
#error "Character LCD not yet supported for SKR 1.4."
#endif
#endif // HAS_SPI_LCD #endif // HAS_SPI_LCD
#if HAS_ADC_BUTTONS
#error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."
#endif
// //
// Neopixel LED // Neopixel LED
// //