rename HardwareStatus

interface/src/api/system.ts

@@ -3,13 +3,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import type { ESPSystemStatus, LogSettings, SystemStatus } from 'types';
+import type { HardwareStatus, LogSettings, SystemStatus } from 'types';
 
 import { alovaInstance, alovaInstanceGH } from './endpoints';
 
-// ESPSystemStatus - also used to ping in Restart monitor for pinging
-export const readESPSystemStatus = () =>
-  alovaInstance.Get<ESPSystemStatus>('/rest/ESPSystemStatus');
+// HardwareStatus - also used to ping in Restart monitor for pinging
+export const readHardwareStatus = () =>
+  alovaInstance.Get<HardwareStatus>('/rest/HardwareStatus');
 
 // SystemStatus
 export const readSystemStatus = () =>

interface/src/app/settings/UploadDownload.tsx

@@ -57,7 +57,7 @@ const UploadDownload: FC = () => {
     data: data,
     send: loadData,
     error
-  } = useRequest(SystemApi.readESPSystemStatus, { force: true });
+  } = useRequest(SystemApi.readHardwareStatus, { force: true });
 
   const { data: latestVersion } = useRequest(SystemApi.getStableVersion, {
     immediate: true,

interface/src/app/status/HardwareStatus.tsx

@@ -32,7 +32,7 @@ function formatNumber(num: number) {
   return new Intl.NumberFormat().format(num);
 }
 
-const ESPSystemStatus: FC = () => {
+const HardwareStatus: FC = () => {
   const { LL } = useI18nContext();
 
   useLayoutTitle(LL.STATUS_OF(LL.HARDWARE()));
@@ -41,7 +41,7 @@ const ESPSystemStatus: FC = () => {
     data: data,
     send: loadData,
     error
-  } = useRequest(SystemApi.readESPSystemStatus, { force: true });
+  } = useRequest(SystemApi.readHardwareStatus, { force: true });
 
   const content = () => {
     if (!data) {
@@ -117,7 +117,9 @@ const ESPSystemStatus: FC = () => {
                 formatNumber(data.free_heap) +
                 ' KB (' +
                 formatNumber(data.max_alloc_heap) +
-                ' KB max alloc)'
+                ' KB max alloc, ' +
+                formatNumber(data.free_caps) +
+                ' KB caps)'
               }
             />
           </ListItem>
@@ -218,4 +220,4 @@ const ESPSystemStatus: FC = () => {
   return <SectionContent>{content()}</SectionContent>;
 };
 
-export default ESPSystemStatus;
+export default HardwareStatus;

mock-api/rest_server.ts

@@ -336,7 +336,7 @@ const SYSTEM_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'systemStatus';
 const ACTIVITY_ENDPOINT = REST_ENDPOINT_ROOT + 'activity';
 
 // SETTINGS
-const ESPSYSTEM_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'ESPSystemStatus';
+const HARDWARE_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'HardwareStatus';
 const SECURITY_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'securitySettings';
 const RESTART_ENDPOINT = REST_ENDPOINT_ROOT + 'restart';
 const RESTART_PARTITION_ENDPOINT = REST_ENDPOINT_ROOT + 'partition';
@@ -347,28 +347,29 @@ const VERIFY_AUTHORIZATION_ENDPOINT = REST_ENDPOINT_ROOT + 'verifyAuthorization'
 const SIGN_IN_ENDPOINT = REST_ENDPOINT_ROOT + 'signIn';
 const GENERATE_TOKEN_ENDPOINT = REST_ENDPOINT_ROOT + 'generateToken';
 
-const ESPsystem_status = {
+const hardware_status = {
   emsesp_version: '3.7-demo',
   esp_platform: 'ESP32',
-  max_alloc_heap: 89,
+  max_alloc_heap: 107,
   cpu_type: 'ESP32-S3',
-  cpu_rev: '0',
+  cpu_rev: 3,
   cpu_cores: 2,
   cpu_freq_mhz: 240,
-  free_heap: 143,
-  arduino_version: 'ESP32 Arduino v2.0.14',
-  sdk_version: 'v4.4.2',
+  free_heap: 166,
+  arduino_version: 'ESP32 Arduino v2.0.16',
+  sdk_version: 'v4.4.7',
   partition: 'app0',
   flash_chip_size: 4096,
   flash_chip_speed: 40000000,
   app_used: 1863,
   app_free: 121,
-  fs_used: 40,
-  fs_free: 24,
+  fs_used: 24,
+  fs_free: 2024,
   free_mem: 100,
-  psram_size: 0,
-  free_psram: 0,
+  psram_size: 4093,
+  free_psram: 4074,
   has_loader: true,
+  free_caps: 4204,
   // model: ''
   model: 'BBQKees Electronics EMS Gateway E32 V2 (E32 V2.0 P3/2024011)'
 };
@@ -4203,7 +4204,7 @@ router
 router
   .get(SYSTEM_STATUS_ENDPOINT, () => system_status)
   .get(ACTIVITY_ENDPOINT, () => activity)
-  .get(ESPSYSTEM_STATUS_ENDPOINT, () => ESPsystem_status)
+  .get(HARDWARE_STATUS_ENDPOINT, () => hardware_status)
   .get(SECURITY_SETTINGS_ENDPOINT, () => security_settings)
   .post(SECURITY_SETTINGS_ENDPOINT, async (request: any) => {
     security_settings = await request.json();

src/web/WebStatusService.cpp

@@ -24,9 +24,9 @@
 
 namespace emsesp {
 
-// /rest/ESPSystemStatus
+// /rest/HardwareStatus
 WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager) {
-    server->on(ESPSYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { ESPsystemStatus(request); });
+    server->on(HARDWARE_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { HardwareStatus(request); });
     server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { systemStatus(request); });
 }
 
@@ -85,7 +85,7 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
     request->send(response);
 }
 
-void WebStatusService::ESPsystemStatus(AsyncWebServerRequest * request) {
+void WebStatusService::HardwareStatus(AsyncWebServerRequest * request) {
     EMSESP::system_.refreshHeapMem(); // refresh free heap and max alloc heap
 
     auto *     response = new AsyncJsonResponse(false);

src/web/WebStatusService.h

@@ -1,7 +1,7 @@
 #ifndef WebStatusService_h
 #define WebStatusService_h
 
-#define ESPSYSTEM_STATUS_SERVICE_PATH "/rest/ESPSystemStatus"
+#define HARDWARE_STATUS_SERVICE_PATH "/rest/HardwareStatus"
 #define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus"
 
 namespace emsesp {
@@ -12,7 +12,7 @@ class WebStatusService {
 
   private:
     void systemStatus(AsyncWebServerRequest * request);
-    void ESPsystemStatus(AsyncWebServerRequest * request);
+    void HardwareStatus(AsyncWebServerRequest * request);
 };
 
 } // namespace emsesp