Support RP2350B, refactor, Cppcheck fixes and bug fixes.

Author: greiman

README.md

@@ -1,21 +1,48 @@
 ### Warning: This version has major internal changes.
 
-SdFat version 2.3.0 has major changes to implement RP2040/RP2350 SDIO.
+SdFat version 2.3.1 has major changes. In addition there a number of bug fixes.
 
-In addition there a number of bug fixes.
+Please post an issue if you find a bug.
 
-Begin by running the Rp2040SdioSetup example  to try RP2040/RP2350 SDIO.
+Support has been added for the SDIO on RP2350B QFN-80 with 48 GPIO pins.
+Each PIO block is still limited to 32 GPIOs at a time, but GPIOBASE
+selects which 32. 
 
-This example requires a SDIO Card socket with the following six lines.
+GPIOBASE can only have value of zero or 16 so all SDIO pins must be in the 
+range 0-31 or 16-47.
+
+Run the Rp2040SdioSetup example to try RP2040/RP2350 SDIO.
 
-CLK - A clock signal sent to the card by the MCU.
-CMD - A bidirectional line for for commands and responses.
-DAT[0:3] - Four bidirectional lines for data transfer.
+This example requires a SDIO Card socket with the following six lines.
 
+* CLK - A clock signal sent to the card by the MCU.
+* CMD - A bidirectional line for for commands and responses.
+* DAT[0:3] - Four bidirectional lines for data transfer.
 CLK and CMD can be connected to any GPIO pins. DAT[0:3] can be connected
 to any four consecutive GPIO pins in the order DAT0, DAT1, DAT2, DAT3.
 
-The release version of SdFat Version 2 is here:
+Here is an example of SDIO for Pico using an Adafruit socket, PiCowbell
+Proto and PiCowbell Proto Doubler.
+
+![Alt text](images/SdioSpi.jpg)
+
+This Socket supports SDIO with:
+```
+#define RP_CLK_GPIO 10
+#define RP_CMD_GPIO 11
+#define RP_DAT0_GPIO 12  // DAT1: GPIO13 DAT2: GPIO14, DAT3: GPIO15.
+```
+It also can be used on SPI1 with:
+```
+const uint8_t SD_CS_PIN = 15;
+#define SD_CONFIG SdSpiConfig(SD_CS_PIN, DEDICATED_SPI, SPI_CLOCK, &SPI1)
+
+  // In setup
+  SPI1.setSCK(10);
+  SPI1.setTX(11);
+  SPI1.setRX(12);
+```
+### The release version of SdFat Version 2 is here:
 
 https://github.com/greiman/SdFat
 
@@ -117,4 +144,4 @@ documentation for the classes SdFat32, SdExFat, SdFs, File32, ExFile, FsFile.
 The SdFat and File classes are defined in terms of the above classes by
 typedefs. Edit SdFatConfig.h to select class options.
 
-Please continue by reading the html documentation in the SdFat/doc folder.
+Please continue by reading the html documentation in the SdFat/doc folder.

doc/Doxyfile

@@ -958,9 +958,9 @@ INPUT                  = ../src \
                          ../src/SpiDriver \
                          mainpage.h \
                          ../src/FsLib \
-                         ../src/FsLib \
                          ../src/SdCard/TeensySdio \
-                         ../src/SdCard/Rp2040Sdio
+                         ../src/SdCard/PioSdio \
+                         ../src/SdCard/SdSpiCard
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

doc/SdErrorCodes.txt

@@ -1,4 +1,4 @@
-2022-07-01
+2025-01-01
 
 Run the SdErrorCode example to produce an updated list.
 
@@ -12,7 +12,7 @@ Code,Symbol - failed operation
 0X06,SD_CARD_ERROR_CMD8 - Send and check interface settings
 0X07,SD_CARD_ERROR_CMD9 - Read CSD data
 0X08,SD_CARD_ERROR_CMD10 - Read CID data
-0X09,SD_CARD_ERROR_CMD12 - Stop multiple block read
+0X09,SD_CARD_ERROR_CMD12 - Stop multiple block transmission
 0X0A,SD_CARD_ERROR_CMD13 - Read card status
 0X0B,SD_CARD_ERROR_CMD17 - Read single block
 0X0C,SD_CARD_ERROR_CMD18 - Read multiple blocks
@@ -46,6 +46,7 @@ Code,Symbol - failed operation
 0X28,SD_CARD_ERROR_ERASE_SINGLE_SECTOR - Card does not support erase
 0X29,SD_CARD_ERROR_ERASE_TIMEOUT - Erase command timeout
 0X2A,SD_CARD_ERROR_INIT_NOT_CALLED - Card has not been initialized
-0X2B,SD_CARD_ERROR_INVALID_CARD_CONFIG - Invalid card config
-0X2C,SD_CARD_ERROR_FUNCTION_NOT_SUPPORTED - Unsupported SDIO command
-0X2D,SD_CARD_ERROR_UNKNOWN - Unknown error
+0X2B,SD_CARD_ERROR_ADD_PIO_PROGRAM - Add PIO program
+0X2C,SD_CARD_ERROR_INVALID_CARD_CONFIG - Invalid card config
+0X2D,SD_CARD_ERROR_FUNCTION_NOT_SUPPORTED - Unsupported SDIO command
+0X2E,SD_CARD_ERROR_UNKNOWN - Unknown error

doc/html.zip

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2024 Bill Greiman
+ * Copyright (c) 2011-2025 Bill Greiman
  * This file is part of the SdFat library for SD memory cards.
  *
  * MIT License
@@ -149,7 +149,9 @@ will open "/music/BigBand.wav" on sd2.
 
 \section Install Installation
 
-You must manually install %SdFat by renaming the download folder %SdFat
+You can use the Arduino Library Manager to install release versions.
+
+You must manually install %SdFat beta by renaming the download folder %SdFat
 and copy the %SdFat folder to the Arduino libraries folder in your
 sketchbook folder.
 
@@ -247,10 +249,11 @@ debug folder - Some of my debug programs - will be remove in the future.
 
 DirectoryFunctions - Use of chdir(), ls(), mkdir(), and rmdir().
 
-examplesV1 folder - Examples from SdFat V1 for compatibility tests.
+examplesV1 folder - Examples from SdFat V1 soon to be removed.
 
 ExFatLogger - A data-logger optimized for exFAT features.
 
+
 MinimumSizeSdReader - Example of small file reader for FAT16/FAT32.
 
 OpenNext - Open all files in the root dir and print their filename.
@@ -261,6 +264,10 @@ ReadCsvFile - Function to read a CSV text file one field at a time.
 
 rename - demonstrates use of rename().
 
+RingBufLogger - Use of RingBuf class for fast data logging.
+
+Rp2040SdioSetup - Setup test for fast PIO SDIO.
+
 RtcTimestampTest - Demonstration of timestamps with RTClib.
 
 SdErrorCodes - Produce a list of error codes.
@@ -271,7 +278,7 @@ SdInfo - Initialize an SD card and analyze its structure for trouble shooting.
 
 SoftwareSpi - Demo of limited Software SPI support in SdFat V2.
 
-STM32Test - Example use of two SPI ports on an STM32 board.
+SpiLoopBackTest - Loop-back test of SPI pins.
 
 TeensyDmaAdcLogger - Fast logger using DMA ADC.
 

doc/mainpage.h

@@ -1,5 +1,4 @@
-#ifndef AnalogBinLogger_h
-#define AnalogBinLogger_h
+#pragma once
 const size_t BLOCK_SIZE = 64;
 //------------------------------------------------------------------------------
 // First block of file.
@@ -30,4 +29,3 @@ struct block16_t {
   unsigned short overrun;  // count of overruns since last block
   unsigned short data[DATA_DIM16];
 };
-#endif  // AnalogBinLogger_h

examples/AvrAdcLogger/AvrAdcLogger.h

@@ -1,7 +1,9 @@
 // Test and benchmark of the fast bufferedPrint class.
 //
 // Mainly for AVR but may improve print performance with other CPUs.
-#define DISABLE_FS_H_WARNING  // Disable warning for type File not defined.
+#ifndef DISABLE_FS_H_WARNING
+#define DISABLE_FS_H_WARNING  // Disable warning for type File not defined. 
+#endif  // DISABLE_FS_H_WARNING
 #include "SdFat.h"
 #include "BufferedPrint.h"
 // SD_FAT_TYPE = 0 for SdFat/File as defined in SdFatConfig.h,

examples/BufferedPrint/BufferedPrint.ino

@@ -1,7 +1,9 @@
 /*
  * Example use of chdir(), ls(), mkdir(), and  rmdir().
  */
+#ifndef DISABLE_FS_H_WARNING
 #define DISABLE_FS_H_WARNING  // Disable warning for type File not defined. 
+#endif  // DISABLE_FS_H_WARNING 
 #include "SdFat.h"
 #include "sdios.h"
 

examples/DirectoryFunctions/DirectoryFunctions.ino

@@ -1,9 +1,7 @@
 // Avoid IDE problems by defining struct in septate .h file.
 // Pad record so size is a power of two for best write performance.
-#ifndef ExFatLogger_h
-#define ExFatLogger_h
+#pragma once
 const size_t ADC_COUNT = 4;
 struct data_t {
   uint16_t adc[ADC_COUNT];
 };
-#endif  // ExFatLogger_h

examples/ExFatLogger/ExFatLogger.h

@@ -3,10 +3,12 @@
 //
 // The maximum data rate will depend on the quality of your SD,
 // the size of the FIFO, and using dedicated SPI.
-#define DISABLE_FS_H_WARNING  // Disable warning for type File not defined.
+#ifndef DISABLE_FS_H_WARNING
+#define DISABLE_FS_H_WARNING  // Disable warning for type File not defined. 
+#endif  // DISABLE_FS_H_WARNING 
 #include "SdFat.h"
-#include "ExFatLogger.h"
 #include "FreeStack.h"
+#include "ExFatLogger.h"
 //------------------------------------------------------------------------------
 // This example was designed for exFAT but will support FAT16/FAT32.
 // Note: Uno will not support SD_FAT_TYPE = 3.