Skip to content

Commit 20d20a9

Browse files
committed
Removed getter implementation and commented usage in examples
1 parent 0e5e823 commit 20d20a9

File tree

4 files changed

+6
-60
lines changed

4 files changed

+6
-60
lines changed

Diff for: libraries/SD_MMC/examples/SDMMC_Test/SDMMC_Test.ino

+3
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,14 @@ void setup(){
225225
}
226226
#endif
227227

228+
/*
229+
// This is waiting for implementation in peripheral manager (periman)
228230
if(use_1_bit_mode){
229231
Serial.printf("Begin in 1-bit mode; pins: CLK=%d, CMD=%d, D0=%d\n", SD_MMC.getClkPin(), SD_MMC.getCmdPin(), SD_MMC.getD0Pin());
230232
}else{
231233
Serial.printf("Begin in 4-bit mode; pins: CLK=%d, CMD=%d, D0=%d, D1=%d, D2=%d, D3=%d\n", SD_MMC.getClkPin(), SD_MMC.getCmdPin(), SD_MMC.getD0Pin(), SD_MMC.getD1Pin(), SD_MMC.getD2Pin(), SD_MMC.getD3Pin());
232234
}
235+
*/
233236

234237
if(!SD_MMC.begin("/sdcard", use_1_bit_mode)){
235238
Serial.println("Card Mount Failed.");

Diff for: libraries/SD_MMC/examples/SDMMC_time/SDMMC_time.ino

+3
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,14 @@ void setup(){
228228
}
229229
#endif
230230

231+
/*
232+
// This is waiting for implementation in peripheral manager (periman)
231233
if(use_1_bit_mode){
232234
Serial.printf("Begin in 1-bit mode; pins: CLK=%d, CMD=%d, D0=%d\n", SD_MMC.getClkPin(), SD_MMC.getCmdPin(), SD_MMC.getD0Pin());
233235
}else{
234236
Serial.printf("Begin in 4-bit mode; pins: CLK=%d, CMD=%d, D0=%d, D1=%d, D2=%d, D3=%d\n", SD_MMC.getClkPin(), SD_MMC.getCmdPin(), SD_MMC.getD0Pin(), SD_MMC.getD1Pin(), SD_MMC.getD2Pin(), SD_MMC.getD3Pin());
235237
}
238+
*/
236239

237240
if(!SD_MMC.begin("/sdcard", use_1_bit_mode)){
238241
Serial.println("Card Mount Failed.");

Diff for: libraries/SD_MMC/src/SD_MMC.cpp

-54
Original file line numberDiff line numberDiff line change
@@ -102,60 +102,6 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3)
102102
#endif
103103
}
104104

105-
int SDMMCFS::getClkPin()
106-
{
107-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
108-
return _pin_clk;
109-
#elif CONFIG_IDF_TARGET_ESP32
110-
return SDMMC_SLOT1_IOMUX_PIN_NUM_CLK;
111-
#endif
112-
}
113-
114-
int SDMMCFS::getCmdPin()
115-
{
116-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
117-
return _pin_cmd;
118-
#elif CONFIG_IDF_TARGET_ESP32
119-
return SDMMC_SLOT1_IOMUX_PIN_NUM_CMD;
120-
#endif
121-
}
122-
123-
int SDMMCFS::getD0Pin()
124-
{
125-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
126-
return _pin_d0;
127-
#elif CONFIG_IDF_TARGET_ESP32
128-
return SDMMC_SLOT1_IOMUX_PIN_NUM_D0;
129-
#endif
130-
}
131-
132-
int SDMMCFS::getD1Pin()
133-
{
134-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
135-
return _pin_d1;
136-
#elif CONFIG_IDF_TARGET_ESP32
137-
return SDMMC_SLOT1_IOMUX_PIN_NUM_D1;
138-
#endif
139-
}
140-
141-
int SDMMCFS::getD2Pin()
142-
{
143-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
144-
return _pin_d2;
145-
#elif CONFIG_IDF_TARGET_ESP32
146-
return SDMMC_SLOT1_IOMUX_PIN_NUM_D2;
147-
#endif
148-
}
149-
150-
int SDMMCFS::getD3Pin()
151-
{
152-
#ifdef SOC_SDMMC_USE_GPIO_MATRIX
153-
return _pin_d3;
154-
#elif CONFIG_IDF_TARGET_ESP32
155-
return SDMMC_SLOT1_IOMUX_PIN_NUM_D3;
156-
#endif
157-
}
158-
159105
bool SDMMCFS::begin(const char * mountpoint, bool mode1bit, bool format_if_mount_failed, int sdmmc_frequency, uint8_t maxOpenFiles)
160106
{
161107
if(_card) {

Diff for: libraries/SD_MMC/src/SD_MMC.h

-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ class SDMMCFS : public FS
4848
SDMMCFS(FSImplPtr impl);
4949
bool setPins(int clk, int cmd, int d0);
5050
bool setPins(int clk, int cmd, int d0, int d1, int d2, int d3);
51-
int getClkPin();
52-
int getCmdPin();
53-
int getD0Pin();
54-
int getD1Pin();
55-
int getD2Pin();
56-
int getD3Pin();
5751
bool begin(const char * mountpoint="/sdcard", bool mode1bit=false, bool format_if_mount_failed=false, int sdmmc_frequency=BOARD_MAX_SDMMC_FREQ, uint8_t maxOpenFiles = 5);
5852
void end();
5953
sdcard_type_t cardType();

0 commit comments

Comments
 (0)