Skip to content

Commit

Permalink
Adding CS pin parameter to SD.begin(). Defaults to 4 (for Arduino Eth…
Browse files Browse the repository at this point in the history
  • Loading branch information
damellis committed Nov 14, 2010
1 parent 8629da8 commit 6cbb866
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
10 changes: 4 additions & 6 deletions libraries/SD/SD.cpp
Expand Up @@ -52,10 +52,6 @@

#include "SD.h"

// Use this to configure the chip select pin of the SD card.
#define SD_CARD_CHIP_SELECT_PIN 4 // For use with Arduino Ethernet Shield


// Used by `getNextPathComponent`
#define MAX_COMPONENT_LEN 12 // What is max length?
#define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1
Expand Down Expand Up @@ -311,7 +307,9 @@ boolean callback_openPath(SdFile& parentDir, char *filePathComponent,

/* Implementation of class used to create `SDCard` object. */

void SDClass::begin() {


void SDClass::begin(uint8_t csPin) {
/*
Performs the initialisation required by the sdfatlib library.
Expand All @@ -320,7 +318,7 @@ void SDClass::begin() {
*/
// TODO: Allow chip select pin to be supplied?
if (!(card.init(SPI_HALF_SPEED, SD_CARD_CHIP_SELECT_PIN)
if (!(card.init(SPI_HALF_SPEED, csPin)
&& volume.init(card) && root.openRoot(volume))) {
while (true) {
// Bail
Expand Down
7 changes: 5 additions & 2 deletions libraries/SD/SD.h
@@ -1,6 +1,6 @@
/*
MemoryCard - a slightly more friendly wrapper for sdfatlib
SD - a slightly more friendly wrapper for sdfatlib
This library aims to expose a subset of SD card functionality
in the form of a higher level "wrapper" object.
Expand All @@ -20,6 +20,9 @@
#include <utility/SdFat.h>
#include <utility/SdFatUtil.h>

// Use this to configure the chip select pin of the SD card.
#define SD_CARD_CHIP_SELECT_PIN 4 // For use with Arduino Ethernet Shield

class SDClass {

private:
Expand All @@ -32,7 +35,7 @@ class SDClass {
public:
// This needs to be called to set up the connection to the memory card
// before other methods are used.
void begin();
void begin(uint8_t csPin = SD_CARD_CHIP_SELECT_PIN);

// Open the specified file/directory with the supplied mode (e.g. read or
// write, etc). Once opened the file can be accessed via the
Expand Down

0 comments on commit 6cbb866

Please sign in to comment.