From 12bf78592f9e604bbc730b52195ba12ba56ade02 Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Thu, 19 Mar 2026 11:12:48 +0100
Subject: [PATCH] Reuse SDCArdManager logic

---
 lib/hal/HalStorage.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/hal/HalStorage.cpp b/lib/hal/HalStorage.cpp
index 63f469ed..604a32d1 100644
--- a/lib/hal/HalStorage.cpp
+++ b/lib/hal/HalStorage.cpp
@@ -12,9 +12,6 @@
 
 HalStorage HalStorage::instance;
 
-// Local SdFat instance for volume stats only
-static SdFat halStorageSdFat;
-
 HalStorage::HalStorage() {
   storageMutex = xSemaphoreCreateMutex();
   assert(storageMutex != nullptr);
@@ -60,25 +57,12 @@ bool HalStorage::ensureDirectoryExists(const char* path) { HAL_STORAGE_WRAPPED_C
 
 uint64_t HalStorage::sdTotalBytes() const {
   StorageLock lock;
-  // Try to initialize if not already
-  if (!halStorageSdFat.begin()) return 0;
-  auto* vol = halStorageSdFat.vol();
-  if (!vol) return 0;
-  return (uint64_t)vol->clusterCount() * vol->bytesPerCluster();
+  return SDCard.sdTotalBytes();
 }
 
 uint64_t HalStorage::sdUsedBytes() const {
   StorageLock lock;
-  if (!halStorageSdFat.begin()) return 0;
-  auto* vol = halStorageSdFat.vol();
-  if (!vol) return 0;
-  const int32_t freeClusters = vol->freeClusterCount();
-  if (freeClusters < 0) return 0;  // error reading FAT
-  const uint64_t clusterCount = vol->clusterCount();
-  uint64_t cappedFreeClusters = freeClusters < 0 ? 0 : (uint64_t)freeClusters;
-  if (cappedFreeClusters > clusterCount) cappedFreeClusters = clusterCount;
-  const uint64_t bytesPerCluster = vol->bytesPerCluster();
-  return (clusterCount - cappedFreeClusters) * bytesPerCluster;
+  return SDCard.sdUsedBytes();
 }
 
 uint64_t HalStorage::sdFreeBytes() const {