bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add conditional, give DUE SPI a unique name, fix compiler warnings (#10168)

Browse Source
This commit is contained in:
Bob-the-Kuhn
2018-03-20 15:53:21 -05:00
committed by Scott Lahteine
parent b5b39af531
commit 7308ef7809
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,8 +186,9 @@
U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
#elif ENABLED(U8GLIB_ST7565_64128N)
// The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller
#if DOGLCD_SCK == SCK_PIN && DOGLCD_MOSI == MOSI_PIN
// The MaKrPanel, Mini Viki, Viki 2.0 & AZSMZ 12864 ST7565 controller
#define SMART_RAMPS (MB(RAMPS_SMART_EFB) || MB(RAMPS_SMART_EEB) || MB(RAMPS_SMART_EFF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_SMART_SF))
#if DOGLCD_SCK == SCK_PIN && DOGLCD_MOSI == MOSI_PIN && !SMART_RAMPS
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