Skip to content

Commit 43c9cda

Browse files
committed
set WsV2.pin_sd_cs on InitSdCard(pin_cs) call
1 parent 3be34a3 commit 43c9cda

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/Wippersnapper_V2.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,10 @@ void Wippersnapper_V2::provision() {
9696
if (WsV2._sdCardV2->isSDCardInitialized()) {
9797
return; // SD card initialized, cede control back to loop()
9898
} else {
99-
uint8_t cspin = WsV2.pin_sd_cs;
100-
if (cspin == 255) {
101-
// No CS pin found in config.json, so we've used the default
102-
cspin = SD_CS_PIN;
103-
}
10499
haltErrorV2("SD initialization failed.\nDo not reformat the card!\nIs the "
105100
"card correctly inserted?\nIs there a wiring/soldering "
106101
"problem\nIs the config.json file malformed?\nSD CS Pin: " +
107-
String(cspin));
102+
String(WsV2.pin_sd_cs));
108103
}
109104

110105
#ifdef USE_DISPLAY

src/provisioning/sdcard/ws_sdcard.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525
/**************************************************************************/
2626
bool ws_sdcard::InitSdCard(uint8_t pin_cs) {
27+
WsV2.pin_sd_cs = pin_cs;
2728
#ifdef SD_USE_SPI_1
2829
SdSpiConfig _sd_spi_cfg(pin_cs, DEDICATED_SPI, SPI_SD_CLOCK, &SPI1);
2930
#else

0 commit comments

Comments
 (0)