Merge branch 'pr2015' into dev

src/WebApi_sysstatus.cpp

@@ -48,6 +48,7 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)
     root["chiprevision"] = ESP.getChipRevision();
     root["chipmodel"] = ESP.getChipModel();
     root["chipcores"] = ESP.getChipCores();
+    root["flashsize"] = ESP.getFlashChipSize();
 
     String reason;
     reason = ResetReason::get_reset_reason_verbose(0);

webapp/src/components/HardwareInfo.vue

@@ -19,6 +19,13 @@
                         <th>{{ $t('hardwareinfo.CpuFrequency') }}</th>
                         <td>{{ systemStatus.cpufreq }} {{ $t('hardwareinfo.Mhz') }}</td>
                     </tr>
+                    <tr>
+                        <th>{{ $t('hardwareinfo.FlashSize') }}</th>
+                        <td>
+                            {{ systemStatus.flashsize }} {{ $t('hardwareinfo.Bytes') }}
+                            ({{ systemStatus.flashsize / 1024 / 1024 }} {{ $t('hardwareinfo.MegaBytes') }})
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>

webapp/src/locales/de.json

@@ -202,7 +202,10 @@
         "ChipRevision": "Chip-Revision",
         "ChipCores": "Chip-Kerne",
         "CpuFrequency": "CPU-Frequenz",
-        "Mhz": "MHz"
+        "Mhz": "MHz",
+        "FlashSize": "Flash-Speichergröße",
+        "Bytes": "Bytes",
+        "MegaBytes": "MB"
     },
     "memoryinfo": {
         "MemoryInformation": "Speicherinformationen",

webapp/src/locales/en.json

@@ -202,7 +202,10 @@
         "ChipRevision": "Chip Revision",
         "ChipCores": "Chip Cores",
         "CpuFrequency": "CPU Frequency",
-        "Mhz": "MHz"
+        "Mhz": "MHz",
+        "FlashSize": "Flash Memory Size",
+        "Bytes": "Bytes",
+        "MegaBytes": "MB"
     },
     "memoryinfo": {
         "MemoryInformation": "Memory Information",

webapp/src/locales/fr.json

@@ -202,7 +202,10 @@
         "ChipRevision": "Révision de la puce",
         "ChipCores": "Nombre de cœurs",
         "CpuFrequency": "Fréquence du CPU",
-        "Mhz": "MHz"
+        "Mhz": "MHz",
+        "FlashSize": "Taille de la mémoire flash",
+        "Bytes": "octets",
+        "MegaBytes": "Mo"
     },
     "memoryinfo": {
         "MemoryInformation": "Informations sur la mémoire",

webapp/src/types/SystemStatus.ts

@@ -4,6 +4,7 @@ export interface SystemStatus {
     chiprevision: number;
     chipcores: number;
     cpufreq: number;
+    flashsize: number;
     // FirmwareInfo
     hostname: string;
     sdkversion: string;