From e05673a3794632bafe82bcaed5f619a9c43e1951 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Sat, 17 Feb 2018 16:41:36 -0600 Subject: [PATCH] [2.0.x] VIKI2 & RE_ARM changes (#9686) * VIKI2 & RE_ARM changes 1. Remove `DISABLED(SDSUPPORT)` from ST7565 in `ultralcd_impl_DOGM.h`. These LCDs share pins with the SD card and can run at the SD card rates. 2. Add SDSS definition to `pins_RAMPS_RE_ARM.h`. Apparently the SDSS definition in `pins.h` is being processed before the one in `spi_pins.h` which resulted in not being able to read the SD card. --- Marlin/src/lcd/ultralcd_impl_DOGM.h | 2 +- Marlin/src/pins/pins_RAMPS_RE_ARM.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index 92dec8418..0b7b4badf 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -187,7 +187,7 @@ #elif ENABLED(U8GLIB_ST7565_64128N) // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller - #if DISABLED(SDSUPPORT) && (DOGLCD_SCK == SCK_PIN) && (DOGLCD_MOSI == MOSI_PIN) + #if DOGLCD_SCK == SCK_PIN && DOGLCD_MOSI == MOSI_PIN U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0); // using HW-SPI #else U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // using SW-SPI diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index 9ef36b430..8932ece82 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -197,6 +197,7 @@ // Misc. Functions // #define LED_PIN P4_28 // (13) +#define SDSS P1_23 // (53) // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector #define FIL_RUNOUT_PIN P1_18 // (4)