Browse Source

[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.
Bob-the-Kuhn 7 years ago
parent
commit
e05673a379
2 changed files with 2 additions and 1 deletions
  1. 1
    1
      Marlin/src/lcd/ultralcd_impl_DOGM.h
  2. 1
    0
      Marlin/src/pins/pins_RAMPS_RE_ARM.h

+ 1
- 1
Marlin/src/lcd/ultralcd_impl_DOGM.h View File

@@ -187,7 +187,7 @@
187 187
 
188 188
 #elif ENABLED(U8GLIB_ST7565_64128N)
189 189
   // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller
190
-  #if DISABLED(SDSUPPORT) && (DOGLCD_SCK == SCK_PIN) && (DOGLCD_MOSI == MOSI_PIN)
190
+  #if DOGLCD_SCK == SCK_PIN && DOGLCD_MOSI == MOSI_PIN
191 191
     U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0);  // using HW-SPI
192 192
   #else
193 193
     U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI

+ 1
- 0
Marlin/src/pins/pins_RAMPS_RE_ARM.h View File

@@ -197,6 +197,7 @@
197 197
 // Misc. Functions
198 198
 //
199 199
 #define LED_PIN           P4_28 // (13)
200
+#define SDSS              P1_23 // (53)
200 201
 
201 202
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
202 203
 #define FIL_RUNOUT_PIN    P1_18  // (4)

Loading…
Cancel
Save