eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse SDCArdManager logic

Browse Source
This commit is contained in:
jpirnay
2026-03-19 11:12:48 +01:00
parent d71b524f18
commit 12bf78592f
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/hal/HalStorage.cpp
+2 -18
View File
@@ -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 {