melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.0.x] VIKI2 & RE_ARM changes (#9686)

Browse Source 
* 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.
This commit is contained in:
Bob-the-Kuhn 2018-02-17 16:41:36 -06:00 committed by Scott Lahteine
parent 7a381366aa
commit e05673a379
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/ultralcd_impl_DOGM.h
View File

@ -187,7 +187,7 @@
#elif ENABLED(U8GLIB_ST7565_64128N) #elif ENABLED(U8GLIB_ST7565_64128N)
// The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller // 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 U8GLIB_64128N_2X_HAL u8g(DOGLCD_CS, DOGLCD_A0); // using HW-SPI
#else #else
U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // using SW-SPI U8GLIB_64128N_2X_HAL u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // using SW-SPI

1
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -197,6 +197,7 @@
// Misc. Functions // Misc. Functions
// //
#define LED_PIN P4_28 // (13) #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 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) #define FIL_RUNOUT_PIN P1_18 // (4)