Merge pull request #1451 from MichaelDvP/dev

next fix RC300 mode

interface/package.json

@@ -28,10 +28,10 @@
     "@mui/material": "^5.14.18",
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
-    "@types/lodash-es": "^4.17.11",
+    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.9.3",
+    "@types/node": "^20.9.4",
     "@types/react": "^18.2.38",
-    "@types/react-dom": "^18.2.16",
+    "@types/react-dom": "^18.2.17",
     "@types/react-router-dom": "^5.3.3",
     "alova": "^2.13.2",
     "async-validator": "^4.2.5",
@@ -70,7 +70,7 @@
     "prettier": "^3.1.0",
     "rollup-plugin-visualizer": "^5.9.2",
     "terser": "^5.24.0",
-    "vite": "^5.0.0",
+    "vite": "^5.0.2",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.2.1"
   },

interface/yarn.lock

@@ -1446,12 +1446,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash-es@npm:^4.17.11":
+"@types/lodash-es@npm:^4.17.12":
-  version: 4.17.11
+  version: 4.17.12
-  resolution: "@types/lodash-es@npm:4.17.11"
+  resolution: "@types/lodash-es@npm:4.17.12"
   dependencies:
     "@types/lodash": "npm:*"
-  checksum: 87516f652eb13a544590351dd1986df37929c83d3393491c1b5f0e8d36a604ed9c00d4da9c77df052f38affd9bac33a4534ec52f679989e38bedb595fbbc23bb
+  checksum: 56b9a433348b11c31051c6fa9028540a033a08fb80b400c589d740446c19444d73b217cf1471d4036448ef686a83e8cf2a35d1fadcb3f2105f26701f94aebb07
   languageName: node
   linkType: hard
 
@@ -1478,12 +1478,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.9.3":
+"@types/node@npm:^20.9.4":
-  version: 20.9.3
+  version: 20.9.4
-  resolution: "@types/node@npm:20.9.3"
+  resolution: "@types/node@npm:20.9.4"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: 5d2a3a6b2b900814eab8c5093dabb7aa10895928719ec0074b9ac5584bcc83f5b680e2d2cb6c8b9751511b7b1b7fdd8586d2fc827b156f0263fdb65c4741bdef
+  checksum: d567855b48e453b443499c17fc6c939d154732b54319a05b9b31db6e475e6458f053838635b201b1bb493d349d9b1af0aecc58b28fd6062e564e9fbf593199eb
   languageName: node
   linkType: hard
 
@@ -1508,12 +1508,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.2.16":
+"@types/react-dom@npm:^18.2.17":
-  version: 18.2.16
+  version: 18.2.17
-  resolution: "@types/react-dom@npm:18.2.16"
+  resolution: "@types/react-dom@npm:18.2.17"
   dependencies:
     "@types/react": "npm:*"
-  checksum: c0be61864a9f50bb8cd29c719d170b03b36149f4fbe308faa40194d15492c4a13814a2f344fc5ceb99b4747bfa11cdfb2d15a141ed37218a32ec0edf98b90f2b
+  checksum: fe0dbb3224b48515da8fe25559e3777d756a27c3f22903f0b1b020de8d68bd57eb1f0af62b52ee65d9632637950afed8cbad24d158c4f3d910d083d49bd73fba
   languageName: node
   linkType: hard
 
@@ -1744,10 +1744,10 @@ __metadata:
     "@preact/preset-vite": "npm:^2.7.0"
     "@table-library/react-table-library": "npm:4.1.7"
     "@types/imagemin": "npm:^8.0.5"
-    "@types/lodash-es": "npm:^4.17.11"
+    "@types/lodash-es": "npm:^4.17.12"
-    "@types/node": "npm:^20.9.3"
+    "@types/node": "npm:^20.9.4"
     "@types/react": "npm:^18.2.38"
-    "@types/react-dom": "npm:^18.2.16"
+    "@types/react-dom": "npm:^18.2.17"
     "@types/react-router-dom": "npm:^5.3.3"
     "@typescript-eslint/eslint-plugin": "npm:^6.12.0"
     "@typescript-eslint/parser": "npm:^6.12.0"
@@ -1782,7 +1782,7 @@ __metadata:
     terser: "npm:^5.24.0"
     typesafe-i18n: "npm:^5.26.2"
     typescript: "npm:^5.3.2"
-    vite: "npm:^5.0.0"
+    vite: "npm:^5.0.2"
     vite-plugin-imagemin: "npm:^0.6.1"
     vite-tsconfig-paths: "npm:^4.2.1"
   languageName: unknown
@@ -8566,9 +8566,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.0":
+"vite@npm:^5.0.2":
-  version: 5.0.0
+  version: 5.0.2
-  resolution: "vite@npm:5.0.0"
+  resolution: "vite@npm:5.0.2"
   dependencies:
     esbuild: "npm:^0.19.3"
     fsevents: "npm:~2.3.3"
@@ -8602,7 +8602,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 9a247a5657330ede5c131e782f2fb2adda77d493db2d528524378706108c1560ca4fe9ec0a865e5250978f5e2649c4da690834d2aab4dbf6175f1782cff6bd03
+  checksum: 74f1a6d49a02106796b5fcc04dbe4a92925fba413191718fb37485a29f606b7f80abd371a3ef6b598e8a04f05c09c0b9a5de6bf844dfecb7253798097ddaab35
   languageName: node
   linkType: hard
 

src/devices/thermostat.cpp

@@ -479,8 +479,10 @@ uint8_t Thermostat::HeatingCircuit::get_mode() const {
         }
     } else if ((model == EMSdevice::EMS_DEVICE_FLAG_RC300) || (model == EMSdevice::EMS_DEVICE_FLAG_RC100)) {
         if (mode == 0) {
-            return HeatingCircuit::Mode::MANUAL;
+            return HeatingCircuit::Mode::OFF;
         } else if (mode == 1) {
+            return HeatingCircuit::Mode::MANUAL;
+        } else if (mode == 2) {
             return HeatingCircuit::Mode::AUTO;
         }
     } else if (model == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {