Refactor to adhere to new SdFat format

JosipKuci · JosipKuci · commit b3aa47bedbc6 · 2025-12-18T14:38:48.000+01:00
diff --git a/src/boards/Inkplate10/Inkplate10Driver.cpp b/src/boards/Inkplate10/Inkplate10Driver.cpp
@@ -4,7 +4,7 @@
 #include "Inkplate.h"
 
 SPIClass spi2(2);
-SdFat sd(&spi2);
+SdFat sd;
 
 /**
  *
@@ -859,7 +859,7 @@ int16_t EPDDriver::sdCardInit()
     internalIO.digitalWrite(SD_PMOS_PIN, LOW);
     delay(50);
     spi2.begin(14, 12, 13, 15);
-    setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));
+    setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));
     return getSdCardOk();
 }
 
@@ -883,7 +883,7 @@ void EPDDriver::sdCardSleep()
  *
  * @return      sd card class object
  */
-SdFat EPDDriver::getSdFat()
+SdFat& EPDDriver::getSdFat()
 {
     return sd;
 }
diff --git a/src/boards/Inkplate10/Inkplate10Driver.h b/src/boards/Inkplate10/Inkplate10Driver.h
@@ -50,7 +50,7 @@ class EPDDriver
     int16_t getSdCardOk();
     int16_t sdCardInit();
     void sdCardSleep();
-    SdFat getSdFat();
+    SdFat& getSdFat();
     SPIClass *getSPIptr();
 
     int8_t readTemperature();
diff --git a/src/boards/Inkplate5V2/Inkplate5V2Driver.cpp b/src/boards/Inkplate5V2/Inkplate5V2Driver.cpp
@@ -4,7 +4,7 @@
 #include "Inkplate.h"
 
 SPIClass spi2(2);
-SdFat sd(&spi2);
+SdFat sd;
 
 /**
  *
@@ -915,7 +915,7 @@ int16_t EPDDriver::sdCardInit()
     internalIO.digitalWrite(SD_PMOS_PIN, LOW);
     delay(50);
     spi2.begin(14, 12, 13, 15);
-    setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));
+    setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));
     return getSdCardOk();
 }
 
diff --git a/src/boards/Inkplate5V2/Inkplate5V2Driver.h b/src/boards/Inkplate5V2/Inkplate5V2Driver.h
@@ -52,7 +52,7 @@ class EPDDriver : public Esp
     int16_t getSdCardOk();
     int16_t sdCardInit();
     void sdCardSleep();
-    SdFat getSdFat();
+    SdFat& getSdFat();
     SPIClass *getSPIptr();
 
     int8_t readTemperature();
diff --git a/src/boards/Inkplate6/Inkplate6Driver.cpp b/src/boards/Inkplate6/Inkplate6Driver.cpp
@@ -4,7 +4,7 @@
 #include "Inkplate.h"
 
 SPIClass spi2(2);
-SdFat sd(&spi2);
+SdFat sd;
 
 /**
  *
@@ -902,7 +902,7 @@ int16_t EPDDriver::sdCardInit()
     internalIO.digitalWrite(SD_PMOS_PIN, LOW);
     delay(50);
     spi2.begin(14, 12, 13, 15);
-    setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));
+    setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));
     return getSdCardOk();
 }
 
@@ -926,7 +926,7 @@ void EPDDriver::sdCardSleep()
  *
  * @return      sd card class object
  */
-SdFat EPDDriver::getSdFat()
+SdFat& EPDDriver::getSdFat()
 {
     return sd;
 }
diff --git a/src/boards/Inkplate6/Inkplate6Driver.h b/src/boards/Inkplate6/Inkplate6Driver.h
@@ -52,7 +52,7 @@ class EPDDriver : public Esp
     int16_t getSdCardOk();
     int16_t sdCardInit();
     void sdCardSleep();
-    SdFat getSdFat();
+    SdFat& getSdFat();
     SPIClass *getSPIptr();
 
     int8_t readTemperature();
diff --git a/src/boards/Inkplate6COLOR/Inkplate6COLORDriver.cpp b/src/boards/Inkplate6COLOR/Inkplate6COLORDriver.cpp
@@ -4,7 +4,7 @@
 #include "Inkplate.h"
 
 SPIClass spi2(2);
-SdFat sd(&spi2);
+SdFat sd;
 
 SPIClass epdSPI(VSPI);
 SPISettings epdSpiSettings(2000000, MSBFIRST, SPI_MODE0);
@@ -448,7 +448,7 @@ int16_t EPDDriver::sdCardInit()
     internalIO.digitalWrite(SD_PMOS_PIN, LOW);
     delay(50);
     spi2.begin(14, 12, 13, 15);
-    setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));
+    setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));
     return getSdCardOk();
 }
 
@@ -472,7 +472,7 @@ void EPDDriver::sdCardSleep()
  *
  * @return      sd card class object
  */
-SdFat EPDDriver::getSdFat()
+SdFat& EPDDriver::getSdFat()
 {
     return sd;
 }
diff --git a/src/boards/Inkplate6COLOR/Inkplate6COLORDriver.h b/src/boards/Inkplate6COLOR/Inkplate6COLORDriver.h
@@ -45,7 +45,7 @@ class EPDDriver
     int16_t getSdCardOk();
     int16_t sdCardInit();
     void sdCardSleep();
-    SdFat getSdFat();
+    SdFat& getSdFat();
     SPIClass *getSPIptr();
 
     double readBattery();
diff --git a/src/boards/Inkplate6FLICK/Inkplate6FLICKDriver.cpp b/src/boards/Inkplate6FLICK/Inkplate6FLICKDriver.cpp
@@ -3,7 +3,7 @@
 #include "Inkplate.h"
 
 SPIClass spi2(2);
-SdFat sd(&spi2);
+SdFat sd;
 
 /**
  *
@@ -906,7 +906,7 @@ int16_t EPDDriver::sdCardInit()
     internalIO.digitalWrite(SD_PMOS_PIN, LOW);
     delay(50);
     spi2.begin(14, 12, 13, 15);
-    setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));
+    setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));
     return getSdCardOk();
 }
 
@@ -930,7 +930,7 @@ void EPDDriver::sdCardSleep()
  *
  * @return      sd card class object
  */
-SdFat EPDDriver::getSdFat()
+SdFat& EPDDriver::getSdFat()
 {
     return sd;
 }
diff --git a/src/boards/Inkplate6FLICK/Inkplate6FLICKDriver.h b/src/boards/Inkplate6FLICK/Inkplate6FLICKDriver.h
@@ -52,7 +52,7 @@ class EPDDriver : public Esp
     int16_t getSdCardOk();
     int16_t sdCardInit();
     void sdCardSleep();
-    SdFat getSdFat();
+    SdFat& getSdFat();
     SPIClass *getSPIptr();
 
     int8_t readTemperature();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include "Inkplate.h"`
`5`	`5`
`6`	`6`	`SPIClass spi2(2);`
`7`		`-SdFat sd(&spi2);`
	`7`	`+SdFat sd;`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`*`
`@@ -859,7 +859,7 @@ int16_t EPDDriver::sdCardInit()`
`859`	`859`	`internalIO.digitalWrite(SD_PMOS_PIN, LOW);`
`860`	`860`	`delay(50);`
`861`	`861`	`spi2.begin(14, 12, 13, 15);`
`862`		`- setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));`
	`862`	`+ setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));`
`863`	`863`	`return getSdCardOk();`
`864`	`864`	`}`
`865`	`865`
`@@ -883,7 +883,7 @@ void EPDDriver::sdCardSleep()`
`883`	`883`	`*`
`884`	`884`	`* @return sd card class object`
`885`	`885`	`*/`
`886`		`-SdFat EPDDriver::getSdFat()`
	`886`	`+SdFat& EPDDriver::getSdFat()`
`887`	`887`	`{`
`888`	`888`	`return sd;`
`889`	`889`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "Inkplate.h"`
`4`	`4`
`5`	`5`	`SPIClass spi2(2);`
`6`		`-SdFat sd(&spi2);`
	`6`	`+SdFat sd;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`*`
`@@ -906,7 +906,7 @@ int16_t EPDDriver::sdCardInit()`
`906`	`906`	`internalIO.digitalWrite(SD_PMOS_PIN, LOW);`
`907`	`907`	`delay(50);`
`908`	`908`	`spi2.begin(14, 12, 13, 15);`
`909`		`- setSdCardOk(sd.begin(15, SD_SCK_MHZ(25)));`
	`909`	`+ setSdCardOk(sd.begin(SdSpiConfig(15, SHARED_SPI, SD_SCK_MHZ(25), &spi2)));`
`910`	`910`	`return getSdCardOk();`
`911`	`911`	`}`
`912`	`912`
`@@ -930,7 +930,7 @@ void EPDDriver::sdCardSleep()`
`930`	`930`	`*`
`931`	`931`	`* @return sd card class object`
`932`	`932`	`*/`
`933`		`-SdFat EPDDriver::getSdFat()`
	`933`	`+SdFat& EPDDriver::getSdFat()`
`934`	`934`	`{`
`935`	`935`	`return sd;`
`936`	`936`	`}`