|
|
|
@ -19,10 +19,10 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
#include "Marlin.h"
|
|
|
|
#include "Marlin.h"
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SDSUPPORT
|
|
|
|
#if ENABLED(SDSUPPORT)
|
|
|
|
#include "Sd2Card.h"
|
|
|
|
#include "Sd2Card.h"
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
#ifndef SOFTWARE_SPI
|
|
|
|
#if DISABLED(SOFTWARE_SPI)
|
|
|
|
// functions for hardware SPI
|
|
|
|
// functions for hardware SPI
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
// make sure SPCR rate is in expected bits
|
|
|
|
// make sure SPCR rate is in expected bits
|
|
|
|
@ -209,7 +209,7 @@ void Sd2Card::chipSelectHigh() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
void Sd2Card::chipSelectLow() {
|
|
|
|
void Sd2Card::chipSelectLow() {
|
|
|
|
#ifndef SOFTWARE_SPI
|
|
|
|
#if DISABLED(SOFTWARE_SPI)
|
|
|
|
spiInit(spiRate_);
|
|
|
|
spiInit(spiRate_);
|
|
|
|
#endif // SOFTWARE_SPI
|
|
|
|
#endif // SOFTWARE_SPI
|
|
|
|
digitalWrite(chipSelectPin_, LOW);
|
|
|
|
digitalWrite(chipSelectPin_, LOW);
|
|
|
|
@ -297,7 +297,7 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
|
|
|
|
pinMode(SPI_MOSI_PIN, OUTPUT);
|
|
|
|
pinMode(SPI_MOSI_PIN, OUTPUT);
|
|
|
|
pinMode(SPI_SCK_PIN, OUTPUT);
|
|
|
|
pinMode(SPI_SCK_PIN, OUTPUT);
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SOFTWARE_SPI
|
|
|
|
#if DISABLED(SOFTWARE_SPI)
|
|
|
|
// SS must be in output mode even it is not chip select
|
|
|
|
// SS must be in output mode even it is not chip select
|
|
|
|
pinMode(SS_PIN, OUTPUT);
|
|
|
|
pinMode(SS_PIN, OUTPUT);
|
|
|
|
// set SS high - may be chip select for another SPI device
|
|
|
|
// set SS high - may be chip select for another SPI device
|
|
|
|
@ -353,7 +353,7 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
chipSelectHigh();
|
|
|
|
chipSelectHigh();
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SOFTWARE_SPI
|
|
|
|
#if DISABLED(SOFTWARE_SPI)
|
|
|
|
return setSckRate(sckRateID);
|
|
|
|
return setSckRate(sckRateID);
|
|
|
|
#else // SOFTWARE_SPI
|
|
|
|
#else // SOFTWARE_SPI
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
@ -373,7 +373,7 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
|
|
|
|
* the value zero, false, is returned for failure.
|
|
|
|
* the value zero, false, is returned for failure.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
bool Sd2Card::readBlock(uint32_t blockNumber, uint8_t* dst) {
|
|
|
|
bool Sd2Card::readBlock(uint32_t blockNumber, uint8_t* dst) {
|
|
|
|
#ifdef SD_CHECK_AND_RETRY
|
|
|
|
#if ENABLED(SD_CHECK_AND_RETRY)
|
|
|
|
uint8_t retryCnt = 3;
|
|
|
|
uint8_t retryCnt = 3;
|
|
|
|
// use address if not SDHC card
|
|
|
|
// use address if not SDHC card
|
|
|
|
if (type()!= SD_CARD_TYPE_SDHC) blockNumber <<= 9;
|
|
|
|
if (type()!= SD_CARD_TYPE_SDHC) blockNumber <<= 9;
|
|
|
|
@ -422,7 +422,7 @@ bool Sd2Card::readData(uint8_t *dst) {
|
|
|
|
return readData(dst, 512);
|
|
|
|
return readData(dst, 512);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SD_CHECK_AND_RETRY
|
|
|
|
#if ENABLED(SD_CHECK_AND_RETRY)
|
|
|
|
static const uint16_t crctab[] PROGMEM = {
|
|
|
|
static const uint16_t crctab[] PROGMEM = {
|
|
|
|
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
|
|
|
|
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
|
|
|
|
0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
|
|
|
|
0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
|
|
|
|
@ -483,7 +483,7 @@ bool Sd2Card::readData(uint8_t* dst, uint16_t count) {
|
|
|
|
// transfer data
|
|
|
|
// transfer data
|
|
|
|
spiRead(dst, count);
|
|
|
|
spiRead(dst, count);
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SD_CHECK_AND_RETRY
|
|
|
|
#if ENABLED(SD_CHECK_AND_RETRY)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
uint16_t calcCrc = CRC_CCITT(dst, count);
|
|
|
|
uint16_t calcCrc = CRC_CCITT(dst, count);
|
|
|
|
uint16_t recvCrc = spiRec() << 8;
|
|
|
|
uint16_t recvCrc = spiRec() << 8;
|
|
|
|
|
Richard Wackerbarth
9 years ago