diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx index fadf1e7..0b9d09d 100644 --- a/interface/src/system/SystemStatusForm.tsx +++ b/interface/src/system/SystemStatusForm.tsx @@ -7,7 +7,7 @@ import DevicesIcon from '@material-ui/icons/Devices'; import MemoryIcon from '@material-ui/icons/Memory'; import ShowChartIcon from '@material-ui/icons/ShowChart'; import SdStorageIcon from '@material-ui/icons/SdStorage'; -import StorageIcon from '@material-ui/icons/Storage'; +import FolderIcon from '@material-ui/icons/Folder'; import DataUsageIcon from '@material-ui/icons/DataUsage'; import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew'; import RefreshIcon from '@material-ui/icons/Refresh'; @@ -97,10 +97,10 @@ class SystemStatusForm extends Component - + - + diff --git a/interface/src/system/types.ts b/interface/src/system/types.ts index 336ba65..bbd9362 100644 --- a/interface/src/system/types.ts +++ b/interface/src/system/types.ts @@ -8,8 +8,8 @@ export interface SystemStatus { sdk_version: string; flash_chip_size: number; flash_chip_speed: number; - spiffs_used: number; - spiffs_total: number; + fs_used: number; + fs_total: number; } export interface OTASettings { diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp index 71b9a9b..13b15ee 100644 --- a/lib/framework/SystemStatus.cpp +++ b/lib/framework/SystemStatus.cpp @@ -26,13 +26,13 @@ void SystemStatus::systemStatus(AsyncWebServerRequest* request) { root["flash_chip_speed"] = ESP.getFlashChipSpeed(); #ifdef ESP32 - root["spiffs_total"] = SPIFFS.totalBytes(); - root["spiffs_used"] = SPIFFS.usedBytes(); + root["fs_total"] = SPIFFS.totalBytes(); + root["fs_used"] = SPIFFS.usedBytes(); #elif defined(ESP8266) FSInfo fs_info; SPIFFS.info(fs_info); - root["spiffs_total"] = fs_info.totalBytes; - root["spiffs_used"] = fs_info.usedBytes; + root["fs_total"] = fs_info.totalBytes; + root["fs_used"] = fs_info.usedBytes; #endif response->setLength();