From 6ccab21791bdbd93e6de988a907d68a1927beb85 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Tue, 8 Aug 2023 09:07:09 +0200 Subject: [PATCH 1/2] fix HM200 compressor speed, #1247 --- src/devices/heatpump.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp index 265488e63..edb25e6bb 100644 --- a/src/devices/heatpump.cpp +++ b/src/devices/heatpump.cpp @@ -212,10 +212,11 @@ void Heatpump::process_HPSettings(std::shared_ptr telegram) { // Broadcast (0x099C), data: 00 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 76 00 00 // data: 00 2B 00 03 04 13 00 00 00 00 00 02 02 02 (offset 24) void Heatpump::process_HPComp(std::shared_ptr telegram) { - has_update(telegram, hpCompSpd_, 51); + has_update(telegram, hpCompSpd_, 15); } // 0x999 HPFunctionTest +// HPFunctionTest(0x0999), data: 00 00 00 32 00 00 00 00 00 00 00 void Heatpump::process_HPFunctionTest(std::shared_ptr telegram) { has_update(telegram, airPurgeMode_, 0); has_update(telegram, heatPumpOutput_, 2); From 1d1aaef291a9cd7291ac19632106a4ea49a7413e Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Tue, 8 Aug 2023 12:06:24 +0200 Subject: [PATCH 2/2] add back progmem generation --- interface/package.json | 2 +- interface/vite.config.ts | 4 ++-- interface/yarn.lock | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/interface/package.json b/interface/package.json index 7de7d4bc6..32329a2dd 100644 --- a/interface/package.json +++ b/interface/package.json @@ -29,7 +29,7 @@ "@table-library/react-table-library": "4.1.4", "@types/lodash-es": "^4.17.8", "@types/node": "^20.4.8", - "@types/react": "^18.2.18", + "@types/react": "^18.2.19", "@types/react-dom": "^18.2.7", "@types/react-router-dom": "^5.3.3", "alova": "^2.9.3", diff --git a/interface/vite.config.ts b/interface/vite.config.ts index bedec9b79..700091981 100644 --- a/interface/vite.config.ts +++ b/interface/vite.config.ts @@ -18,9 +18,9 @@ export default defineConfig(({ command, mode }) => { plugins: [ preact(), viteTsconfigPaths(), - svgrPlugin() + svgrPlugin(), // prefresh() - // ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }) + ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }) ], build: { diff --git a/interface/yarn.lock b/interface/yarn.lock index 91fd2cb6b..90b3da042 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1511,7 +1511,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.2.18": +"@types/react@npm:*": version: 18.2.18 resolution: "@types/react@npm:18.2.18" dependencies: @@ -1522,6 +1522,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.2.19": + version: 18.2.19 + resolution: "@types/react@npm:18.2.19" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: 8ebea4e6e154b32135e54d8ead9ec2d7c99bdeb0b5d51b4a01dfcb0a6eaf0cea566463148abff8755b29e2aea8c3e66dc09e6cfface2161f46fc9a023823ffd3 + languageName: node + linkType: hard + "@types/scheduler@npm:*": version: 0.16.3 resolution: "@types/scheduler@npm:0.16.3" @@ -1676,7 +1687,7 @@ __metadata: "@types/babel__core": ^7 "@types/lodash-es": ^4.17.8 "@types/node": ^20.4.8 - "@types/react": ^18.2.18 + "@types/react": ^18.2.19 "@types/react-dom": ^18.2.7 "@types/react-router-dom": ^5.3.3 "@typescript-eslint/eslint-plugin": ^6.3.0