andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-05-09 07:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MichaelDvP
2025-03-11 07:33:30 +01:00
parent f2b81489ba 0d8760219a
commit 6df592c2b8
15 changed files with 2004 additions and 1970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

987
docs/Modbus-Entity-Registers.md
View File

File diff suppressed because it is too large Load Diff

977
docs/dump_entities.csv
View File

File diff suppressed because it is too large Load Diff

10
docs/dump_telegrams.csv
View File

@@ -29,7 +29,7 @@ telegram_type_id,name,is_fetched
0x3B,Energy, 0x3B,Energy,
0x3D,RC35Set, 0x3D,RC35Set,
0x3E,RC35Monitor, 0x3E,RC35Monitor,
0x3F,RC35Timer, 0x3F,RC30Timer,
0x40,RC30Temp, 0x40,RC30Temp,
0x41,RC30Monitor, 0x41,RC30Monitor,
0x42,RC35Timer2, 0x42,RC35Timer2,
@@ -109,10 +109,10 @@ telegram_type_id,name,is_fetched
0x02A0,RC300Curves, 0x02A0,RC300Curves,
0x02A1,RC300Curves, 0x02A1,RC300Curves,
0x02A2,RC300Curves, 0x02A2,RC300Curves,
0x02A5,CRFMonitor, 0x02A5,RC300Monitor,fetched
0x02A6,RC300Monitor, 0x02A6,CRFMonitor,
0x02A7,RC300Monitor, 0x02A7,CRFMonitor,
0x02A8,CRFMonitor, 0x02A8,RC300Monitor,
0x02A9,RC300Monitor, 0x02A9,RC300Monitor,
0x02AA,RC300Monitor, 0x02AA,RC300Monitor,
0x02AB,RC300Monitor, 0x02AB,RC300Monitor,
1 telegram_type_id name is_fetched
29 0x3B Energy
30 0x3D RC35Set
31 0x3E RC35Monitor
32 0x3F RC35Timer RC30Timer
33 0x40 RC30Temp
34 0x41 RC30Monitor
35 0x42 RC35Timer2
109 0x02A0 RC300Curves
110 0x02A1 RC300Curves
111 0x02A2 RC300Curves
112 0x02A5 CRFMonitor RC300Monitor fetched
113 0x02A6 RC300Monitor CRFMonitor
114 0x02A7 RC300Monitor CRFMonitor
115 0x02A8 CRFMonitor RC300Monitor
116 0x02A9 RC300Monitor
117 0x02AA RC300Monitor
118 0x02AB RC300Monitor

581
interface/.yarn/releases/yarn-4.6.0.cjs → interface/.yarn/releases/yarn-4.7.0.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
interface/.yarnrc.yml
View File

@@ -1,3 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.6.0.cjs yarnPath: .yarn/releases/yarn-4.7.0.cjs

10
interface/package.json
View File

@@ -42,25 +42,25 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.26.9", "@babel/core": "^7.26.9",
"@eslint/js": "^9.21.0", "@eslint/js": "^9.22.0",
"@preact/compat": "^18.3.1", "@preact/compat": "^18.3.1",
"@preact/preset-vite": "^2.10.1", "@preact/preset-vite": "^2.10.1",
"@trivago/prettier-plugin-sort-imports": "^5.2.2", "@trivago/prettier-plugin-sort-imports": "^5.2.2",
"@types/formidable": "^3", "@types/formidable": "^3",
"@types/node": "^22.13.9", "@types/node": "^22.13.10",
"@types/react": "^19.0.10", "@types/react": "^19.0.10",
"@types/react-dom": "^19.0.4", "@types/react-dom": "^19.0.4",
"concurrently": "^9.1.2", "concurrently": "^9.1.2",
"eslint": "^9.21.0", "eslint": "^9.22.0",
"eslint-config-prettier": "^10.1.1", "eslint-config-prettier": "^10.1.1",
"formidable": "^3.5.2", "formidable": "^3.5.2",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0", "rollup-plugin-visualizer": "^5.14.0",
"terser": "^5.39.0", "terser": "^5.39.0",
"typescript-eslint": "8.26.0", "typescript-eslint": "8.26.1",
"vite": "^6.2.1", "vite": "^6.2.1",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.4" "vite-tsconfig-paths": "^5.1.4"
}, },
"packageManager": "yarn@4.6.0" "packageManager": "yarn@4.7.0"
} }

569
interface/yarn.lock
View File

@@ -409,79 +409,79 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/aix-ppc64@npm:0.25.0": "@esbuild/aix-ppc64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/aix-ppc64@npm:0.25.0" resolution: "@esbuild/aix-ppc64@npm:0.25.1"
conditions: os=aix & cpu=ppc64 conditions: os=aix & cpu=ppc64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-arm64@npm:0.25.0": "@esbuild/android-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/android-arm64@npm:0.25.0" resolution: "@esbuild/android-arm64@npm:0.25.1"
conditions: os=android & cpu=arm64 conditions: os=android & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-arm@npm:0.25.0": "@esbuild/android-arm@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/android-arm@npm:0.25.0" resolution: "@esbuild/android-arm@npm:0.25.1"
conditions: os=android & cpu=arm conditions: os=android & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-x64@npm:0.25.0": "@esbuild/android-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/android-x64@npm:0.25.0" resolution: "@esbuild/android-x64@npm:0.25.1"
conditions: os=android & cpu=x64 conditions: os=android & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/darwin-arm64@npm:0.25.0": "@esbuild/darwin-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/darwin-arm64@npm:0.25.0" resolution: "@esbuild/darwin-arm64@npm:0.25.1"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/darwin-x64@npm:0.25.0": "@esbuild/darwin-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/darwin-x64@npm:0.25.0" resolution: "@esbuild/darwin-x64@npm:0.25.1"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/freebsd-arm64@npm:0.25.0": "@esbuild/freebsd-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/freebsd-arm64@npm:0.25.0" resolution: "@esbuild/freebsd-arm64@npm:0.25.1"
conditions: os=freebsd & cpu=arm64 conditions: os=freebsd & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/freebsd-x64@npm:0.25.0": "@esbuild/freebsd-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/freebsd-x64@npm:0.25.0" resolution: "@esbuild/freebsd-x64@npm:0.25.1"
conditions: os=freebsd & cpu=x64 conditions: os=freebsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-arm64@npm:0.25.0": "@esbuild/linux-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-arm64@npm:0.25.0" resolution: "@esbuild/linux-arm64@npm:0.25.1"
conditions: os=linux & cpu=arm64 conditions: os=linux & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-arm@npm:0.25.0": "@esbuild/linux-arm@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-arm@npm:0.25.0" resolution: "@esbuild/linux-arm@npm:0.25.1"
conditions: os=linux & cpu=arm conditions: os=linux & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-ia32@npm:0.25.0": "@esbuild/linux-ia32@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-ia32@npm:0.25.0" resolution: "@esbuild/linux-ia32@npm:0.25.1"
conditions: os=linux & cpu=ia32 conditions: os=linux & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
@@ -493,100 +493,100 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-loong64@npm:0.25.0": "@esbuild/linux-loong64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-loong64@npm:0.25.0" resolution: "@esbuild/linux-loong64@npm:0.25.1"
conditions: os=linux & cpu=loong64 conditions: os=linux & cpu=loong64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-mips64el@npm:0.25.0": "@esbuild/linux-mips64el@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-mips64el@npm:0.25.0" resolution: "@esbuild/linux-mips64el@npm:0.25.1"
conditions: os=linux & cpu=mips64el conditions: os=linux & cpu=mips64el
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-ppc64@npm:0.25.0": "@esbuild/linux-ppc64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-ppc64@npm:0.25.0" resolution: "@esbuild/linux-ppc64@npm:0.25.1"
conditions: os=linux & cpu=ppc64 conditions: os=linux & cpu=ppc64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-riscv64@npm:0.25.0": "@esbuild/linux-riscv64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-riscv64@npm:0.25.0" resolution: "@esbuild/linux-riscv64@npm:0.25.1"
conditions: os=linux & cpu=riscv64 conditions: os=linux & cpu=riscv64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-s390x@npm:0.25.0": "@esbuild/linux-s390x@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-s390x@npm:0.25.0" resolution: "@esbuild/linux-s390x@npm:0.25.1"
conditions: os=linux & cpu=s390x conditions: os=linux & cpu=s390x
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-x64@npm:0.25.0": "@esbuild/linux-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/linux-x64@npm:0.25.0" resolution: "@esbuild/linux-x64@npm:0.25.1"
conditions: os=linux & cpu=x64 conditions: os=linux & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/netbsd-arm64@npm:0.25.0": "@esbuild/netbsd-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/netbsd-arm64@npm:0.25.0" resolution: "@esbuild/netbsd-arm64@npm:0.25.1"
conditions: os=netbsd & cpu=arm64 conditions: os=netbsd & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/netbsd-x64@npm:0.25.0": "@esbuild/netbsd-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/netbsd-x64@npm:0.25.0" resolution: "@esbuild/netbsd-x64@npm:0.25.1"
conditions: os=netbsd & cpu=x64 conditions: os=netbsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/openbsd-arm64@npm:0.25.0": "@esbuild/openbsd-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/openbsd-arm64@npm:0.25.0" resolution: "@esbuild/openbsd-arm64@npm:0.25.1"
conditions: os=openbsd & cpu=arm64 conditions: os=openbsd & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/openbsd-x64@npm:0.25.0": "@esbuild/openbsd-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/openbsd-x64@npm:0.25.0" resolution: "@esbuild/openbsd-x64@npm:0.25.1"
conditions: os=openbsd & cpu=x64 conditions: os=openbsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/sunos-x64@npm:0.25.0": "@esbuild/sunos-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/sunos-x64@npm:0.25.0" resolution: "@esbuild/sunos-x64@npm:0.25.1"
conditions: os=sunos & cpu=x64 conditions: os=sunos & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-arm64@npm:0.25.0": "@esbuild/win32-arm64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/win32-arm64@npm:0.25.0" resolution: "@esbuild/win32-arm64@npm:0.25.1"
conditions: os=win32 & cpu=arm64 conditions: os=win32 & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-ia32@npm:0.25.0": "@esbuild/win32-ia32@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/win32-ia32@npm:0.25.0" resolution: "@esbuild/win32-ia32@npm:0.25.1"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-x64@npm:0.25.0": "@esbuild/win32-x64@npm:0.25.1":
version: 0.25.0 version: 0.25.1
resolution: "@esbuild/win32-x64@npm:0.25.0" resolution: "@esbuild/win32-x64@npm:0.25.1"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
@@ -620,6 +620,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@eslint/config-helpers@npm:^0.1.0":
version: 0.1.0
resolution: "@eslint/config-helpers@npm:0.1.0"
checksum: 10c0/3562b5325f42740fc83b0b92b7d13a61b383f8db064915143eec36184f09a09fad73eca6c2955ab6c248b0d04fa03c140f9af2f2c4c06770781a6b79f300a01e
languageName: node
linkType: hard
"@eslint/core@npm:^0.12.0": "@eslint/core@npm:^0.12.0":
version: 0.12.0 version: 0.12.0
resolution: "@eslint/core@npm:0.12.0" resolution: "@eslint/core@npm:0.12.0"
@@ -646,10 +653,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@eslint/js@npm:9.21.0, @eslint/js@npm:^9.21.0": "@eslint/js@npm:9.22.0, @eslint/js@npm:^9.22.0":
version: 9.21.0 version: 9.22.0
resolution: "@eslint/js@npm:9.21.0" resolution: "@eslint/js@npm:9.22.0"
checksum: 10c0/86c24a2668808995037e3f40c758335df2ae277c553ac0cf84381a1a8698f3099d8a22dd9c388947e6b7f93fcc1142f62406072faaa2b83c43ca79993fc01bb3 checksum: 10c0/5bcd009bb579dc6c6ed760703bdd741e08a48cd9decd677aa2cf67fe66236658cb09a00185a0369f3904e5cffba9e6e0f2ff4d9ba4fdf598fcd81d34c49213a5
languageName: node languageName: node
linkType: hard linkType: hard
@@ -911,14 +918,14 @@ __metadata:
linkType: hard linkType: hard
"@mui/types@npm:^7.2.21": "@mui/types@npm:^7.2.21":
version: 7.2.22 version: 7.2.23
resolution: "@mui/types@npm:7.2.22" resolution: "@mui/types@npm:7.2.23"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/99811e972ac19e256af05ed4047f53f72282c4e239748ebbc9ef4f074f54e0f5d2d99e23210f9faa93fce49ed426ea80021db21d31fc18cd1e878ca1081e1472 checksum: 10c0/e7aebed6a79186f76b35354f094aed0c33291eaae4494fe471a6f4a4ebe6d6998071085c76b569d859723954a10eee7e751b39aa1fd85b0ce6d888922e05937d
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1082,135 +1089,135 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-android-arm-eabi@npm:4.34.9": "@rollup/rollup-android-arm-eabi@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-android-arm-eabi@npm:4.34.9" resolution: "@rollup/rollup-android-arm-eabi@npm:4.35.0"
conditions: os=android & cpu=arm conditions: os=android & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-android-arm64@npm:4.34.9": "@rollup/rollup-android-arm64@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-android-arm64@npm:4.34.9" resolution: "@rollup/rollup-android-arm64@npm:4.35.0"
conditions: os=android & cpu=arm64 conditions: os=android & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-darwin-arm64@npm:4.34.9": "@rollup/rollup-darwin-arm64@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-darwin-arm64@npm:4.34.9" resolution: "@rollup/rollup-darwin-arm64@npm:4.35.0"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-darwin-x64@npm:4.34.9": "@rollup/rollup-darwin-x64@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-darwin-x64@npm:4.34.9" resolution: "@rollup/rollup-darwin-x64@npm:4.35.0"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-freebsd-arm64@npm:4.34.9": "@rollup/rollup-freebsd-arm64@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-freebsd-arm64@npm:4.34.9" resolution: "@rollup/rollup-freebsd-arm64@npm:4.35.0"
conditions: os=freebsd & cpu=arm64 conditions: os=freebsd & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-freebsd-x64@npm:4.34.9": "@rollup/rollup-freebsd-x64@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-freebsd-x64@npm:4.34.9" resolution: "@rollup/rollup-freebsd-x64@npm:4.35.0"
conditions: os=freebsd & cpu=x64 conditions: os=freebsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.9": "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.9" resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0"
conditions: os=linux & cpu=arm & libc=glibc conditions: os=linux & cpu=arm & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-arm-musleabihf@npm:4.34.9": "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.34.9" resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0"
conditions: os=linux & cpu=arm & libc=musl conditions: os=linux & cpu=arm & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-arm64-gnu@npm:4.34.9": "@rollup/rollup-linux-arm64-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.35.0"
conditions: os=linux & cpu=arm64 & libc=glibc conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-arm64-musl@npm:4.34.9": "@rollup/rollup-linux-arm64-musl@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.34.9" resolution: "@rollup/rollup-linux-arm64-musl@npm:4.35.0"
conditions: os=linux & cpu=arm64 & libc=musl conditions: os=linux & cpu=arm64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.9": "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0"
conditions: os=linux & cpu=loong64 & libc=glibc conditions: os=linux & cpu=loong64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.9": "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0"
conditions: os=linux & cpu=ppc64 & libc=glibc conditions: os=linux & cpu=ppc64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-riscv64-gnu@npm:4.34.9": "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0"
conditions: os=linux & cpu=riscv64 & libc=glibc conditions: os=linux & cpu=riscv64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-s390x-gnu@npm:4.34.9": "@rollup/rollup-linux-s390x-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.35.0"
conditions: os=linux & cpu=s390x & libc=glibc conditions: os=linux & cpu=s390x & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-x64-gnu@npm:4.34.9": "@rollup/rollup-linux-x64-gnu@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.34.9" resolution: "@rollup/rollup-linux-x64-gnu@npm:4.35.0"
conditions: os=linux & cpu=x64 & libc=glibc conditions: os=linux & cpu=x64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-linux-x64-musl@npm:4.34.9": "@rollup/rollup-linux-x64-musl@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-linux-x64-musl@npm:4.34.9" resolution: "@rollup/rollup-linux-x64-musl@npm:4.35.0"
conditions: os=linux & cpu=x64 & libc=musl conditions: os=linux & cpu=x64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-win32-arm64-msvc@npm:4.34.9": "@rollup/rollup-win32-arm64-msvc@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.34.9" resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.35.0"
conditions: os=win32 & cpu=arm64 conditions: os=win32 & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-win32-ia32-msvc@npm:4.34.9": "@rollup/rollup-win32-ia32-msvc@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.34.9" resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.35.0"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-win32-x64-msvc@npm:4.34.9": "@rollup/rollup-win32-x64-msvc@npm:4.35.0":
version: 4.34.9 version: 4.35.0
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.34.9" resolution: "@rollup/rollup-win32-x64-msvc@npm:4.35.0"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1399,21 +1406,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:*": "@types/node@npm:*, @types/node@npm:^22.13.10":
version: 22.13.8 version: 22.13.10
resolution: "@types/node@npm:22.13.8" resolution: "@types/node@npm:22.13.10"
dependencies: dependencies:
undici-types: "npm:~6.20.0" undici-types: "npm:~6.20.0"
checksum: 10c0/bfc92b734a9dce6ac5daee0a52feccdf5dcb3804d895e4bc5384e2f4644612b8801725cd03c8c3c0888fb5eeb16b875877ac44b77641e0196dc1a837b1c2a366 checksum: 10c0/a3865f9503d6f718002374f7b87efaadfae62faa499c1a33b12c527cfb9fd86f733e1a1b026b80c5a0e4a965701174bc3305595a7d36078aa1abcf09daa5dee9
languageName: node
linkType: hard
"@types/node@npm:^22.13.9":
version: 22.13.9
resolution: "@types/node@npm:22.13.9"
dependencies:
undici-types: "npm:~6.20.0"
checksum: 10c0/eb6acd04169a076631dcaab712128d492cd17a1b3f10daae4a377f3d439c860c3cd3e32f4ef221671f56183b976ac7c4089f4193457314a88675ead4663438a4
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1476,15 +1474,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:8.26.0": "@typescript-eslint/eslint-plugin@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/eslint-plugin@npm:8.26.0" resolution: "@typescript-eslint/eslint-plugin@npm:8.26.1"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.10.0" "@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.26.0" "@typescript-eslint/scope-manager": "npm:8.26.1"
"@typescript-eslint/type-utils": "npm:8.26.0" "@typescript-eslint/type-utils": "npm:8.26.1"
"@typescript-eslint/utils": "npm:8.26.0" "@typescript-eslint/utils": "npm:8.26.1"
"@typescript-eslint/visitor-keys": "npm:8.26.0" "@typescript-eslint/visitor-keys": "npm:8.26.1"
graphemer: "npm:^1.4.0" graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1" ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0" natural-compare: "npm:^1.4.0"
@@ -1493,64 +1491,64 @@ __metadata:
"@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/b270467672c5cb7fb9085ae063364252af2910a424899f2a9f54cfbe84aba6ce80dbbf5027f1f33f17cc587da9883de212a4b3dc969f22ded30076889b499dd8 checksum: 10c0/412f41aafd503a1faea91edd03a68717ca8a49ed6683700b8386115c67b86110c9826d10005d3a0341b78cdee41a6ef08842716ced2b58af03f91eb1b8cc929c
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:8.26.0": "@typescript-eslint/parser@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/parser@npm:8.26.0" resolution: "@typescript-eslint/parser@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:8.26.0" "@typescript-eslint/scope-manager": "npm:8.26.1"
"@typescript-eslint/types": "npm:8.26.0" "@typescript-eslint/types": "npm:8.26.1"
"@typescript-eslint/typescript-estree": "npm:8.26.0" "@typescript-eslint/typescript-estree": "npm:8.26.1"
"@typescript-eslint/visitor-keys": "npm:8.26.0" "@typescript-eslint/visitor-keys": "npm:8.26.1"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/b937a80aeca4e508a67cbf2e42dfd268316336de265aaf836d04e49008a6ff4d754e73ad30075c183d98756677d1f54061c34e618c97d5fb61a04903c65d4851 checksum: 10c0/21fe4306b6017bf183d92cdd493edacd302816071e29e1400452f3ccd224ab8111b75892507b9731545e98e6e4d153e54dab568b3433f6c9596b6cb2f7af922f
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:8.26.0": "@typescript-eslint/scope-manager@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/scope-manager@npm:8.26.0" resolution: "@typescript-eslint/scope-manager@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.26.0" "@typescript-eslint/types": "npm:8.26.1"
"@typescript-eslint/visitor-keys": "npm:8.26.0" "@typescript-eslint/visitor-keys": "npm:8.26.1"
checksum: 10c0/f93b12daf6a4df3050ca3fc6db1f534b5c521861509ee09a45a8a17d97f2fbb20c2d34975f07291481d69998aac9f2975f8facad0d47f533db56ec8f70f533a0 checksum: 10c0/ecd30eb615c7384f01cea8f2c8e8dda7507ada52ad0d002d3701bdd9d06f6d14cefb31c6c26ef55708adfaa2045a01151e8685656240268231a4bac8f792afe4
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:8.26.0": "@typescript-eslint/type-utils@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/type-utils@npm:8.26.0" resolution: "@typescript-eslint/type-utils@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:8.26.0" "@typescript-eslint/typescript-estree": "npm:8.26.1"
"@typescript-eslint/utils": "npm:8.26.0" "@typescript-eslint/utils": "npm:8.26.1"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^2.0.1" ts-api-utils: "npm:^2.0.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/840b7551dcea7304632564612a2460f869c5330c50661cf21ac5992359aba7539f1466ac7dbde6f2d0bd56f6f769c9f3fed8564045c82d4914a88745da846870 checksum: 10c0/17553b4333246e1ffd447dab78a4cbc565c129c9baf32326387760c9790120a99d955acf84888b7ef96e73c82fc22a3e08e80f0bd65d21e3cf2fe002f977aba1
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:8.26.0": "@typescript-eslint/types@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/types@npm:8.26.0" resolution: "@typescript-eslint/types@npm:8.26.1"
checksum: 10c0/b16c0f67d12092c204a5935b430854b3a41c80934b386a5a4526acc9c8a829d8ee4f78732e71587e605de7845fa9a801b59fff015471dab7bf33676ee68c0100 checksum: 10c0/805b239b57854fc12eae9e2bec6ccab24bac1d30a762c455f22c73b777a5859c64c58b4750458bd0ab4aadd664eb95cbef091348a071975acac05b15ebea9f1b
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:8.26.0": "@typescript-eslint/typescript-estree@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/typescript-estree@npm:8.26.0" resolution: "@typescript-eslint/typescript-estree@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.26.0" "@typescript-eslint/types": "npm:8.26.1"
"@typescript-eslint/visitor-keys": "npm:8.26.0" "@typescript-eslint/visitor-keys": "npm:8.26.1"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
fast-glob: "npm:^3.3.2" fast-glob: "npm:^3.3.2"
is-glob: "npm:^4.0.3" is-glob: "npm:^4.0.3"
@@ -1559,32 +1557,32 @@ __metadata:
ts-api-utils: "npm:^2.0.1" ts-api-utils: "npm:^2.0.1"
peerDependencies: peerDependencies:
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/898bf7ec8ee1f3454d0e38a0bb3d7bd3cbd39f530857c9b1851650ec1647bcb6997622e86d24332d81848afd9b65ce4c080437ab1c3c023b23915a745dd0b363 checksum: 10c0/adc95e4735a8ded05ad35d7b4fae68c675afdd4b3531bc4a51eab5efe793cf80bc75f56dfc8022af4c0a5b316eec61f8ce6b77c2ead45fc675fea7e28cd52ade
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:8.26.0": "@typescript-eslint/utils@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/utils@npm:8.26.0" resolution: "@typescript-eslint/utils@npm:8.26.1"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0" "@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.26.0" "@typescript-eslint/scope-manager": "npm:8.26.1"
"@typescript-eslint/types": "npm:8.26.0" "@typescript-eslint/types": "npm:8.26.1"
"@typescript-eslint/typescript-estree": "npm:8.26.0" "@typescript-eslint/typescript-estree": "npm:8.26.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/594838a865d385ad5206c8b948678d4cb4010d0c9b826913968ce9e8af4d1c58b1f044de49f91d8dc36cda2ddb121ee7d2c5b53822a05f3e55002b10a42b3bfb checksum: 10c0/a5cb3bdf253cc8e8474a2ed8666c0a6194abe56f44039c6623bef0459ed17d0276ed6e40c70d35bd8ec4d41bafc255e4d3025469f32ac692ba2d89e7579c2a26
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:8.26.0": "@typescript-eslint/visitor-keys@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "@typescript-eslint/visitor-keys@npm:8.26.0" resolution: "@typescript-eslint/visitor-keys@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.26.0" "@typescript-eslint/types": "npm:8.26.1"
eslint-visitor-keys: "npm:^4.2.0" eslint-visitor-keys: "npm:^4.2.0"
checksum: 10c0/6428c1ba199d962060d43f06ba8a98b874ba6fe875a23b10e8f01550838d8be8ee689ae4da3e8b045d4c7bb01e38385e6a8ae17a9d566cf7cd21f7090b573f61 checksum: 10c0/51b1016d06cd2b9eac0a213de418b0a26022fd3b71478014541bfcbc2a3c4d666552390eb9c209fa9e52c868710d9f1b21a2c789d35c650239438c366a27a239
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1596,7 +1594,7 @@ __metadata:
"@babel/core": "npm:^7.26.9" "@babel/core": "npm:^7.26.9"
"@emotion/react": "npm:^11.14.0" "@emotion/react": "npm:^11.14.0"
"@emotion/styled": "npm:^11.14.0" "@emotion/styled": "npm:^11.14.0"
"@eslint/js": "npm:^9.21.0" "@eslint/js": "npm:^9.22.0"
"@mui/icons-material": "npm:^6.4.7" "@mui/icons-material": "npm:^6.4.7"
"@mui/material": "npm:^6.4.7" "@mui/material": "npm:^6.4.7"
"@preact/compat": "npm:^18.3.1" "@preact/compat": "npm:^18.3.1"
@@ -1604,13 +1602,13 @@ __metadata:
"@table-library/react-table-library": "npm:4.1.12" "@table-library/react-table-library": "npm:4.1.12"
"@trivago/prettier-plugin-sort-imports": "npm:^5.2.2" "@trivago/prettier-plugin-sort-imports": "npm:^5.2.2"
"@types/formidable": "npm:^3" "@types/formidable": "npm:^3"
"@types/node": "npm:^22.13.9" "@types/node": "npm:^22.13.10"
"@types/react": "npm:^19.0.10" "@types/react": "npm:^19.0.10"
"@types/react-dom": "npm:^19.0.4" "@types/react-dom": "npm:^19.0.4"
alova: "npm:3.2.10" alova: "npm:3.2.10"
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
concurrently: "npm:^9.1.2" concurrently: "npm:^9.1.2"
eslint: "npm:^9.21.0" eslint: "npm:^9.22.0"
eslint-config-prettier: "npm:^10.1.1" eslint-config-prettier: "npm:^10.1.1"
formidable: "npm:^3.5.2" formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0" jwt-decode: "npm:^4.0.0"
@@ -1626,7 +1624,7 @@ __metadata:
terser: "npm:^5.39.0" terser: "npm:^5.39.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.8.2" typescript: "npm:^5.8.2"
typescript-eslint: "npm:8.26.0" typescript-eslint: "npm:8.26.1"
vite: "npm:^6.2.1" vite: "npm:^6.2.1"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^5.1.4" vite-tsconfig-paths: "npm:^5.1.4"
@@ -1650,11 +1648,11 @@ __metadata:
linkType: hard linkType: hard
"acorn@npm:^8.14.0, acorn@npm:^8.8.2": "acorn@npm:^8.14.0, acorn@npm:^8.8.2":
version: 8.14.0 version: 8.14.1
resolution: "acorn@npm:8.14.0" resolution: "acorn@npm:8.14.1"
bin: bin:
acorn: bin/acorn acorn: bin/acorn
checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7 checksum: 10c0/dbd36c1ed1d2fa3550140000371fcf721578095b18777b85a79df231ca093b08edc6858d75d6e48c73e431c174dcf9214edbd7e6fa5911b93bd8abfa54e47123
languageName: node languageName: node
linkType: hard linkType: hard
@@ -2041,9 +2039,9 @@ __metadata:
linkType: hard linkType: hard
"caniuse-lite@npm:^1.0.30001688": "caniuse-lite@npm:^1.0.30001688":
version: 1.0.30001701 version: 1.0.30001703
resolution: "caniuse-lite@npm:1.0.30001701" resolution: "caniuse-lite@npm:1.0.30001703"
checksum: 10c0/a814bd4dd8b49645ca51bc6ee42120660a36394bb54eb6084801d3f2bbb9471e5e1a9a8a25f44f83086a032d46e66b33031e2aa345f699b90a7e84a9836b819c checksum: 10c0/ed88e318da28e9e59c4ac3a2e3c42859558b7b713aebf03696a1f916e4ed4b70734dda82be04635e2b62ec355b8639bbed829b7b12ff528d7f9cc31a3a5bea91
languageName: node languageName: node
linkType: hard linkType: hard
@@ -2624,9 +2622,9 @@ __metadata:
linkType: hard linkType: hard
"electron-to-chromium@npm:^1.5.73": "electron-to-chromium@npm:^1.5.73":
version: 1.5.109 version: 1.5.114
resolution: "electron-to-chromium@npm:1.5.109" resolution: "electron-to-chromium@npm:1.5.114"
checksum: 10c0/19d86b95b1288b2e73d9d6084f64b14d4ef2c51d8551d85697ea68da690542d26e6d07878ff053f137e561e3e6c8c2b062d0353bc159930569831f7960bb6ed7 checksum: 10c0/cb86057d78f1aeb53ab6550dedacfd9496bcc6676bab7b48466c3958ba9ce0ed78c7213b1eab99ba38542cbaaa176eb7f8ea8b0274c0688b8ce3058291549430
languageName: node languageName: node
linkType: hard linkType: hard
@@ -2914,34 +2912,34 @@ __metadata:
linkType: hard linkType: hard
"esbuild@npm:^0.25.0": "esbuild@npm:^0.25.0":
version: 0.25.0 version: 0.25.1
resolution: "esbuild@npm:0.25.0" resolution: "esbuild@npm:0.25.1"
dependencies: dependencies:
"@esbuild/aix-ppc64": "npm:0.25.0" "@esbuild/aix-ppc64": "npm:0.25.1"
"@esbuild/android-arm": "npm:0.25.0" "@esbuild/android-arm": "npm:0.25.1"
"@esbuild/android-arm64": "npm:0.25.0" "@esbuild/android-arm64": "npm:0.25.1"
"@esbuild/android-x64": "npm:0.25.0" "@esbuild/android-x64": "npm:0.25.1"
"@esbuild/darwin-arm64": "npm:0.25.0" "@esbuild/darwin-arm64": "npm:0.25.1"
"@esbuild/darwin-x64": "npm:0.25.0" "@esbuild/darwin-x64": "npm:0.25.1"
"@esbuild/freebsd-arm64": "npm:0.25.0" "@esbuild/freebsd-arm64": "npm:0.25.1"
"@esbuild/freebsd-x64": "npm:0.25.0" "@esbuild/freebsd-x64": "npm:0.25.1"
"@esbuild/linux-arm": "npm:0.25.0" "@esbuild/linux-arm": "npm:0.25.1"
"@esbuild/linux-arm64": "npm:0.25.0" "@esbuild/linux-arm64": "npm:0.25.1"
"@esbuild/linux-ia32": "npm:0.25.0" "@esbuild/linux-ia32": "npm:0.25.1"
"@esbuild/linux-loong64": "npm:0.25.0" "@esbuild/linux-loong64": "npm:0.25.1"
"@esbuild/linux-mips64el": "npm:0.25.0" "@esbuild/linux-mips64el": "npm:0.25.1"
"@esbuild/linux-ppc64": "npm:0.25.0" "@esbuild/linux-ppc64": "npm:0.25.1"
"@esbuild/linux-riscv64": "npm:0.25.0" "@esbuild/linux-riscv64": "npm:0.25.1"
"@esbuild/linux-s390x": "npm:0.25.0" "@esbuild/linux-s390x": "npm:0.25.1"
"@esbuild/linux-x64": "npm:0.25.0" "@esbuild/linux-x64": "npm:0.25.1"
"@esbuild/netbsd-arm64": "npm:0.25.0" "@esbuild/netbsd-arm64": "npm:0.25.1"
"@esbuild/netbsd-x64": "npm:0.25.0" "@esbuild/netbsd-x64": "npm:0.25.1"
"@esbuild/openbsd-arm64": "npm:0.25.0" "@esbuild/openbsd-arm64": "npm:0.25.1"
"@esbuild/openbsd-x64": "npm:0.25.0" "@esbuild/openbsd-x64": "npm:0.25.1"
"@esbuild/sunos-x64": "npm:0.25.0" "@esbuild/sunos-x64": "npm:0.25.1"
"@esbuild/win32-arm64": "npm:0.25.0" "@esbuild/win32-arm64": "npm:0.25.1"
"@esbuild/win32-ia32": "npm:0.25.0" "@esbuild/win32-ia32": "npm:0.25.1"
"@esbuild/win32-x64": "npm:0.25.0" "@esbuild/win32-x64": "npm:0.25.1"
dependenciesMeta: dependenciesMeta:
"@esbuild/aix-ppc64": "@esbuild/aix-ppc64":
optional: true optional: true
@@ -2995,7 +2993,7 @@ __metadata:
optional: true optional: true
bin: bin:
esbuild: bin/esbuild esbuild: bin/esbuild
checksum: 10c0/5767b72da46da3cfec51661647ec850ddbf8a8d0662771139f10ef0692a8831396a0004b2be7966cecdb08264fb16bdc16290dcecd92396fac5f12d722fa013d checksum: 10c0/80fca30dd0f21aec23fdfab34f0a8d5f55df5097dd7f475f2ab561d45662c32ee306f5649071cd1a0ba0614b164c48ca3dc3ee1551a4daf204b8af90e4d893f5
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3031,13 +3029,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint-scope@npm:^8.2.0": "eslint-scope@npm:^8.3.0":
version: 8.2.0 version: 8.3.0
resolution: "eslint-scope@npm:8.2.0" resolution: "eslint-scope@npm:8.3.0"
dependencies: dependencies:
esrecurse: "npm:^4.3.0" esrecurse: "npm:^4.3.0"
estraverse: "npm:^5.2.0" estraverse: "npm:^5.2.0"
checksum: 10c0/8d2d58e2136d548ac7e0099b1a90d9fab56f990d86eb518de1247a7066d38c908be2f3df477a79cf60d70b30ba18735d6c6e70e9914dca2ee515a729975d70d6 checksum: 10c0/23bf54345573201fdf06d29efa345ab508b355492f6c6cc9e2b9f6d02b896f369b6dd5315205be94b8853809776c4d13353b85c6b531997b164ff6c3328ecf5b
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3055,16 +3053,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint@npm:^9.21.0": "eslint@npm:^9.22.0":
version: 9.21.0 version: 9.22.0
resolution: "eslint@npm:9.21.0" resolution: "eslint@npm:9.22.0"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/eslint-utils": "npm:^4.2.0"
"@eslint-community/regexpp": "npm:^4.12.1" "@eslint-community/regexpp": "npm:^4.12.1"
"@eslint/config-array": "npm:^0.19.2" "@eslint/config-array": "npm:^0.19.2"
"@eslint/config-helpers": "npm:^0.1.0"
"@eslint/core": "npm:^0.12.0" "@eslint/core": "npm:^0.12.0"
"@eslint/eslintrc": "npm:^3.3.0" "@eslint/eslintrc": "npm:^3.3.0"
"@eslint/js": "npm:9.21.0" "@eslint/js": "npm:9.22.0"
"@eslint/plugin-kit": "npm:^0.2.7" "@eslint/plugin-kit": "npm:^0.2.7"
"@humanfs/node": "npm:^0.16.6" "@humanfs/node": "npm:^0.16.6"
"@humanwhocodes/module-importer": "npm:^1.0.1" "@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -3076,7 +3075,7 @@ __metadata:
cross-spawn: "npm:^7.0.6" cross-spawn: "npm:^7.0.6"
debug: "npm:^4.3.2" debug: "npm:^4.3.2"
escape-string-regexp: "npm:^4.0.0" escape-string-regexp: "npm:^4.0.0"
eslint-scope: "npm:^8.2.0" eslint-scope: "npm:^8.3.0"
eslint-visitor-keys: "npm:^4.2.0" eslint-visitor-keys: "npm:^4.2.0"
espree: "npm:^10.3.0" espree: "npm:^10.3.0"
esquery: "npm:^1.5.0" esquery: "npm:^1.5.0"
@@ -3100,7 +3099,7 @@ __metadata:
optional: true optional: true
bin: bin:
eslint: bin/eslint.js eslint: bin/eslint.js
checksum: 10c0/558edb25b440cd51825d66fed3e84f1081bd6f4cb2cf994e60ece4c5978fa0583e88b75faf187c1fc21688c4ff7072f12bf5f6d1be1e09a4d6af78cff39dc520 checksum: 10c0/7b5ab6f2365971c16efe97349565f75d8343347562fb23f12734c6ab2cd5e35301373a0d51e194789ddcfdfca21db7b62ff481b03d524b8169896c305b65ff48
languageName: node languageName: node
linkType: hard linkType: hard
@@ -4916,11 +4915,11 @@ __metadata:
linkType: hard linkType: hard
"nanoid@npm:^3.3.8": "nanoid@npm:^3.3.8":
version: 3.3.8 version: 3.3.9
resolution: "nanoid@npm:3.3.8" resolution: "nanoid@npm:3.3.9"
bin: bin:
nanoid: bin/nanoid.cjs nanoid: bin/nanoid.cjs
checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120 checksum: 10c0/4515abe53db7b150cf77074558efc20d8e916d6910d557b5ce72e8bbf6f8e7554d3d7a0d180bfa65e5d8e99aa51b207aa8a3bf5f3b56233897b146d592e30b24
languageName: node languageName: node
linkType: hard linkType: hard
@@ -5864,28 +5863,28 @@ __metadata:
linkType: hard linkType: hard
"rollup@npm:^4.30.1": "rollup@npm:^4.30.1":
version: 4.34.9 version: 4.35.0
resolution: "rollup@npm:4.34.9" resolution: "rollup@npm:4.35.0"
dependencies: dependencies:
"@rollup/rollup-android-arm-eabi": "npm:4.34.9" "@rollup/rollup-android-arm-eabi": "npm:4.35.0"
"@rollup/rollup-android-arm64": "npm:4.34.9" "@rollup/rollup-android-arm64": "npm:4.35.0"
"@rollup/rollup-darwin-arm64": "npm:4.34.9" "@rollup/rollup-darwin-arm64": "npm:4.35.0"
"@rollup/rollup-darwin-x64": "npm:4.34.9" "@rollup/rollup-darwin-x64": "npm:4.35.0"
"@rollup/rollup-freebsd-arm64": "npm:4.34.9" "@rollup/rollup-freebsd-arm64": "npm:4.35.0"
"@rollup/rollup-freebsd-x64": "npm:4.34.9" "@rollup/rollup-freebsd-x64": "npm:4.35.0"
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.34.9" "@rollup/rollup-linux-arm-gnueabihf": "npm:4.35.0"
"@rollup/rollup-linux-arm-musleabihf": "npm:4.34.9" "@rollup/rollup-linux-arm-musleabihf": "npm:4.35.0"
"@rollup/rollup-linux-arm64-gnu": "npm:4.34.9" "@rollup/rollup-linux-arm64-gnu": "npm:4.35.0"
"@rollup/rollup-linux-arm64-musl": "npm:4.34.9" "@rollup/rollup-linux-arm64-musl": "npm:4.35.0"
"@rollup/rollup-linux-loongarch64-gnu": "npm:4.34.9" "@rollup/rollup-linux-loongarch64-gnu": "npm:4.35.0"
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.34.9" "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.35.0"
"@rollup/rollup-linux-riscv64-gnu": "npm:4.34.9" "@rollup/rollup-linux-riscv64-gnu": "npm:4.35.0"
"@rollup/rollup-linux-s390x-gnu": "npm:4.34.9" "@rollup/rollup-linux-s390x-gnu": "npm:4.35.0"
"@rollup/rollup-linux-x64-gnu": "npm:4.34.9" "@rollup/rollup-linux-x64-gnu": "npm:4.35.0"
"@rollup/rollup-linux-x64-musl": "npm:4.34.9" "@rollup/rollup-linux-x64-musl": "npm:4.35.0"
"@rollup/rollup-win32-arm64-msvc": "npm:4.34.9" "@rollup/rollup-win32-arm64-msvc": "npm:4.35.0"
"@rollup/rollup-win32-ia32-msvc": "npm:4.34.9" "@rollup/rollup-win32-ia32-msvc": "npm:4.35.0"
"@rollup/rollup-win32-x64-msvc": "npm:4.34.9" "@rollup/rollup-win32-x64-msvc": "npm:4.35.0"
"@types/estree": "npm:1.0.6" "@types/estree": "npm:1.0.6"
fsevents: "npm:~2.3.2" fsevents: "npm:~2.3.2"
dependenciesMeta: dependenciesMeta:
@@ -5931,7 +5930,7 @@ __metadata:
optional: true optional: true
bin: bin:
rollup: dist/bin/rollup rollup: dist/bin/rollup
checksum: 10c0/dd0be1f7c4f8a93040026be13ecc39259fb55313db0dac7eafd97a3ac01ab4584e6b1a8afd86b0259dcf391699d5560a678abe6c0729af0aa4f2d5df70f05c8c checksum: 10c0/5a04add5a48173b1d95deb5422a96833b7df91b14ccec462c048be48241a79ecee2c1b843511b91ca8b6124bdbae134ccfebe80d4222a93e98e73795d161d3cc
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6655,17 +6654,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript-eslint@npm:8.26.0": "typescript-eslint@npm:8.26.1":
version: 8.26.0 version: 8.26.1
resolution: "typescript-eslint@npm:8.26.0" resolution: "typescript-eslint@npm:8.26.1"
dependencies: dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.26.0" "@typescript-eslint/eslint-plugin": "npm:8.26.1"
"@typescript-eslint/parser": "npm:8.26.0" "@typescript-eslint/parser": "npm:8.26.1"
"@typescript-eslint/utils": "npm:8.26.0" "@typescript-eslint/utils": "npm:8.26.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/7bf055ac2839c96d72c3c4213b5bef82ca71aba73a02922b8ba9e3bd91bb845127f32f8cb1c7b7ef6201803a7ffcf0cc6be18318b46d84296e1b1e2adbd27643 checksum: 10c0/92ab2e59950020eae9956e0e1fd572bc98bab0f764e63f49bfd9feab3b38edfe888712fd2df6fc43642b9be06e60288f72626d7a7cc25dcbb4c692df64cba064
languageName: node languageName: node
linkType: hard linkType: hard

581
mock-api/.yarn/releases/yarn-4.6.0.cjs → mock-api/.yarn/releases/yarn-4.7.0.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
mock-api/.yarnrc.yml
View File

@@ -1,3 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.6.0.cjs yarnPath: .yarn/releases/yarn-4.7.0.cjs

2
mock-api/package.json
View File

@@ -15,5 +15,5 @@
"itty-router": "^5.0.18", "itty-router": "^5.0.18",
"prettier": "^3.5.3" "prettier": "^3.5.3"
}, },
"packageManager": "yarn@4.6.0" "packageManager": "yarn@4.7.0"
} }

20
mock-api/rest_server.ts
View File

@@ -269,10 +269,10 @@ function updateMask(entity: any, de: any, dd: any) {
const old_custom_name = dd.nodes[dd_objIndex].cn; const old_custom_name = dd.nodes[dd_objIndex].cn;
console.log( console.log(
'comparing names, old (' + 'comparing names, old (' +
old_custom_name + old_custom_name +
') with new (' + ') with new (' +
new_custom_name + new_custom_name +
')' ')'
); );
if (old_custom_name !== new_custom_name) { if (old_custom_name !== new_custom_name) {
changed = true; changed = true;
@@ -367,15 +367,15 @@ function check_upgrade(version: string) {
const stable_version = version.split(',')[1]; const stable_version = version.split(',')[1];
console.log( console.log(
'latest dev version: ' + 'latest dev version: ' +
dev_version + dev_version +
', latest stable version: ' + ', latest stable version: ' +
stable_version stable_version
); );
console.log( console.log(
'Version upgrade check from version ' + 'Version upgrade check from version ' +
THIS_VERSION + THIS_VERSION +
', upgradable: ' + ', upgradable: ' +
VERSION_IS_UPGRADEABLE VERSION_IS_UPGRADEABLE
); );
data = { data = {
emsesp_version: THIS_VERSION, emsesp_version: THIS_VERSION,

2
scripts/strip_csv.py
View File

@@ -1,5 +1,5 @@
# strips out lines between two markers # strips out lines between two markers
# pipe a file into, for example: 'cat x | python3 strip_csv.py' # pipe a file into it, for example: 'cat x | python3 strip_csv.py'
import fileinput import fileinput
with fileinput.input() as f_input: with fileinput.input() as f_input:
inRecordingMode = False inRecordingMode = False

2
src/core/emsesp.cpp
View File

@@ -332,6 +332,7 @@ void EMSESP::show_ems(uuid::console::Shell & shell) {
// this is intended to run within the OS with lots of available memory! // this is intended to run within the OS with lots of available memory!
#if defined(EMSESP_STANDALONE) #if defined(EMSESP_STANDALONE)
void EMSESP::dump_all_entities(uuid::console::Shell & shell) { void EMSESP::dump_all_entities(uuid::console::Shell & shell) {
Serial.println();
Serial.println("---- CSV START ----"); // marker use by py script Serial.println("---- CSV START ----"); // marker use by py script
// add header for CSV // add header for CSV
Serial.println("device name,device type,product id,shortname,fullname,type [options...] \\| (min/max),uom,writeable,discovery entityid v3.4,discovery " Serial.println("device name,device type,product id,shortname,fullname,type [options...] \\| (min/max),uom,writeable,discovery entityid v3.4,discovery "
@@ -381,6 +382,7 @@ void EMSESP::dump_all_entities(uuid::console::Shell & shell) {
void EMSESP::dump_all_telegrams(uuid::console::Shell & shell) { void EMSESP::dump_all_telegrams(uuid::console::Shell & shell) {
std::vector<EMSdevice::TelegramFunctionDump> telegram_functions_dump; std::vector<EMSdevice::TelegramFunctionDump> telegram_functions_dump;
Serial.println();
Serial.println("---- CSV START ----"); // marker use by py script Serial.println("---- CSV START ----"); // marker use by py script
// add header for CSV // add header for CSV
Serial.println("telegram_type_id,name,is_fetched"); Serial.println("telegram_type_id,name,is_fetched");

216
src/core/modbus_entity_parameters.hpp
View File

@@ -55,114 +55,114 @@ const std::initializer_list<Modbus::EntityModbusInfo> Modbus::modbus_register_ma
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maintenanceDate), 71, 6), // maintenancedate REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maintenanceDate), 71, 6), // maintenancedate
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(emergencyOps), 77, 1), // emergencyops REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(emergencyOps), 77, 1), // emergencyops
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(emergencyTemp), 78, 1), // emergencytemp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(emergencyTemp), 78, 1), // emergencytemp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgTotal), 79, 2), // nrgtotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc0Flow), 79, 1), // pc0flow
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgHeat), 81, 2), // nrgheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1Flow), 80, 1), // pc1flow
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgCool), 83, 2), // nrgcool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1On), 81, 1), // pc1on
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterTotal), 85, 2), // metertotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1Rate), 82, 1), // pc1rate
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterComp), 87, 2), // metercomp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgTotal), 83, 2), // nrgtotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterEHeat), 89, 2), // metereheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgHeat), 85, 2), // nrgheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterHeat), 91, 2), // meterheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgCool), 87, 2), // nrgcool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterCool), 93, 2), // metercool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterTotal), 89, 2), // metertotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeTotal), 95, 2), // uptimetotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterComp), 91, 2), // metercomp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeControl), 97, 2), // uptimecontrol REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterEHeat), 93, 2), // metereheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompHeating), 99, 2), // uptimecompheating REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterHeat), 95, 2), // meterheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompCooling), 101, 2), // uptimecompcooling REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(meterCool), 97, 2), // metercool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompPool), 103, 2), // uptimecomppool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeTotal), 99, 2), // uptimetotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(totalCompStarts), 105, 2), // totalcompstarts REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeControl), 101, 2), // uptimecontrol
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(heatingStarts), 107, 2), // heatingstarts REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompHeating), 103, 2), // uptimecompheating
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(coolingStarts), 109, 2), // coolingstarts REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompCooling), 105, 2), // uptimecompcooling
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(poolStarts), 111, 2), // poolstarts REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(upTimeCompPool), 107, 2), // uptimecomppool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsTotal), 113, 2), // nrgconstotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(totalCompStarts), 109, 2), // totalcompstarts
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompTotal), 115, 2), // nrgconscomptotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(heatingStarts), 111, 2), // heatingstarts
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompHeating), 117, 2), // nrgconscompheating REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(coolingStarts), 113, 2), // coolingstarts
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompCooling), 119, 2), // nrgconscompcooling REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(poolStarts), 115, 2), // poolstarts
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompPool), 121, 2), // nrgconscomppool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsTotal), 117, 2), // nrgconstotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsTotal), 123, 2), // auxelecheatnrgconstotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompTotal), 119, 2), // nrgconscomptotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsHeating), 125, 2), // auxelecheatnrgconsheating REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompHeating), 121, 2), // nrgconscompheating
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsPool), 127, 2), // auxelecheatnrgconspool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompCooling), 123, 2), // nrgconscompcooling
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppTotal), 129, 2), // nrgsupptotal REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgConsCompPool), 125, 2), // nrgconscomppool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppHeating), 131, 2), // nrgsuppheating REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsTotal), 127, 2), // auxelecheatnrgconstotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppCooling), 133, 2), // nrgsuppcooling REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsHeating), 129, 2), // auxelecheatnrgconsheating
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppPool), 135, 2), // nrgsupppool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxElecHeatNrgConsPool), 131, 2), // auxelecheatnrgconspool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPower), 137, 1), // hppower REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppTotal), 133, 2), // nrgsupptotal
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpMaxPower), 138, 1), // hpmaxpower REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppHeating), 135, 2), // nrgsuppheating
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pvMaxComp), 139, 1), // pvmaxcomp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppCooling), 137, 2), // nrgsuppcooling
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(powerReduction), 140, 1), // powerreduction REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(nrgSuppPool), 139, 2), // nrgsupppool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpSetDiffPress), 141, 1), // hpsetdiffpress REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPower), 141, 1), // hppower
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCompOn), 142, 1), // hpcompon REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpMaxPower), 142, 1), // hpmaxpower
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpActivity), 143, 1), // hpactivity REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pvMaxComp), 143, 1), // pvmaxcomp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrinePumpSpd), 144, 1), // hpbrinepumpspd REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(powerReduction), 144, 1), // powerreduction
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpSwitchValve), 145, 1), // hpswitchvalve REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpSetDiffPress), 145, 1), // hpsetdiffpress
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCompSpd), 146, 1), // hpcompspd REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCompOn), 146, 1), // hpcompon
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCircSpd), 147, 1), // hpcircspd REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpActivity), 147, 1), // hpactivity
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrineIn), 148, 1), // hpbrinein REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrinePumpSpd), 148, 1), // hpbrinepumpspd
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrineOut), 149, 1), // hpbrineout REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpSwitchValve), 149, 1), // hpswitchvalve
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc0), 150, 1), // hptc0 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCompSpd), 150, 1), // hpcompspd
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc1), 151, 1), // hptc1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCircSpd), 151, 1), // hpcircspd
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc3), 152, 1), // hptc3 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrineIn), 152, 1), // hpbrinein
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr1), 153, 1), // hptr1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpBrineOut), 153, 1), // hpbrineout
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr3), 154, 1), // hptr3 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc0), 154, 1), // hptc0
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr4), 155, 1), // hptr4 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc1), 155, 1), // hptc1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr5), 156, 1), // hptr5 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTc3), 156, 1), // hptc3
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr6), 157, 1), // hptr6 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr1), 157, 1), // hptr1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr7), 158, 1), // hptr7 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr3), 158, 1), // hptr3
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTl2), 159, 1), // hptl2 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr4), 159, 1), // hptr4
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPl1), 160, 1), // hppl1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr5), 160, 1), // hptr5
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPh1), 161, 1), // hpph1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr6), 161, 1), // hptr6
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTa4), 162, 1), // hpta4 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTr7), 162, 1), // hptr7
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTw1), 163, 1), // hptw1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTl2), 163, 1), // hptl2
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(poolSetTemp), 164, 1), // poolsettemp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPl1), 164, 1), // hppl1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hp4wayValve), 165, 1), // hp4way REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPh1), 165, 1), // hpph1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput1), 166, 1), // hpin1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTa4), 166, 1), // hpta4
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn1Opt), 167, 8), // hpin1opt REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpTw1), 167, 1), // hptw1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput2), 175, 1), // hpin2 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(poolSetTemp), 168, 1), // poolsettemp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn2Opt), 176, 8), // hpin2opt REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hp4wayValve), 169, 1), // hp4way
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput3), 184, 1), // hpin3 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput1), 170, 1), // hpin1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn3Opt), 185, 8), // hpin3opt REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn1Opt), 171, 8), // hpin1opt
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput4), 193, 1), // hpin4 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput2), 179, 1), // hpin2
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn4Opt), 194, 8), // hpin4opt REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn2Opt), 180, 8), // hpin2opt
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maxHeatComp), 202, 1), // maxheatcomp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput3), 188, 1), // hpin3
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maxHeatHeat), 203, 1), // maxheatheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn3Opt), 189, 8), // hpin3opt
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(manDefrost), 204, 1), // mandefrost REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpInput4), 197, 1), // hpin4
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pvCooling), 205, 1), // pvcooling REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpIn4Opt), 198, 8), // hpin4opt
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterOnly), 206, 1), // auxheateronly REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maxHeatComp), 206, 1), // maxheatcomp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterOff), 207, 1), // auxheateroff REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(maxHeatHeat), 207, 1), // maxheatheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterStatus), 208, 1), // auxheaterstatus REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(manDefrost), 208, 1), // mandefrost
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterLevel), 209, 1), // auxheaterlevel REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pvCooling), 209, 1), // pvcooling
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterDelay), 210, 1), // auxheaterdelay REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterOnly), 210, 1), // auxheateronly
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxMaxLimit), 211, 1), // auxmaxlimit REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterOff), 211, 1), // auxheateroff
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxLimitStart), 212, 1), // auxlimitstart REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterStatus), 212, 1), // auxheaterstatus
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeatMode), 213, 1), // auxheatrmode REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterLevel), 213, 1), // auxheaterlevel
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystHeat), 214, 1), // hphystheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeaterDelay), 214, 1), // auxheaterdelay
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystCool), 215, 1), // hphystcool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxMaxLimit), 215, 1), // auxmaxlimit
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystPool), 216, 1), // hphystpool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxLimitStart), 216, 1), // auxlimitstart
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentMode), 217, 1), // silentmode REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeatMode), 217, 1), // auxheatrmode
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentFrom), 218, 1), // silentfrom REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystHeat), 218, 1), // hphystheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentTo), 219, 1), // silentto REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystCool), 219, 1), // hphystcool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(minTempSilent), 220, 1), // mintempsilent REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpHystPool), 220, 1), // hphystpool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempParMode), 221, 1), // tempparmode REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentMode), 221, 1), // silentmode
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeatMixValve), 222, 1), // auxheatmix REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentFrom), 222, 1), // silentfrom
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempDiffHeat), 223, 1), // tempdiffheat REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(silentTo), 223, 1), // silentto
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempDiffCool), 224, 1), // tempdiffcool REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(minTempSilent), 224, 1), // mintempsilent
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(vp_cooling), 225, 1), // vpcooling REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempParMode), 225, 1), // tempparmode
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(heatCable), 226, 1), // heatcable REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(auxHeatMixValve), 226, 1), // auxheatmix
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(VC0valve), 227, 1), // vc0valve REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempDiffHeat), 227, 1), // tempdiffheat
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(primePump), 228, 1), // primepump REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(tempDiffCool), 228, 1), // tempdiffcool
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(primePumpMod), 229, 1), // primepumpmod REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(vp_cooling), 229, 1), // vpcooling
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hp3wayValve), 230, 1), // hp3way REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(heatCable), 230, 1), // heatcable
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep1), 231, 1), // elheatstep1 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(VC0valve), 231, 1), // vc0valve
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep2), 232, 1), // elheatstep2 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(primePump), 232, 1), // primepump
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep3), 233, 1), // elheatstep3 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(primePumpMod), 233, 1), // primepumpmod
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpEA0), 234, 1), // hpea0 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hp3wayValve), 234, 1), // hp3way
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPumpMode), 235, 1), // hppumpmode REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep1), 235, 1), // elheatstep1
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpFan), 236, 1), // fan REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep2), 236, 1), // elheatstep2
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpShutdown), 237, 1), // shutdown REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(elHeatStep3), 237, 1), // elheatstep3
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCurrPower), 238, 1), // hpcurrpower REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpEA0), 238, 1), // hpea0
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPowerLimit), 239, 1), // hppowerlimit REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPumpMode), 239, 1), // hppumpmode
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc0Flow), 240, 1), // pc0flow REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpFan), 240, 1), // fan
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1Flow), 241, 1), // pc1flow REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpShutdown), 241, 1), // shutdown
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1On), 242, 1), // pc1on REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpCurrPower), 242, 1), // hpcurrpower
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(pc1Rate), 243, 1), // pc1rate REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(hpPowerLimit), 243, 1), // hppowerlimit
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(exhaustTemp), 244, 1), // exhausttemp REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(exhaustTemp), 244, 1), // exhausttemp
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(burnGas), 245, 1), // burngas REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(burnGas), 245, 1), // burngas
REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(burnGas2), 246, 1), // burngas2 REGISTER_MAPPING(dt::BOILER, TAG_TYPE_DEVICE_DATA, FL_(burnGas2), 246, 1), // burngas2

13
src/devices/thermostat.cpp
View File

@@ -1166,7 +1166,7 @@ void Thermostat::process_RC300Set(std::shared_ptr<const Telegram> telegram) {
has_enumupdate(telegram, hc->reducemode, 5, 1); // 1-outdoor temp threshold, 2-room temp threshold, 3-reduced mode has_enumupdate(telegram, hc->reducemode, 5, 1); // 1-outdoor temp threshold, 2-room temp threshold, 3-reduced mode
has_update(telegram, hc->reducetemp, 9); has_update(telegram, hc->reducetemp, 9);
has_update(telegram, hc->noreducetemp, 12); has_update(telegram, hc->noreducetemp, 12);
has_update(telegram, hc->cooltemp, 17); // see https://github.com/emsesp/EMS-ESP32/issues/590 and 2456 has_update(telegram, hc->cooltemp, 17); // see https://github.com/emsesp/EMS-ESP32/issues/590 and 2456
has_enumupdate(telegram, hc->switchProgMode, 19, 1); // 1-level, 2-absolute has_enumupdate(telegram, hc->switchProgMode, 19, 1); // 1-level, 2-absolute
has_update(telegram, hc->redThreshold, 20); has_update(telegram, hc->redThreshold, 20);
has_update(telegram, hc->boost, 23); has_update(telegram, hc->boost, 23);
@@ -4685,15 +4685,8 @@ void Thermostat::register_device_values_hc(std::shared_ptr<Thermostat::HeatingCi
MAKE_CF_CB(set_tempautotemp), MAKE_CF_CB(set_tempautotemp),
-1, -1,
30); 30);
register_device_value(tag, register_device_value(
&hc->cooltemp, tag, &hc->cooltemp, DeviceValueType::INT8, DeviceValueNumOp::DV_NUMOP_DIV2, FL_(cooltemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_cooltemp), -1, 30);
DeviceValueType::INT8,
DeviceValueNumOp::DV_NUMOP_DIV2,
FL_(cooltemp),
DeviceValueUOM::DEGREES,
MAKE_CF_CB(set_cooltemp),
-1,
30);
register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT8, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup)); register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT8, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup));
register_device_value(tag, register_device_value(tag,
&hc->switchonoptimization, &hc->switchonoptimization,