Merge pull request #1519 from MichaelDvP/dev_1

compile with tasmota arduino 2.14 and 3.0

CHANGELOG_LATEST.md

@@ -11,6 +11,7 @@
 - heatpump max power [#1475](https://github.com/emsesp/EMS-ESP32/issues/1475)
 - checkbox for MQTT-TLS enable [#1474](https://github.com/emsesp/EMS-ESP32/issues/1474)
 - added SK (Slovencina) language. Thanks @misa1515
+- CPU info [#1497](https://github.com/emsesp/EMS-ESP32/pull/1497)
 
 ## Fixed
 

interface/src/framework/system/SystemStatusForm.tsx

@@ -1,6 +1,7 @@
 import AppsIcon from '@mui/icons-material/Apps';
 import BuildIcon from '@mui/icons-material/Build';
 import CancelIcon from '@mui/icons-material/Cancel';
+import DeveloperBoardIcon from '@mui/icons-material/DeveloperBoard';
 import DevicesIcon from '@mui/icons-material/Devices';
 import FolderIcon from '@mui/icons-material/Folder';
 import MemoryIcon from '@mui/icons-material/Memory';
@@ -9,7 +10,6 @@ import RefreshIcon from '@mui/icons-material/Refresh';
 import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
 import SdStorageIcon from '@mui/icons-material/SdStorage';
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
-import ShowChartIcon from '@mui/icons-material/ShowChart';
 import TimerIcon from '@mui/icons-material/Timer';
 import {
   Avatar,
@@ -203,28 +203,40 @@ const SystemStatusForm: FC = () => {
           <ListItem>
             <ListItemAvatar>
               <Avatar>
-                <DevicesIcon />
+                <TimerIcon />
               </Avatar>
             </ListItemAvatar>
-            <ListItemText primary={LL.PLATFORM()} secondary={data.esp_platform + ' / ' + data.sdk_version} />
+            <ListItemText primary={LL.UPTIME()} secondary={data.uptime} />
           </ListItem>
           <Divider variant="inset" component="li" />
           <ListItem>
             <ListItemAvatar>
               <Avatar>
-                <TimerIcon />
+                <DevicesIcon />
               </Avatar>
             </ListItemAvatar>
-            <ListItemText primary={LL.UPTIME()} secondary={data.uptime} />
+            <ListItemText primary="SDK" secondary={data.arduino_version + ' / ESP-IDF v' + data.sdk_version} />
           </ListItem>
           <Divider variant="inset" component="li" />
           <ListItem>
             <ListItemAvatar>
               <Avatar>
-                <ShowChartIcon />
+                <DeveloperBoardIcon />
               </Avatar>
             </ListItemAvatar>
-            <ListItemText primary={LL.CPU_FREQ()} secondary={data.cpu_freq_mhz + ' MHz'} />
+            <ListItemText
+              primary="CPU"
+              secondary={
+                data.cpu_type +
+                ' (rev.' +
+                data.cpu_rev +
+                ', ' +
+                (data.cpu_cores == 1 ? 'single-core)' : 'dual-core)') +
+                ' @ ' +
+                data.cpu_freq_mhz +
+                ' Mhz'
+              }
+            />
           </ListItem>
           <Divider variant="inset" component="li" />
           <ListItem>
@@ -277,7 +289,9 @@ const SystemStatusForm: FC = () => {
             </ListItemAvatar>
             <ListItemText
               primary={LL.APPSIZE()}
-              secondary={formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'}
+              secondary={
+                data.partition + ': ' + formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'
+              }
             />
           </ListItem>
           <Divider variant="inset" component="li" />

interface/src/i18n/de/index.ts

@@ -196,11 +196,10 @@ const de: Translation = {
   EMS_ESP_VER: 'EMS-ESP Version',
   PLATFORM: 'Platform (Platform / SDK)',
   UPTIME: 'System Betriebszeit',
-  CPU_FREQ: 'CPU Frequenz',
   HEAP: 'freier RAM Speicher (Gesamt / max. Block)',
   PSRAM: 'PSRAM (Größe / Frei)',
   FLASH: 'Flash Speicher (Größe / Geschwindigkeit)',
-  APPSIZE: 'Programm (Genutzt / Frei)',
+  APPSIZE: 'Programm (Partition: Genutzt / Frei)',
   FILESYSTEM: 'Dateisystem (Genutzt / Frei)',
   BUFFER_SIZE: 'max. Puffergröße',
   COMPACT: 'Kompakte Darstellung',

interface/src/i18n/en/index.ts

@@ -196,11 +196,10 @@ const en: Translation = {
   EMS_ESP_VER: 'EMS-ESP Version',
   PLATFORM: 'Device (Platform / SDK)',
   UPTIME: 'System Uptime',
-  CPU_FREQ: 'CPU Frequency',
   HEAP: 'Heap (Free / Max Alloc)',
   PSRAM: 'PSRAM (Size / Free)',
   FLASH: 'Flash Chip (Size / Speed)',
-  APPSIZE: 'Application (Used / Free)',
+  APPSIZE: 'Application (Partition: Used / Free)',
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',

interface/src/i18n/fr/index.ts

@@ -196,11 +196,10 @@ const fr: Translation = {
   EMS_ESP_VER: 'Version EMS-ESP',
   PLATFORM: 'Appareil (Plateforme / SDK)',
   UPTIME: 'Durée de fonctionnement du système',
-  CPU_FREQ: 'Fréquence du CPU',
   HEAP: 'Heap (Libre / Max Allouée)',
   PSRAM: 'PSRAM (Taille / Libre)',
   FLASH: 'Flash Chip (Taille / Vitesse)',
-  APPSIZE: 'Application (Utilisée / Libre)',
+  APPSIZE: 'Application (Partition: Utilisée / Libre)',
   FILESYSTEM: 'File System (Utilisée / Libre)',
   BUFFER_SIZE: 'Max taille du buffer',
   COMPACT: 'Compact',

interface/src/i18n/it/index.ts

@@ -198,11 +198,10 @@ const it: Translation = {
   EMS_ESP_VER: 'Versione EMS-ESP',
   PLATFORM: 'Dispositivo (Piattaforma / SDK)',
   UPTIME: 'Tempo di attività del sistema',
-  CPU_FREQ: 'Frequenza CPU ',
   HEAP: 'Heap (Free / Max Alloc)',
   PSRAM: 'PSRAM (Size / Free)',
   FLASH: 'Flash Chip (Size / Speed)',
-  APPSIZE: 'Applicazione (Usata / Libera)',
+  APPSIZE: 'Applicazione (Partizione: Usata / Libera)',
   FILESYSTEM: 'Memoria Sistema (Usata / Libera)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',

interface/src/i18n/nl/index.ts

@@ -196,11 +196,10 @@ const nl: Translation = {
   EMS_ESP_VER: 'EMS-ESP Versie',
   PLATFORM: 'Apparaat (Platform / SDK)',
   UPTIME: 'Systeem Uptime',
-  CPU_FREQ: 'CPU Frequency',
   HEAP: 'Heap (Free / Max Alloc)',
   PSRAM: 'PSRAM (Size / Free)',
   FLASH: 'Flash Chip (Size / Speed)',
-  APPSIZE: 'Application (Used / Free)',
+  APPSIZE: 'Application (Partition: Used / Free)',
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',

interface/src/i18n/no/index.ts

@@ -196,11 +196,10 @@ const no: Translation = {
   EMS_ESP_VER: 'EMS-ESP Version',
   PLATFORM: 'Enhet (Platform / SDK)',
   UPTIME: 'System Oppetid',
-  CPU_FREQ: 'CPU Frekvens',
   HEAP: 'Heap (Ledig / Max Allokert)',
   PSRAM: 'PSRAM (Størrelse / Ledig)',
   FLASH: 'Flash Chip (Størrelse / Hastighet)',
-  APPSIZE: 'Applikasjon (Brukt / Ledig)',
+  APPSIZE: 'Applikasjon (Partition: Brukt / Ledig)',
   FILESYSTEM: 'File System (Brukt / Ledig)',
   BUFFER_SIZE: 'Max Buffer Størrelse',
   COMPACT: 'Komprimere',

interface/src/i18n/pl/index.ts

@@ -196,11 +196,10 @@ const pl: BaseTranslation = {
   EMS_ESP_VER: 'Wersja EMS-ESP',
   PLATFORM: 'Urządzenie (platforma / SDK)',
   UPTIME: 'Czas działania systemu',
-  CPU_FREQ: 'Taktowanie CPU',
   HEAP: 'HEAP (wolne / maksymalny przydział)',
   PSRAM: 'PSRAM (rozmiar / wolne)',
   FLASH: 'FLASH (rozmiar / taktowanie)',
-  APPSIZE: 'Aplikacja (wykorzystane / wolne)',
+  APPSIZE: 'Aplikacja (Partition: wykorzystane / wolne)',
   FILESYSTEM: 'System plików (wykorzystane / wolne)',
   BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
   COMPACT: 'Kompaktowy',

interface/src/i18n/sk/index.ts

@@ -196,11 +196,10 @@ const sk: Translation = {
   EMS_ESP_VER: 'EMS-ESP verzia',
   PLATFORM: 'Zariadenie (Platforma / SDK)',
   UPTIME: 'Beh systému',
-  CPU_FREQ: 'CPU frekvencia',
   HEAP: 'Zásobník (voľné / max pridelenie)',
   PSRAM: 'PSRAM (Veľkosť / Voľné)',
   FLASH: 'Flash chip (Veľkosť / Rýchlosť)',
-  APPSIZE: 'Applikácia (Použité / Voľné)',
+  APPSIZE: 'Applikácia (Priečka: Použité / Voľné)',
   FILESYSTEM: 'Súborový systém (Použité / Voľné)',
   BUFFER_SIZE: 'Maximálna veľkosť vyrovnávacej pamäte',
   COMPACT: 'Kompaktné',

interface/src/i18n/sv/index.ts

@@ -196,11 +196,10 @@ const sv: Translation = {
   EMS_ESP_VER: 'EMS-ESP Version',
   PLATFORM: 'Enhet (Plattform / SDK)',
   UPTIME: 'Systemets Upptid',
-  CPU_FREQ: 'CPU-frekvens',
   HEAP: 'Heap (Ledigt / Max allokerat)',
   PSRAM: 'PSRAM (Storlek / Ledigt)',
   FLASH: 'Flashminne (Storlek / Hastighet)',
-  APPSIZE: 'Applikationer (Använt / Ledigt)',
+  APPSIZE: 'Applikationer (Partition: Använt / Ledigt)',
   FILESYSTEM: 'Filsystem (Använt / Ledigt)',
   BUFFER_SIZE: 'Max Bufferstorlek',
   COMPACT: 'Komprimera',

interface/src/i18n/tr/index.ts

@@ -196,11 +196,10 @@ const tr: Translation = {
   EMS_ESP_VER: 'EMS-ESP Sürümü',
   PLATFORM: 'Cihaz (Platform / SDK)',
   UPTIME: 'Sistem Çalışma Süresi',
-  CPU_FREQ: 'İşlemci frekansı',
   HEAP: 'Yığın (Boş / Maksimum Tahsis)',
   PSRAM: 'PSRAM (Boyut / Boş)',
   FLASH: 'Flash Çipi (Boyut / Hız)',
-  APPSIZE: 'Uygulama (Kullanılmış / Boş)',
+  APPSIZE: 'Uygulama (Bölme: Kullanılmış / Boş)',
   FILESYSTEM: 'Dosya Sistemi (Kullanılmış / Boş)',
   BUFFER_SIZE: 'En fazla bellek boyutu',
   COMPACT: 'Sıkışık',

interface/src/types/system.ts

@@ -2,9 +2,14 @@ export interface SystemStatus {
   emsesp_version: string;
   esp_platform: string;
   max_alloc_heap: number;
+  cpu_type: string;
+  cpu_rev: number;
+  cpu_cores: number;
   cpu_freq_mhz: number;
   free_heap: number;
+  arduino_version: string;
   sdk_version: string;
+  partition: string;
   flash_chip_size: number;
   flash_chip_speed: number;
   app_used: number;

lib/espMqttClient/src/Config.h

@@ -8,6 +8,10 @@ the LICENSE file.
 
 #pragma once
 
+#ifndef TASMOTA_SDK
+#define EMC_CLIENT_SECURE
+#endif
+
 #ifndef EMC_TX_TIMEOUT
 #define EMC_TX_TIMEOUT 2000
 #endif
@@ -53,6 +57,10 @@ the LICENSE file.
 #define EMC_TASK_STACK_SIZE 5120
 #endif
 
+#ifndef EMC_MULTIPLE_CALLBACKS
+#define EMC_MULTIPLE_CALLBACKS 0
+#endif
+
 #ifndef EMC_USE_WATCHDOG
 #define EMC_USE_WATCHDOG 0
 #endif