From ce8929fd39947800ef3a79f89a15ac8ce7e080e4 Mon Sep 17 00:00:00 2001 From: Raomin Date: Fri, 22 May 2020 02:06:13 +0200 Subject: [PATCH 1/3] add spiffs size + formatting --- interface/src/system/SystemStatusForm.tsx | 22 ++++++++++++++++++---- interface/src/system/types.ts | 2 ++ lib/framework/SystemStatus.cpp | 7 +++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx index 7c3f431..25cf1f1 100644 --- a/interface/src/system/SystemStatusForm.tsx +++ b/interface/src/system/SystemStatusForm.tsx @@ -7,6 +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 DataUsageIcon from '@material-ui/icons/DataUsage'; import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew'; import RefreshIcon from '@material-ui/icons/Refresh'; @@ -26,6 +27,11 @@ interface SystemStatusFormState { type SystemStatusFormProps = AuthenticatedContextProps & RestFormProps; +function asNum(num: number){ + return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " "); +} + + class SystemStatusForm extends Component { state: SystemStatusFormState = { @@ -67,7 +73,7 @@ class SystemStatusForm extends Component - + @@ -76,7 +82,7 @@ class SystemStatusForm extends Component - + @@ -85,12 +91,20 @@ class SystemStatusForm extends Component - + + + + + + + + + ); - } + } renderRestartDialog() { return ( diff --git a/interface/src/system/types.ts b/interface/src/system/types.ts index 323f947..c1c3bc0 100644 --- a/interface/src/system/types.ts +++ b/interface/src/system/types.ts @@ -8,6 +8,8 @@ export interface SystemStatus { sdk_version: string; flash_chip_size: number; flash_chip_speed: number; + spiffs_size:number; + spiffs_used:number; } export interface OTASettings { diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp index cda53c9..bb3d20b 100644 --- a/lib/framework/SystemStatus.cpp +++ b/lib/framework/SystemStatus.cpp @@ -1,4 +1,9 @@ #include +#ifdef ESP32 +#include +#elif defined(ESP8266) +#include +#endif SystemStatus::SystemStatus(AsyncWebServer* server, SecurityManager* securityManager) { server->on(SYSTEM_STATUS_SERVICE_PATH, @@ -24,6 +29,8 @@ void SystemStatus::systemStatus(AsyncWebServerRequest* request) { root["sdk_version"] = ESP.getSdkVersion(); root["flash_chip_size"] = ESP.getFlashChipSize(); root["flash_chip_speed"] = ESP.getFlashChipSpeed(); + root["spiffs_used"] = SPIFFS.usedBytes(); + root["spiffs_size"] = SPIFFS.totalBytes(); response->setLength(); request->send(response); } From 49910e1272aca966c88889ff43937f64462b7581 Mon Sep 17 00:00:00 2001 From: Raomin Date: Sun, 24 May 2020 23:35:32 +0200 Subject: [PATCH 2/3] add spiffs size + formatting --- interface/src/system/SystemStatusForm.tsx | 22 ++++++++++++++++++---- interface/src/system/types.ts | 2 ++ lib/framework/SystemStatus.cpp | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx index 7c3f431..25cf1f1 100644 --- a/interface/src/system/SystemStatusForm.tsx +++ b/interface/src/system/SystemStatusForm.tsx @@ -7,6 +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 DataUsageIcon from '@material-ui/icons/DataUsage'; import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew'; import RefreshIcon from '@material-ui/icons/Refresh'; @@ -26,6 +27,11 @@ interface SystemStatusFormState { type SystemStatusFormProps = AuthenticatedContextProps & RestFormProps; +function asNum(num: number){ + return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " "); +} + + class SystemStatusForm extends Component { state: SystemStatusFormState = { @@ -67,7 +73,7 @@ class SystemStatusForm extends Component - + @@ -76,7 +82,7 @@ class SystemStatusForm extends Component - + @@ -85,12 +91,20 @@ class SystemStatusForm extends Component - + + + + + + + + + ); - } + } renderRestartDialog() { return ( diff --git a/interface/src/system/types.ts b/interface/src/system/types.ts index 323f947..c1c3bc0 100644 --- a/interface/src/system/types.ts +++ b/interface/src/system/types.ts @@ -8,6 +8,8 @@ export interface SystemStatus { sdk_version: string; flash_chip_size: number; flash_chip_speed: number; + spiffs_size:number; + spiffs_used:number; } export interface OTASettings { diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp index cda53c9..699e0a7 100644 --- a/lib/framework/SystemStatus.cpp +++ b/lib/framework/SystemStatus.cpp @@ -1,4 +1,10 @@ #include +#ifdef ESP32 +#include +#include +#elif defined(ESP8266) +#include +#endif SystemStatus::SystemStatus(AsyncWebServer* server, SecurityManager* securityManager) { server->on(SYSTEM_STATUS_SERVICE_PATH, @@ -24,6 +30,15 @@ void SystemStatus::systemStatus(AsyncWebServerRequest* request) { root["sdk_version"] = ESP.getSdkVersion(); root["flash_chip_size"] = ESP.getFlashChipSize(); root["flash_chip_speed"] = ESP.getFlashChipSpeed(); +#ifdef ESP32 + if (esp_spiffs_mounted(NULL)) { + root["spiffs_used"] = SPIFFS.usedBytes(); + root["spiffs_size"] = SPIFFS.totalBytes(); + } +#elif !defined(PROGMEM_WWW) //couldn't find an esp8266 alternative to esp_spiffs_mounted() + root["spiffs_used"] = SPIFFS.usedBytes(); + root["spiffs_size"] = SPIFFS.totalBytes(); +#endif response->setLength(); request->send(response); } From 6510a72789f9b3e5754c23ca90788292e21f71c3 Mon Sep 17 00:00:00 2001 From: Raomin Date: Mon, 25 May 2020 01:41:45 +0200 Subject: [PATCH 3/3] apply PR comments --- interface/src/system/SystemStatusForm.tsx | 12 ++++++------ lib/framework/SystemStatus.cpp | 12 ++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx index 25cf1f1..88fc7aa 100644 --- a/interface/src/system/SystemStatusForm.tsx +++ b/interface/src/system/SystemStatusForm.tsx @@ -27,8 +27,8 @@ interface SystemStatusFormState { type SystemStatusFormProps = AuthenticatedContextProps & RestFormProps; -function asNum(num: number){ - return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " "); +function formatNumber(num: number){ + return new Intl.NumberFormat().format(num); } @@ -73,7 +73,7 @@ class SystemStatusForm extends Component - + @@ -82,7 +82,7 @@ class SystemStatusForm extends Component - + @@ -91,7 +91,7 @@ class SystemStatusForm extends Component - + @@ -99,7 +99,7 @@ class SystemStatusForm extends Component - + diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp index f126e7b..0750184 100644 --- a/lib/framework/SystemStatus.cpp +++ b/lib/framework/SystemStatus.cpp @@ -1,6 +1,5 @@ #include #ifdef ESP32 -#include #include #elif defined(ESP8266) #include @@ -30,15 +29,8 @@ void SystemStatus::systemStatus(AsyncWebServerRequest* request) { root["sdk_version"] = ESP.getSdkVersion(); root["flash_chip_size"] = ESP.getFlashChipSize(); root["flash_chip_speed"] = ESP.getFlashChipSpeed(); -#ifdef ESP32 - if (esp_spiffs_mounted(NULL)) { - root["spiffs_used"] = SPIFFS.usedBytes(); - root["spiffs_size"] = SPIFFS.totalBytes(); - } -#elif !defined(PROGMEM_WWW) //couldn't find an esp8266 alternative to esp_spiffs_mounted() - root["spiffs_used"] = SPIFFS.usedBytes(); - root["spiffs_size"] = SPIFFS.totalBytes(); -#endif + root["spiffs_used"] = SPIFFS.usedBytes(); + root["spiffs_size"] = SPIFFS.totalBytes(); response->setLength(); request->send(response); }