Skip to content

Commit

Permalink
Fix SKR 1.4 LCD / ADC Keypad sanity-check (MarlinFirmware#18670)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored and vgadreau committed Dec 9, 2020
1 parent f6845bc commit 8c5eb29
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@
#define LCD_PINS_ENABLE EXPA1_03_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

#define LCD_PINS_RS EXPA1_07_PIN
Expand Down
12 changes: 6 additions & 6 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
#define LCD_PINS_ENABLE P1_23
#define LCD_PINS_D4 P1_21

#elif HAS_GRAPHICAL_LCD
#else

#define BTN_ENC P0_28 // (58) open-drain
#define LCD_PINS_RS P1_19
Expand Down Expand Up @@ -312,14 +312,14 @@

#endif // !FYSETC_MINI_12864

#elif HAS_CHARACTER_LCD

#error "Character LCD not yet supported for SKR 1.4."

#endif
#endif // HAS_GRAPHICAL_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
//
Expand Down

0 comments on commit 8c5eb29

Please sign in to comment.