Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

MichaelDvP · Nov 23, 2024 · a5879d1 · a5879d1
2 parents 9e5d78a + b1b8a12
commit a5879d1
Show file tree

Hide file tree

Showing 26 changed files with 1,202 additions and 739 deletions.
diff --git a/docs/Modbus-Entity-Registers.md b/docs/Modbus-Entity-Registers.md
diff --git a/docs/dump_entities.csv b/docs/dump_entities.csv
diff --git a/docs/dump_telegrams.csv b/docs/dump_telegrams.csv
@@ -13,7 +13,7 @@ telegram_type_id,name,is_fetched
 0x19,UBAMonitorSlow, 
 0x1A,UBASetPoints, 
 0x1C,UBAMaintenanceStatus, 
-0x1E,WM10TempMessage, 
+0x1E,HydrTemp, 
 0x23,JunkersSetMixer,fetched
 0x26,UBASettingsWW,fetched
 0x28,WeatherComp,fetched
@@ -105,10 +105,10 @@ telegram_type_id,name,is_fetched
 0x02A0,RC300Curves, 
 0x02A1,RC300Curves, 
 0x02A2,RC300Curves, 
-0x02A5,RC300Monitor, 
+0x02A5,CRFMonitor, 
 0x02A6,RC300Monitor, 
-0x02A7,CRFMonitor, 
-0x02A8,RC300Monitor, 
+0x02A7,RC300Monitor, 
+0x02A8,CRFMonitor, 
 0x02A9,RC300Monitor, 
 0x02AA,RC300Monitor, 
 0x02AB,RC300Monitor, 
@@ -129,20 +129,20 @@ telegram_type_id,name,is_fetched
 0x02BE,RC300Set, 
 0x02BF,RC300Set, 
 0x02C0,RC300Set, 
-0x02CC,RC300Set2, 
+0x02CC,HPPressure,fetched
 0x02CD,MMPLUSConfigMessage,fetched
 0x02CE,RC300Set2, 
 0x02D0,RC300Set2, 
 0x02D2,RC300Set2, 
-0x02D5,MMPLUSConfigMessage,fetched
 0x02D6,HPPump2,fetched
 0x02D7,MMPLUSStatusMessage, 
-0x02DF,MMPLUSStatusMessage, 
 0x02F5,RC300WWmode,fetched
 0x02F6,RC300WW2mode,fetched
+0x0313,MMPLUSConfigMessage_WWC,fetched
 0x031B,RC300WWtemp,fetched
 0x031D,RC300WWmode2, 
 0x031E,RC300WWmode2, 
+0x0331,MMPLUSStatusMessage_WWC, 
 0x0358,SM100SystemConfig,fetched
 0x035A,SM100CircuitConfig,fetched
 0x035C,SM100HeatAssist,fetched
@@ -199,6 +199,15 @@ telegram_type_id,name,is_fetched
 0x05D9,Airquality, 
 0x0772,HIUSettings, 
 0x0779,HIUMonitor, 
+0x07A5,SM100wwCirc,fetched
+0x07A6,SM100wwParam,fetched
+0x07AA,SM100wwStatus, 
+0x07AB,SM100wwCommand, 
+0x07AC,SM100wwParam1, 
+0x07AD,SM100ValveStatus, 
+0x07AE,SM100wwKeepWarm,fetched
+0x07D6,SM100wwTemperature, 
+0x07E0,SM100wwStatus2,fetched
 0x0935,EM100SetMessage,fetched
 0x0936,EM100OutMessage, 
 0x0937,EM100TempMessage, 

diff --git a/interface/.yarn/releases/yarn-4.5.1.cjs → interface/.yarn/releases/yarn-4.5.2.cjs b/interface/.yarn/releases/yarn-4.5.1.cjs → interface/.yarn/releases/yarn-4.5.2.cjs
diff --git a/interface/.yarnrc.yml b/interface/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.2.cjs
diff --git a/interface/package.json b/interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "EMS-ESP WebUI",
   "homepage": "https://emsesp.org",
   "author": "proddy, emsesp.org",
@@ -22,16 +22,16 @@
   },
   "dependencies": {
     "@alova/adapter-xhr": "2.0.10",
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.13.0",
-    "@mui/icons-material": "^6.1.7",
-    "@mui/material": "^6.1.7",
+    "@emotion/react": "^11.13.5",
+    "@emotion/styled": "^11.13.5",
+    "@mui/icons-material": "^6.1.8",
+    "@mui/material": "^6.1.8",
     "@table-library/react-table-library": "4.1.7",
-    "alova": "3.2.3",
+    "alova": "3.2.4",
     "async-validator": "^4.2.5",
     "jwt-decode": "^4.0.0",
     "mime-types": "^2.1.35",
-    "preact": "^10.24.3",
+    "preact": "^10.25.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.3.0",
@@ -61,7 +61,7 @@
     "typescript-eslint": "8.15.0",
     "vite": "^5.4.11",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^5.1.2"
+    "vite-tsconfig-paths": "^5.1.3"
   },
-  "packageManager": "[email protected].1"
+  "packageManager": "[email protected].2"
 }
diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx
@@ -153,7 +153,12 @@ const Version = () => {
             onClick={() => setOpenDialog(false)}
             color="primary"
           >
-            <Link target="_blank" href={getBinURL(useDev)} color="primary">
+            <Link
+              underline="none"
+              target="_blank"
+              href={getBinURL(useDev)}
+              color="primary"
+            >
               {LL.DOWNLOAD(1)}
             </Link>
           </Button>

diff --git a/interface/src/components/routing/RouterTabs.tsx b/interface/src/components/routing/RouterTabs.tsx
@@ -16,7 +16,7 @@ const RouterTabs: FC<RouterTabsProps> = ({ value, children }) => {
   const smallDown = useMediaQuery(theme.breakpoints.down('sm'));
 
   const handleTabChange = (_event: unknown, path: string) => {
-    navigate(path);
+    void navigate(path);
   };
 
   return (