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

Merge pull request #819 from neildarlow/Marlin_v1

Browse Source 
Activate LiquidTWI2 device detection and space-pad LCD status line.
This commit is contained in:
Bo Herrmannsen
2014-12-17 21:42:53 +01:00
parent e83cfc0a62 64139f5e5a
commit 31ca3de72f
6 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/cardreader.cpp
View File

@ -141,9 +141,17 @@ void CardReader::initsd()
if(root.isOpen())
root.close();
#ifdef SDSLOW
if (!card.init(SPI_HALF_SPEED,SDSS))
if (!card.init(SPI_HALF_SPEED,SDSS)
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
&& !card.init(SPI_HALF_SPEED,LCD_SDSS)
#endif
)
#else
if (!card.init(SPI_FULL_SPEED,SDSS))
if (!card.init(SPI_FULL_SPEED,SDSS)
#if defined(LCD_SDSS) && (LCD_SDSS != SDSS)
&& !card.init(SPI_FULL_SPEED,LCD_SDSS)
#endif
)
#endif
{
//if (!card.init(SPI_HALF_SPEED,SDSS))