Add exFAT support (#150)

## Summary

* Swap to updated SDCardManager which uses SdFat
* Add exFAT support
  * Swap to using FsFile everywhere
* Use newly exposed `SdMan` macro to get to static instance of
SDCardManager
* Move a bunch of FsHelpers up to SDCardManager

src/CrossPointSettings.cpp

@@ -1,8 +1,7 @@
 #include "CrossPointSettings.h"
 
-#include <FsHelpers.h>
 #include <HardwareSerial.h>
-#include <SD.h>
+#include <SDCardManager.h>
 #include <Serialization.h>
 
 // Initialize the static instance
@@ -17,10 +16,10 @@ constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin";
 
 bool CrossPointSettings::saveToFile() const {
   // Make sure the directory exists
-  SD.mkdir("/.crosspoint");
+  SdMan.mkdir("/.crosspoint");
 
-  File outputFile;
-  if (!FsHelpers::openFileForWrite("CPS", SETTINGS_FILE, outputFile)) {
+  FsFile outputFile;
+  if (!SdMan.openFileForWrite("CPS", SETTINGS_FILE, outputFile)) {
     return false;
   }
 
@@ -40,8 +39,8 @@ bool CrossPointSettings::saveToFile() const {
 }
 
 bool CrossPointSettings::loadFromFile() {
-  File inputFile;
-  if (!FsHelpers::openFileForRead("CPS", SETTINGS_FILE, inputFile)) {
+  FsFile inputFile;
+  if (!SdMan.openFileForRead("CPS", SETTINGS_FILE, inputFile)) {
     return false;
   }
 

src/CrossPointState.cpp

@@ -1,7 +1,7 @@
 #include "CrossPointState.h"
 
-#include <FsHelpers.h>
 #include <HardwareSerial.h>
+#include <SDCardManager.h>
 #include <Serialization.h>
 
 namespace {
@@ -12,8 +12,8 @@ constexpr char STATE_FILE[] = "/.crosspoint/state.bin";
 CrossPointState CrossPointState::instance;
 
 bool CrossPointState::saveToFile() const {
-  File outputFile;
-  if (!FsHelpers::openFileForWrite("CPS", STATE_FILE, outputFile)) {
+  FsFile outputFile;
+  if (!SdMan.openFileForWrite("CPS", STATE_FILE, outputFile)) {
     return false;
   }
 
@@ -24,8 +24,8 @@ bool CrossPointState::saveToFile() const {
 }
 
 bool CrossPointState::loadFromFile() {
-  File inputFile;
-  if (!FsHelpers::openFileForRead("CPS", STATE_FILE, inputFile)) {
+  FsFile inputFile;
+  if (!SdMan.openFileForRead("CPS", STATE_FILE, inputFile)) {
     return false;
   }
 

src/MappedInputManager.cpp

@@ -1,5 +1,7 @@
 #include "MappedInputManager.h"
 
+#include "CrossPointSettings.h"
+
 decltype(InputManager::BTN_BACK) MappedInputManager::mapButton(const Button button) const {
   const auto frontLayout = static_cast<CrossPointSettings::FRONT_BUTTON_LAYOUT>(SETTINGS.frontButtonLayout);
   const auto sideLayout = static_cast<CrossPointSettings::SIDE_BUTTON_LAYOUT>(SETTINGS.sideButtonLayout);

src/MappedInputManager.h

@@ -2,8 +2,6 @@
 
 #include <InputManager.h>
 
-#include "CrossPointSettings.h"
-
 class MappedInputManager {
  public:
   enum class Button { Back, Confirm, Left, Right, Up, Down, Power, PageBack, PageForward };

src/WifiCredentialStore.cpp

@@ -1,8 +1,7 @@
 #include "WifiCredentialStore.h"
 
-#include <FsHelpers.h>
 #include <HardwareSerial.h>
-#include <SD.h>
+#include <SDCardManager.h>
 #include <Serialization.h>
 
 // Initialize the static instance
@@ -30,10 +29,10 @@ void WifiCredentialStore::obfuscate(std::string& data) const {
 
 bool WifiCredentialStore::saveToFile() const {
   // Make sure the directory exists
-  SD.mkdir("/.crosspoint");
+  SdMan.mkdir("/.crosspoint");
 
-  File file;
-  if (!FsHelpers::openFileForWrite("WCS", WIFI_FILE, file)) {
+  FsFile file;
+  if (!SdMan.openFileForWrite("WCS", WIFI_FILE, file)) {
     return false;
   }
 
@@ -60,8 +59,8 @@ bool WifiCredentialStore::saveToFile() const {
 }
 
 bool WifiCredentialStore::loadFromFile() {
-  File file;
-  if (!FsHelpers::openFileForRead("WCS", WIFI_FILE, file)) {
+  FsFile file;
+  if (!SdMan.openFileForRead("WCS", WIFI_FILE, file)) {
     return false;
   }
 

src/activities/Activity.h

@@ -5,8 +5,7 @@
 #include <string>
 #include <utility>
 
-#include "../MappedInputManager.h"
-
+class MappedInputManager;
 class GfxRenderer;
 
 class Activity {

src/activities/boot_sleep/SleepActivity.cpp

@@ -3,7 +3,7 @@
 #include <Epub.h>
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
-#include <SD.h>
+#include <SDCardManager.h>
 #include <Xtc.h>
 
 #include <vector>
@@ -58,29 +58,31 @@ void SleepActivity::renderPopup(const char* message) const {
 
 void SleepActivity::renderCustomSleepScreen() const {
   // Check if we have a /sleep directory
-  auto dir = SD.open("/sleep");
+  auto dir = SdMan.open("/sleep");
   if (dir && dir.isDirectory()) {
     std::vector<std::string> files;
+    char name[128];
     // collect all valid BMP files
-    for (File file = dir.openNextFile(); file; file = dir.openNextFile()) {
+    for (auto file = dir.openNextFile(); file; file = dir.openNextFile()) {
       if (file.isDirectory()) {
         file.close();
         continue;
       }
-      auto filename = std::string(file.name());
+      file.getName(name, sizeof(name));
+      auto filename = std::string(name);
       if (filename[0] == '.') {
         file.close();
         continue;
       }
 
       if (filename.substr(filename.length() - 4) != ".bmp") {
-        Serial.printf("[%lu] [SLP] Skipping non-.bmp file name: %s\n", millis(), file.name());
+        Serial.printf("[%lu] [SLP] Skipping non-.bmp file name: %s\n", millis(), name);
         file.close();
         continue;
       }
       Bitmap bitmap(file);
       if (bitmap.parseHeaders() != BmpReaderError::Ok) {
-        Serial.printf("[%lu] [SLP] Skipping invalid BMP file: %s\n", millis(), file.name());
+        Serial.printf("[%lu] [SLP] Skipping invalid BMP file: %s\n", millis(), name);
         file.close();
         continue;
       }
@@ -92,8 +94,8 @@ void SleepActivity::renderCustomSleepScreen() const {
       // Generate a random number between 1 and numFiles
       const auto randomFileIndex = random(numFiles);
       const auto filename = "/sleep/" + files[randomFileIndex];
-      File file;
-      if (FsHelpers::openFileForRead("SLP", filename, file)) {
+      FsFile file;
+      if (SdMan.openFileForRead("SLP", filename, file)) {
         Serial.printf("[%lu] [SLP] Randomly loading: /sleep/%s\n", millis(), files[randomFileIndex].c_str());
         delay(100);
         Bitmap bitmap(file);
@@ -109,8 +111,8 @@ void SleepActivity::renderCustomSleepScreen() const {
 
   // Look for sleep.bmp on the root of the sd card to determine if we should
   // render a custom sleep screen instead of the default.
-  File file;
-  if (FsHelpers::openFileForRead("SLP", "/sleep.bmp", file)) {
+  FsFile file;
+  if (SdMan.openFileForRead("SLP", "/sleep.bmp", file)) {
     Bitmap bitmap(file);
     if (bitmap.parseHeaders() == BmpReaderError::Ok) {
       Serial.printf("[%lu] [SLP] Loading: /sleep.bmp\n", millis());
@@ -224,8 +226,8 @@ void SleepActivity::renderCoverSleepScreen() const {
     coverBmpPath = lastEpub.getCoverBmpPath();
   }
 
-  File file;
-  if (FsHelpers::openFileForRead("SLP", coverBmpPath, file)) {
+  FsFile file;
+  if (SdMan.openFileForRead("SLP", coverBmpPath, file)) {
     Bitmap bitmap(file);
     if (bitmap.parseHeaders() == BmpReaderError::Ok) {
       renderBitmapSleepScreen(bitmap);

src/activities/home/HomeActivity.cpp

@@ -1,10 +1,10 @@
 #include "HomeActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
-#include <SD.h>
+#include <SDCardManager.h>
 
 #include "CrossPointState.h"
+#include "MappedInputManager.h"
 #include "config.h"
 
 void HomeActivity::taskTrampoline(void* param) {
@@ -20,7 +20,7 @@ void HomeActivity::onEnter() {
   renderingMutex = xSemaphoreCreateMutex();
 
   // Check if we have a book to continue reading
-  hasContinueReading = !APP_STATE.openEpubPath.empty() && SD.exists(APP_STATE.openEpubPath.c_str());
+  hasContinueReading = !APP_STATE.openEpubPath.empty() && SdMan.exists(APP_STATE.openEpubPath.c_str());
 
   selectorIndex = 0;
 

src/activities/network/CrossPointWebServerActivity.cpp

@@ -3,12 +3,12 @@
 #include <DNSServer.h>
 #include <ESPmDNS.h>
 #include <GfxRenderer.h>
-#include <InputManager.h>
 #include <WiFi.h>
 #include <qrcode.h>
 
 #include <cstddef>
 
+#include "MappedInputManager.h"
 #include "NetworkModeSelectionActivity.h"
 #include "WifiSelectionActivity.h"
 #include "config.h"

src/activities/network/NetworkModeSelectionActivity.cpp

@@ -1,8 +1,8 @@
 #include "NetworkModeSelectionActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
 
+#include "MappedInputManager.h"
 #include "config.h"
 
 namespace {

src/activities/network/WifiSelectionActivity.cpp

@@ -5,6 +5,7 @@
 
 #include <map>
 
+#include "MappedInputManager.h"
 #include "WifiCredentialStore.h"
 #include "activities/util/KeyboardEntryActivity.h"
 #include "config.h"

src/activities/reader/EpubReaderActivity.cpp

@@ -3,12 +3,13 @@
 #include <Epub/Page.h>
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
-#include <InputManager.h>
+#include <SDCardManager.h>
 
 #include "Battery.h"
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
 #include "EpubReaderChapterSelectionActivity.h"
+#include "MappedInputManager.h"
 #include "config.h"
 
 namespace {
@@ -54,8 +55,8 @@ void EpubReaderActivity::onEnter() {
 
   epub->setupCacheDir();
 
-  File f;
-  if (FsHelpers::openFileForRead("ERS", epub->getCachePath() + "/progress.bin", f)) {
+  FsFile f;
+  if (SdMan.openFileForRead("ERS", epub->getCachePath() + "/progress.bin", f)) {
     uint8_t data[4];
     if (f.read(data, 4) == 4) {
       currentSpineIndex = data[0] + (data[1] << 8);
@@ -346,8 +347,8 @@ void EpubReaderActivity::renderScreen() {
     Serial.printf("[%lu] [ERS] Rendered page in %dms\n", millis(), millis() - start);
   }
 
-  File f;
-  if (FsHelpers::openFileForWrite("ERS", epub->getCachePath() + "/progress.bin", f)) {
+  FsFile f;
+  if (SdMan.openFileForWrite("ERS", epub->getCachePath() + "/progress.bin", f)) {
     uint8_t data[4];
     data[0] = currentSpineIndex & 0xFF;
     data[1] = (currentSpineIndex >> 8) & 0xFF;

src/activities/reader/EpubReaderChapterSelectionActivity.cpp

@@ -1,9 +1,8 @@
 #include "EpubReaderChapterSelectionActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
-#include <SD.h>
 
+#include "MappedInputManager.h"
 #include "config.h"
 
 namespace {

src/activities/reader/FileSelectionActivity.cpp

@@ -1,9 +1,9 @@
 #include "FileSelectionActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
-#include <SD.h>
+#include <SDCardManager.h>
 
+#include "MappedInputManager.h"
 #include "config.h"
 
 namespace {
@@ -30,17 +30,19 @@ void FileSelectionActivity::taskTrampoline(void* param) {
 void FileSelectionActivity::loadFiles() {
   files.clear();
   selectorIndex = 0;
-  auto root = SD.open(basepath.c_str());
-  for (File file = root.openNextFile(); file; file = root.openNextFile()) {
-    auto filename = std::string(file.name());
-    if (filename[0] == '.') {
+  auto root = SdMan.open(basepath.c_str());
+  char name[128];
+  for (auto file = root.openNextFile(); file; file = root.openNextFile()) {
+    file.getName(name, sizeof(name));
+    if (name[0] == '.') {
       file.close();
       continue;
     }
 
     if (file.isDirectory()) {
-      files.emplace_back(filename + "/");
+      files.emplace_back(std::string(name) + "/");
     } else {
+      auto filename = std::string(name);
       std::string ext4 = filename.length() >= 4 ? filename.substr(filename.length() - 4) : "";
       std::string ext5 = filename.length() >= 5 ? filename.substr(filename.length() - 5) : "";
       if (ext5 == ".epub" || ext5 == ".xtch" || ext4 == ".xtc") {

src/activities/reader/ReaderActivity.cpp

@@ -1,7 +1,5 @@
 #include "ReaderActivity.h"
 
-#include <SD.h>
-
 #include "Epub.h"
 #include "EpubReaderActivity.h"
 #include "FileSelectionActivity.h"
@@ -29,7 +27,7 @@ bool ReaderActivity::isXtcFile(const std::string& path) {
 }
 
 std::unique_ptr<Epub> ReaderActivity::loadEpub(const std::string& path) {
-  if (!SD.exists(path.c_str())) {
+  if (!SdMan.exists(path.c_str())) {
     Serial.printf("[%lu] [   ] File does not exist: %s\n", millis(), path.c_str());
     return nullptr;
   }
@@ -44,7 +42,7 @@ std::unique_ptr<Epub> ReaderActivity::loadEpub(const std::string& path) {
 }
 
 std::unique_ptr<Xtc> ReaderActivity::loadXtc(const std::string& path) {
-  if (!SD.exists(path.c_str())) {
+  if (!SdMan.exists(path.c_str())) {
     Serial.printf("[%lu] [   ] File does not exist: %s\n", millis(), path.c_str());
     return nullptr;
   }

src/activities/reader/XtcReaderActivity.cpp

@@ -9,10 +9,10 @@
 
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
-#include <InputManager.h>
+#include <SDCardManager.h>
 
-#include "CrossPointSettings.h"
 #include "CrossPointState.h"
+#include "MappedInputManager.h"
 #include "XtcReaderChapterSelectionActivity.h"
 #include "config.h"
 
@@ -357,8 +357,8 @@ void XtcReaderActivity::renderPage() {
 }
 
 void XtcReaderActivity::saveProgress() const {
-  File f;
-  if (FsHelpers::openFileForWrite("XTR", xtc->getCachePath() + "/progress.bin", f)) {
+  FsFile f;
+  if (SdMan.openFileForWrite("XTR", xtc->getCachePath() + "/progress.bin", f)) {
     uint8_t data[4];
     data[0] = currentPage & 0xFF;
     data[1] = (currentPage >> 8) & 0xFF;
@@ -370,8 +370,8 @@ void XtcReaderActivity::saveProgress() const {
 }
 
 void XtcReaderActivity::loadProgress() {
-  File f;
-  if (FsHelpers::openFileForRead("XTR", xtc->getCachePath() + "/progress.bin", f)) {
+  FsFile f;
+  if (SdMan.openFileForRead("XTR", xtc->getCachePath() + "/progress.bin", f)) {
     uint8_t data[4];
     if (f.read(data, 4) == 4) {
       currentPage = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);

src/activities/reader/XtcReaderChapterSelectionActivity.cpp

@@ -1,9 +1,8 @@
 #include "XtcReaderChapterSelectionActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
-#include <SD.h>
 
+#include "MappedInputManager.h"
 #include "config.h"
 
 namespace {

src/activities/settings/OtaUpdateActivity.cpp

@@ -1,9 +1,9 @@
 #include "OtaUpdateActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
 #include <WiFi.h>
 
+#include "MappedInputManager.h"
 #include "activities/network/WifiSelectionActivity.h"
 #include "config.h"
 #include "network/OtaUpdater.h"

src/activities/settings/SettingsActivity.cpp

@@ -1,9 +1,9 @@
 #include "SettingsActivity.h"
 
 #include <GfxRenderer.h>
-#include <InputManager.h>
 
 #include "CrossPointSettings.h"
+#include "MappedInputManager.h"
 #include "OtaUpdateActivity.h"
 #include "config.h"
 

src/activities/util/KeyboardEntryActivity.cpp

@@ -1,6 +1,7 @@
 #include "KeyboardEntryActivity.h"
 
 #include "../../config.h"
+#include "MappedInputManager.h"
 
 // Keyboard layouts - lowercase
 const char* const KeyboardEntryActivity::keyboard[NUM_ROWS] = {

src/main.cpp

@@ -3,7 +3,7 @@
 #include <Epub.h>
 #include <GfxRenderer.h>
 #include <InputManager.h>
-#include <SD.h>
+#include <SDCardManager.h>
 #include <SPI.h>
 #include <builtinFonts/bookerly_2b.h>
 #include <builtinFonts/bookerly_bold_2b.h>
@@ -37,7 +37,6 @@
 
 #define UART0_RXD 20  // Used for USB connection detection
 
-#define SD_SPI_CS 12
 #define SD_SPI_MISO 7
 
 EInkDisplay einkDisplay(EPD_SCLK, EPD_MOSI, EPD_CS, EPD_DC, EPD_RST, EPD_BUSY);
@@ -189,7 +188,7 @@ void setup() {
 
   // SD Card Initialization
   // We need 6 open files concurrently when parsing a new chapter
-  if (!SD.begin(SD_SPI_CS, SPI, SPI_FQ, "/sd", 6)) {
+  if (!SdMan.begin()) {
     Serial.printf("[%lu] [   ] SD card initialization failed\n", millis());
     setupDisplayAndFonts();
     exitActivity();

src/network/CrossPointWebServer.cpp

@@ -2,7 +2,7 @@
 
 #include <ArduinoJson.h>
 #include <FsHelpers.h>
-#include <SD.h>
+#include <SDCardManager.h>
 #include <WiFi.h>
 
 #include <algorithm>
@@ -170,7 +170,7 @@ void CrossPointWebServer::handleStatus() const {
 }
 
 void CrossPointWebServer::scanFiles(const char* path, const std::function<void(FileInfo)>& callback) const {
-  File root = SD.open(path);
+  FsFile root = SdMan.open(path);
   if (!root) {
     Serial.printf("[%lu] [WEB] Failed to open directory: %s\n", millis(), path);
     return;
@@ -184,9 +184,11 @@ void CrossPointWebServer::scanFiles(const char* path, const std::function<void(F
 
   Serial.printf("[%lu] [WEB] Scanning files in: %s\n", millis(), path);
 
-  File file = root.openNextFile();
+  FsFile file = root.openNextFile();
+  char name[128];
   while (file) {
-    auto fileName = String(file.name());
+    file.getName(name, sizeof(name));
+    auto fileName = String(name);
 
     // Skip hidden items (starting with ".")
     bool shouldHide = fileName.startsWith(".");
@@ -279,7 +281,7 @@ void CrossPointWebServer::handleFileListData() const {
 }
 
 // Static variables for upload handling
-static File uploadFile;
+static FsFile uploadFile;
 static String uploadFileName;
 static String uploadPath = "/";
 static size_t uploadSize = 0;
@@ -334,13 +336,13 @@ void CrossPointWebServer::handleUpload() const {
     filePath += uploadFileName;
 
     // Check if file already exists
-    if (SD.exists(filePath.c_str())) {
+    if (SdMan.exists(filePath.c_str())) {
       Serial.printf("[%lu] [WEB] [UPLOAD] Overwriting existing file: %s\n", millis(), filePath.c_str());
-      SD.remove(filePath.c_str());
+      SdMan.remove(filePath.c_str());
     }
 
     // Open file for writing
-    if (!FsHelpers::openFileForWrite("WEB", filePath, uploadFile)) {
+    if (!SdMan.openFileForWrite("WEB", filePath, uploadFile)) {
       uploadError = "Failed to create file on SD card";
       Serial.printf("[%lu] [WEB] [UPLOAD] FAILED to create file: %s\n", millis(), filePath.c_str());
       return;
@@ -393,7 +395,7 @@ void CrossPointWebServer::handleUpload() const {
       String filePath = uploadPath;
       if (!filePath.endsWith("/")) filePath += "/";
       filePath += uploadFileName;
-      SD.remove(filePath.c_str());
+      SdMan.remove(filePath.c_str());
     }
     uploadError = "Upload aborted";
     Serial.printf("[%lu] [WEB] Upload aborted\n", millis());
@@ -444,13 +446,13 @@ void CrossPointWebServer::handleCreateFolder() const {
   Serial.printf("[%lu] [WEB] Creating folder: %s\n", millis(), folderPath.c_str());
 
   // Check if already exists
-  if (SD.exists(folderPath.c_str())) {
+  if (SdMan.exists(folderPath.c_str())) {
     server->send(400, "text/plain", "Folder already exists");
     return;
   }
 
   // Create the folder
-  if (SD.mkdir(folderPath.c_str())) {
+  if (SdMan.mkdir(folderPath.c_str())) {
     Serial.printf("[%lu] [WEB] Folder created successfully: %s\n", millis(), folderPath.c_str());
     server->send(200, "text/plain", "Folder created: " + folderName);
   } else {
@@ -500,7 +502,7 @@ void CrossPointWebServer::handleDelete() const {
   }
 
   // Check if item exists
-  if (!SD.exists(itemPath.c_str())) {
+  if (!SdMan.exists(itemPath.c_str())) {
     Serial.printf("[%lu] [WEB] Delete failed - item not found: %s\n", millis(), itemPath.c_str());
     server->send(404, "text/plain", "Item not found");
     return;
@@ -512,10 +514,10 @@ void CrossPointWebServer::handleDelete() const {
 
   if (itemType == "folder") {
     // For folders, try to remove (will fail if not empty)
-    File dir = SD.open(itemPath.c_str());
+    FsFile dir = SdMan.open(itemPath.c_str());
     if (dir && dir.isDirectory()) {
       // Check if folder is empty
-      File entry = dir.openNextFile();
+      FsFile entry = dir.openNextFile();
       if (entry) {
         // Folder is not empty
         entry.close();
@@ -526,10 +528,10 @@ void CrossPointWebServer::handleDelete() const {
       }
       dir.close();
     }
-    success = SD.rmdir(itemPath.c_str());
+    success = SdMan.rmdir(itemPath.c_str());
   } else {
     // For files, use remove
-    success = SD.remove(itemPath.c_str());
+    success = SdMan.remove(itemPath.c_str());
   }
 
   if (success) {