Merge pull request emsesp#1639 from MichaelDvP/dev2

merge dev changes/fixes, new entities, env for N32R8 chip, fix custom board profile on boot
proddy · Feb 27, 2024 · 8c4fc49 · 8c4fc49
2 parents df982e3 + d8b77fc
commit 8c4fc49
Show file tree

Hide file tree

Showing 26 changed files with 354 additions and 156 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -22,6 +22,11 @@
 - mixer MM100 telegram 0x2CC [#1554](https://github.com/emsesp/EMS-ESP32/issues/1554)
 - boiler hpSetDiffPressure [#1563](https://github.com/emsesp/EMS-ESP32/issues/1563)
 - custom variables [#1423](https://github.com/emsesp/EMS-ESP32/issues/1423)
+- thermostat second dhw circuit [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634)
+- heatpump dhw energy meter [#1609](https://github.com/emsesp/EMS-ESP32/issues/1609)
+- remote thermostat emulation for RC100H, RC200 and FB10 [#1287](https://github.com/emsesp/EMS-ESP32/discussions/1287), [#1602](https://github.com/emsesp/EMS-ESP32/discussions/1602), [#1551](https://github.com/emsesp/EMS-ESP32/discussions/1551)
+- env and partitions for DevKitC-1-N32R8 [#1635](https://github.com/emsesp/EMS-ESP32/discussions/1635)
+- heatpump dhw stop temperatures [#1624](https://github.com/emsesp/EMS-ESP32/issues/1624)
 
 ## Fixed
 
@@ -35,6 +40,8 @@
 - Wifi Tx Power not adjusted [#1614](https://github.com/emsesp/EMS-ESP32/issues/1614)
 - MQTT discovery of custom entity doesn't consider type of data [#1587](https://github.com/emsesp/EMS-ESP32/issues/1587)
 - WiFi TxPower wasn't correctly used. Added an 'Auto' setting, which is the default.
+- MQTT heap check [#622](https://github.com/emsesp/EMS-ESP32/issues/1622)
+- Slovak language fix [#1636](https://github.com/emsesp/EMS-ESP32/discussions/1636)
 
 ## Changed
 
@@ -45,3 +52,4 @@
 - Length of mqtt Broker adress [#1619](https://github.com/emsesp/EMS-ESP32/issues/1619)
 - C++ optimizations - see <https://github.com/emsesp/EMS-ESP32/pull/1615>
 - Send MQTT heartbeat immediately after connection [#1628](https://github.com/emsesp/EMS-ESP32/issues/1628)
+- 16MB partitions with second nvs, larger FS, Coredump
diff --git a/esp32_partition_16M.csv b/esp32_partition_16M.csv
@@ -1,6 +1,8 @@
 # Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x035000,
+nvs,      data, nvs,     0x9000,   0x005000,
 otadata,  data, ota,     ,         0x002000,
-app0,     app,  ota_0,   ,         0x6E0000,
-app1,     app,  ota_1,   ,         0x6E0000,
-spiffs,   data, spiffs,  ,         0x200000,
+app0,     app,  ota_0,   ,         0x5D0000,
+app1,     app,  ota_1,   ,         0x5D0000,
+nvs1,     data, nvs,     ,         0x040000,
+spiffs,   data, spiffs,  ,         0x400000,
+coredump, data, coredump,,         0x010000,
diff --git a/esp32_partition_32M.csv b/esp32_partition_32M.csv
@@ -0,0 +1,8 @@
+# Name,   Type, SubType, Offset,   Size,    Flags
+nvs,      data, nvs,     0x9000,   0x005000,
+otadata,  data, ota,     ,         0x002000,
+app0,     app,  ota_0,   ,         0xDD0000,
+app1,     app,  ota_1,   ,         0xDD0000,
+nvs1,     data, nvs,     ,         0x040000,
+spiffs,   data, spiffs,  ,         0x400000,
+coredump, data, coredump,,         0x010000,
diff --git a/interface/package.json b/interface/package.json
@@ -26,13 +26,13 @@
     "@babel/core": "^7.23.9",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.10",
-    "@mui/material": "^5.15.10",
+    "@mui/icons-material": "^5.15.11",
+    "@mui/material": "^5.15.11",
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.11.20",
-    "@types/react": "^18.2.57",
+    "@types/react": "^18.2.58",
     "@types/react-dom": "^18.2.19",
     "@types/react-router-dom": "^5.3.3",
     "alova": "^2.17.0",
@@ -57,7 +57,7 @@
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",
     "concurrently": "^8.2.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-autofix": "^1.1.0",
@@ -69,7 +69,7 @@
     "preact": "^10.19.6",
     "prettier": "^3.2.5",
     "rollup-plugin-visualizer": "^5.12.0",
-    "terser": "^5.27.2",
+    "terser": "^5.28.1",
     "vite": "^5.1.4",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.3.1"

diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts
@@ -95,13 +95,13 @@ const sk: Translation = {
     'API volania',
     'Syslog správy'
   ],
-  NUM_DEVICES: '{num} Zariadenia{{s}}',
-  NUM_TEMP_SENSORS: '{num} Teplotné snímače{{s}}',
-  NUM_ANALOG_SENSORS: '{num} Analógové snímače{{s}}',
-  NUM_DAYS: '{num} dní{{s}}',
-  NUM_SECONDS: '{num} sekúnd{{s}}',
-  NUM_HOURS: '{num} hodín{{s}}',
-  NUM_MINUTES: '{num} minút{{s}}',
+  NUM_DEVICES: '{num} Zariaden{{í|ie|ia|ia|í}}',
+  NUM_TEMP_SENSORS: '{num} Teplotn{{ých|ý|é|é|ých}} snímač{{ov||e|e|ov}}',
+  NUM_ANALOG_SENSORS: '{num} Analogov{ých|ý|é|é|ých}} snímač{{ov||e|e|ov}}',
+  NUM_DAYS: '{num} d{{ní|eň|ní|ní|ní}}',
+  NUM_SECONDS: '{num} sek{{únd|unda|undy|undy|únd}}',
+  NUM_HOURS: '{num} hod{{ín|ina|iny|iny|ín}}',
+  NUM_MINUTES: '{num} minú{{t|ta|ty|ty|t}}',
   APPLICATION_SETTINGS: 'Nastavenia aplikácie',
   CUSTOMIZATIONS: 'Prispôsobenia',
   APPLICATION_RESTARTING: 'EMS-ESP sa reštartuje',