add application info, all memory info in kb

2025-12-07 00:09:51 +03:00 · 2022-09-23 21:36:01 +02:00
parent ab4e1f63c5
commit d54843635a
15 changed files with 6944 additions and 2376 deletions
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
--- a/interface/package.json
+++ b/interface/package.json
@@ -27,7 +27,7 @@
    "react-dom": "^18.2.0",
    "react-dropzone": "^14.2.2",
    "react-icons": "^4.4.0",
-    "react-router-dom": "^6.4.0",
+    "react-router-dom": "^6.4.1",
    "react-scripts": "5.0.1",
    "sockette": "^2.0.6",
    "typesafe-i18n": "^5.13.0",
--- a/interface/src/framework/system/SystemStatusForm.tsx
+++ b/interface/src/framework/system/SystemStatusForm.tsx
@@ -22,6 +22,7 @@ import ShowChartIcon from '@mui/icons-material/ShowChart';
 import MemoryIcon from '@mui/icons-material/Memory';
 import AppsIcon from '@mui/icons-material/Apps';
 import SdStorageIcon from '@mui/icons-material/SdStorage';
+import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
 import FolderIcon from '@mui/icons-material/Folder';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
@@ -272,14 +273,14 @@ const SystemStatusForm: FC = () => {
              primary={LL.HEAP()}
              secondary={
                formatNumber(data.free_heap) +
-                ' / ' +
+                ' kb / ' +
                formatNumber(data.max_alloc_heap) +
-                ' bytes ' +
+                ' kb ' +
                (data.esp_platform === EspPlatform.ESP8266 ? '(' + data.heap_fragmentation + '% fragmentation)' : '')
              }
            />
          </ListItem>
-          {data.esp_platform === EspPlatform.ESP32 && data.psram_size > 0 && (
+          {data.esp_platform === EspPlatform.ESP32 && data.psram_size !== undefined && data.free_psram !== undefined && (
            <>
              <Divider variant="inset" component="li" />
              <ListItem>
@@ -290,7 +291,7 @@ const SystemStatusForm: FC = () => {
                </ListItemAvatar>
                <ListItemText
                  primary={LL.PSRAM()}
-                  secondary={formatNumber(data.psram_size) + ' / ' + formatNumber(data.free_psram) + ' bytes'}
+                  secondary={formatNumber(data.psram_size) + ' kb / ' + formatNumber(data.free_psram) + ' kb'}
                />
              </ListItem>
            </>
@@ -305,7 +306,21 @@ const SystemStatusForm: FC = () => {
            <ListItemText
              primary={LL.FLASH()}
              secondary={
-                formatNumber(data.flash_chip_size) + ' bytes / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
+                formatNumber(data.flash_chip_size) + ' kb / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
+              }
+            />
+          </ListItem>
+          <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar>
+                <SdCardAlertIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText
+              primary={LL.APPSIZE()}
+              secondary={
+                formatNumber(data.app_size) + ' kb / ' + formatNumber(data.app_free) + ' kb'
              }
            />
          </ListItem>
@@ -320,11 +335,11 @@ const SystemStatusForm: FC = () => {
              primary={LL.FILESYSTEM()}
              secondary={
                formatNumber(data.fs_used) +
-                ' / ' +
+                ' kb / ' +
                formatNumber(data.fs_total) +
-                ' bytes (' +
+                ' kb (' +
                formatNumber(data.fs_total - data.fs_used) +
-                '\xa0bytes free)'
+                '\xa0kb free)'
              }
            />
          </ListItem>
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -182,6 +182,7 @@ const de: Translation = {
  HEAP: 'RAM Speicher (Frei / Max Belegt)',
  PSRAM: 'PSRAM (Größe / Frei)',
  FLASH: 'Flash Speicher (Größe / Geschwindigkeit)',
+  APPSIZE: 'Programm (Größe / Frei)',
  FILESYSTEM: 'Dateisystem (Genutzt / Gesamt)',
  BUFFER_SIZE: 'Puffergröße',
  COMPACT: 'Kompakte Darstellung',
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -182,6 +182,7 @@ const en: BaseTranslation = {
  HEAP: 'Heap (Free / Max Alloc)',
  PSRAM: 'PSRAM (Size / Free)',
  FLASH: 'Flash Chip (Size / Speed)',
+  APPSIZE: 'Application (Size / Free)',
  FILESYSTEM: 'File System (Used / Total)',
  BUFFER_SIZE: 'Buffer Size',
  COMPACT: 'Compact',
--- a/interface/src/i18n/i18n-types.ts
+++ b/interface/src/i18n/i18n-types.ts
@@ -729,6 +729,10 @@ type RootTranslation = {
 	 * Flash Chip (Size / Speed)
 	 */
 	FLASH: string
+	/**
+	 * Application (Size / Free)
+	 */
+	APPSIZE: string
 	/**
 	 * File System (Used / Total)
 	 */
@@ -1742,6 +1746,10 @@ export type TranslationFunctions = {
 	 * Flash Chip (Size / Speed)
 	 */
 	FLASH: () => LocalizedString
+	/**
+	 * Application (Size / Free)
+	 */
+	APPSIZE: () => LocalizedString
 	/**
 	 * File System (Used / Total)
 	 */
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -183,6 +183,7 @@ const nl: BaseTranslation = {
  HEAP: 'Heap (Free / Max Alloc)',
  PSRAM: 'PSRAM (Size / Free)',
  FLASH: 'Flash Chip (Size / Speed)',
+  APPSIZE: 'Application (Size / Free)',
  FILESYSTEM: 'File System (Used / Total)',
  BUFFER_SIZE: 'Buffer Size',
  COMPACT: 'Compact',
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -182,6 +182,7 @@ const no: BaseTranslation = {
  HEAP: 'Heap (Free / Max Alloc)',
  PSRAM: 'PSRAM (Size / Free)',
  FLASH: 'Flash Chip (Size / Speed)',
+  APPSIZE: 'Application (Size / Free)',
  FILESYSTEM: 'File System (Used / Total)',
  BUFFER_SIZE: 'Buffer Size',
  COMPACT: 'Compact',
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -184,6 +184,7 @@ const pl: BaseTranslation = {
  HEAP: 'Pamięć (Wolna / Zaalokowana)',
  PSRAM: 'PSRAM (Rozmiar / Wolna)',
  FLASH: 'Pamięć flash ( Rozmiar / Taktowanie)',
+  APPSIZE: 'Application (Size / Free)',
  FILESYSTEM: 'System plików (Wykorzystano / Cała pojemność)',
  BUFFER_SIZE: 'Rozmiar bufora',
  COMPACT: 'Kompaktowy',
--- a/interface/src/i18n/se/index.ts
+++ b/interface/src/i18n/se/index.ts
@@ -181,6 +181,7 @@ const se: BaseTranslation = {
  HEAP: 'Heap (Ledigt / Max allokerat)',
  PSRAM: 'PSRAM (Storlek / Ledigt)',
  FLASH: 'Flash Chip (Storlek / Hastighet)',
+  APPSIZE: 'Application (Size / Free)',
  FILESYSTEM: 'Filsystem (Använt / Totalt)',
  BUFFER_SIZE: 'Bufferstorlek',
  COMPACT: 'Komprimera',
--- a/interface/src/types/system.ts
+++ b/interface/src/types/system.ts
@@ -12,6 +12,8 @@ interface ESPSystemStatus {
  sdk_version: string;
  flash_chip_size: number;
  flash_chip_speed: number;
+  app_size: number;
+  app_free: number;
  fs_used: number;
  fs_total: number;
  uptime: string;
@@ -20,8 +22,8 @@ interface ESPSystemStatus {

 export interface ESP32SystemStatus extends ESPSystemStatus {
  esp_platform: EspPlatform.ESP32;
-  psram_size: number;
-  free_psram: number;
+  psram_size?: number;
+  free_psram?: number;
 }

 export interface ESP8266SystemStatus extends ESPSystemStatus {