From 600ab91e2d3594a39cfa77b764d65b79f44aec0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:29:05 +0000
Subject: [PATCH 01/27] Bump vite from 5.0.12 to 5.0.13

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.12 to 5.0.13.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.0.13/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.0.13/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 433 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 69918988d..a8dd82602 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "sass": "1.70.0",
     "svgpath": "^2.6.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12",
+    "vite": "^5.0.13",
     "vite-plugin-checker": "^0.6.4",
     "vitest": "^1.2.2",
     "vue-global-type-gen": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3d27e090a..dd6e5e93b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -429,6 +429,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/aix-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/android-arm64@npm:0.19.11"
@@ -436,6 +443,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm64@npm:0.20.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/android-arm@npm:0.19.11"
@@ -443,6 +457,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm@npm:0.20.2"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/android-x64@npm:0.19.11"
@@ -450,6 +471,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-x64@npm:0.20.2"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-arm64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/darwin-arm64@npm:0.19.11"
@@ -457,6 +485,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/darwin-x64@npm:0.19.11"
@@ -464,6 +499,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-x64@npm:0.20.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-arm64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/freebsd-arm64@npm:0.19.11"
@@ -471,6 +513,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/freebsd-x64@npm:0.19.11"
@@ -478,6 +527,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-arm64@npm:0.19.11"
@@ -485,6 +541,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm64@npm:0.20.2"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-arm@npm:0.19.11"
@@ -492,6 +555,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm@npm:0.20.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ia32@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-ia32@npm:0.19.11"
@@ -499,6 +569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ia32@npm:0.20.2"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-loong64@npm:0.19.11"
@@ -506,6 +583,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-loong64@npm:0.20.2"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-mips64el@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-mips64el@npm:0.19.11"
@@ -513,6 +597,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-mips64el@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ppc64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-ppc64@npm:0.19.11"
@@ -520,6 +611,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-riscv64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-riscv64@npm:0.19.11"
@@ -527,6 +625,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-riscv64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-s390x@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-s390x@npm:0.19.11"
@@ -534,6 +639,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-s390x@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-s390x@npm:0.20.2"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/linux-x64@npm:0.19.11"
@@ -541,6 +653,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-x64@npm:0.20.2"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/netbsd-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/netbsd-x64@npm:0.19.11"
@@ -548,6 +667,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/netbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/openbsd-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/openbsd-x64@npm:0.19.11"
@@ -555,6 +681,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/openbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/sunos-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/sunos-x64@npm:0.19.11"
@@ -562,6 +695,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/sunos-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/sunos-x64@npm:0.20.2"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-arm64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/win32-arm64@npm:0.19.11"
@@ -569,6 +709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-arm64@npm:0.20.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-ia32@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/win32-ia32@npm:0.19.11"
@@ -576,6 +723,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-x64@npm:0.19.11":
   version: 0.19.11
   resolution: "@esbuild/win32-x64@npm:0.19.11"
@@ -583,6 +737,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-x64@npm:0.20.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -1052,6 +1213,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-android-arm-eabi@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.14.0"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-android-arm-eabi@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-android-arm-eabi@npm:4.2.0"
@@ -1066,6 +1234,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-android-arm64@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-android-arm64@npm:4.14.0"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-android-arm64@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-android-arm64@npm:4.2.0"
@@ -1080,6 +1255,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-darwin-arm64@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.14.0"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-darwin-arm64@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-darwin-arm64@npm:4.2.0"
@@ -1094,6 +1276,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-darwin-x64@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-darwin-x64@npm:4.14.0"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-darwin-x64@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-darwin-x64@npm:4.2.0"
@@ -1108,6 +1297,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.14.0"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0"
@@ -1122,6 +1318,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-arm64-gnu@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.14.0"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-arm64-gnu@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.2.0"
@@ -1136,6 +1339,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-arm64-musl@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.14.0"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-arm64-musl@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-arm64-musl@npm:4.2.0"
@@ -1150,6 +1360,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.14.0"
+  conditions: os=linux & cpu=ppc64le & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.14.0"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-riscv64-gnu@npm:4.9.6":
   version: 4.9.6
   resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.6"
@@ -1157,6 +1381,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-s390x-gnu@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.14.0"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.14.0"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-x64-gnu@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-x64-gnu@npm:4.2.0"
@@ -1171,6 +1409,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-x64-musl@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.14.0"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-x64-musl@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-x64-musl@npm:4.2.0"
@@ -1185,6 +1430,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-win32-arm64-msvc@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.14.0"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-win32-arm64-msvc@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.2.0"
@@ -1199,6 +1451,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-win32-ia32-msvc@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.14.0"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-win32-ia32-msvc@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.2.0"
@@ -1213,6 +1472,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-win32-x64-msvc@npm:4.14.0":
+  version: 4.14.0
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.14.0"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-win32-x64-msvc@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-win32-x64-msvc@npm:4.2.0"
@@ -2798,7 +3064,7 @@ __metadata:
     typescript: "npm:^5.3.3"
     typescript-string-enums: "npm:^1.0.0"
     url: "npm:^0.11.3"
-    vite: "npm:^5.0.12"
+    vite: "npm:^5.0.13"
     vite-plugin-checker: "npm:^0.6.4"
     vitest: "npm:^1.2.2"
     vue: "npm:^3.4.15"
@@ -4418,6 +4684,86 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.20.1":
+  version: 0.20.2
+  resolution: "esbuild@npm:0.20.2"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.20.2"
+    "@esbuild/android-arm": "npm:0.20.2"
+    "@esbuild/android-arm64": "npm:0.20.2"
+    "@esbuild/android-x64": "npm:0.20.2"
+    "@esbuild/darwin-arm64": "npm:0.20.2"
+    "@esbuild/darwin-x64": "npm:0.20.2"
+    "@esbuild/freebsd-arm64": "npm:0.20.2"
+    "@esbuild/freebsd-x64": "npm:0.20.2"
+    "@esbuild/linux-arm": "npm:0.20.2"
+    "@esbuild/linux-arm64": "npm:0.20.2"
+    "@esbuild/linux-ia32": "npm:0.20.2"
+    "@esbuild/linux-loong64": "npm:0.20.2"
+    "@esbuild/linux-mips64el": "npm:0.20.2"
+    "@esbuild/linux-ppc64": "npm:0.20.2"
+    "@esbuild/linux-riscv64": "npm:0.20.2"
+    "@esbuild/linux-s390x": "npm:0.20.2"
+    "@esbuild/linux-x64": "npm:0.20.2"
+    "@esbuild/netbsd-x64": "npm:0.20.2"
+    "@esbuild/openbsd-x64": "npm:0.20.2"
+    "@esbuild/sunos-x64": "npm:0.20.2"
+    "@esbuild/win32-arm64": "npm:0.20.2"
+    "@esbuild/win32-ia32": "npm:0.20.2"
+    "@esbuild/win32-x64": "npm:0.20.2"
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 10c0/66398f9fb2c65e456a3e649747b39af8a001e47963b25e86d9c09d2a48d61aa641b27da0ce5cad63df95ad246105e1d83e7fee0e1e22a0663def73b1c5101112
+  languageName: node
+  linkType: hard
+
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
@@ -7610,6 +7956,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:^8.4.38":
+  version: 8.4.38
+  resolution: "postcss@npm:8.4.38"
+  dependencies:
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.0.0"
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
+  languageName: node
+  linkType: hard
+
 "potpack@npm:^1.0.1":
   version: 1.0.2
   resolution: "potpack@npm:1.0.2"
@@ -8166,6 +8523,66 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^4.13.0":
+  version: 4.14.0
+  resolution: "rollup@npm:4.14.0"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.14.0"
+    "@rollup/rollup-android-arm64": "npm:4.14.0"
+    "@rollup/rollup-darwin-arm64": "npm:4.14.0"
+    "@rollup/rollup-darwin-x64": "npm:4.14.0"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.14.0"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.14.0"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.14.0"
+    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.14.0"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.14.0"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.14.0"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.14.0"
+    "@rollup/rollup-linux-x64-musl": "npm:4.14.0"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.14.0"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.14.0"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.14.0"
+    "@types/estree": "npm:1.0.5"
+    fsevents: "npm:~2.3.2"
+  dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-powerpc64le-gnu":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-s390x-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 10c0/e19a108138805d3e272f3265f73ced141b75b7a1d432a467ea24095a16832c5cae03348a3d70ea79e17113f718e12b51ccb32d799d75e2eb0df312803a253587
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^4.2.0":
   version: 4.2.0
   resolution: "rollup@npm:4.2.0"
@@ -8534,6 +8951,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+  languageName: node
+  linkType: hard
+
 "source-map@npm:^0.6.1, source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
@@ -9540,14 +9964,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.12":
-  version: 5.0.12
-  resolution: "vite@npm:5.0.12"
+"vite@npm:^5.0.13":
+  version: 5.2.8
+  resolution: "vite@npm:5.2.8"
   dependencies:
-    esbuild: "npm:^0.19.3"
+    esbuild: "npm:^0.20.1"
     fsevents: "npm:~2.3.3"
-    postcss: "npm:^8.4.32"
-    rollup: "npm:^4.2.0"
+    postcss: "npm:^8.4.38"
+    rollup: "npm:^4.13.0"
   peerDependencies:
     "@types/node": ^18.0.0 || >=20.0.0
     less: "*"
@@ -9576,7 +10000,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/c51b8e458851943c903fddde6973e720099ef8a5f364fb107cddade59c9e90f6d9ad98b61a7419cdfa0c6374236e10bff965d0c2d9e7b1790c68b874e5e7950c
+  checksum: 10c0/b5717bb00c2570c08ff6d8ed917655e79184efcafa9dd62d52eea19c5d6dfc5a708ec3de9ebc670a7165fc5d401c2bdf1563bb39e2748d8e51e1593d286a9a13
   languageName: node
   linkType: hard
 

From 1c57e38280edb20f40aad86fc787e9b04edb9896 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Thu, 4 Apr 2024 18:28:28 +0200
Subject: [PATCH 02/27] make metrics duration editable

---
 src/plugins/history/Metrics/MetricsBasic.vue  | 19 +++++++------
 .../history/components/MetricsEditor.vue      | 27 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/plugins/history/Metrics/MetricsBasic.vue b/src/plugins/history/Metrics/MetricsBasic.vue
index 3cd69e3fd..6f6510878 100644
--- a/src/plugins/history/Metrics/MetricsBasic.vue
+++ b/src/plugins/history/Metrics/MetricsBasic.vue
@@ -16,7 +16,7 @@ import { durationString, fixedNumber, shortDateString } from '@/utils/quantity';
 import { DEFAULT_METRICS_DECIMALS, DEFAULT_METRICS_EXPIRY_MS } from '../const';
 import { MetricsWidget } from './types';
 
-interface DisplayValue extends MetricValue {
+interface DisplayValue extends Partial<MetricValue> {
   name: string;
   stale: boolean;
   decimals: number;
@@ -52,20 +52,23 @@ const values = computed<DisplayValue[]>(() => {
     return [];
   }
 
-  return source.value.values.map((result): DisplayValue => {
-    const name =
-      config.value.renames[result.field] || defaultLabel(result.field);
-    const decimals =
-      config.value.decimals[result.field] ?? DEFAULT_METRICS_DECIMALS;
+  return config.value.fields.map((field): DisplayValue => {
+    const result: Partial<MetricValue> =
+      source.value.values.find((v) => v.field === field) ?? {};
+
+    const name = config.value.renames[field] || defaultLabel(field);
+    const decimals = config.value.decimals[field] ?? DEFAULT_METRICS_DECIMALS;
     const freshDuration =
-      config.value.freshDuration[result.field] ?? DEFAULT_METRICS_EXPIRY_MS;
+      config.value.freshDuration[field] ?? DEFAULT_METRICS_EXPIRY_MS;
+    const stale =
+      result?.time == null || now - result.time.getTime() > freshDuration;
 
     return {
       ...result,
       name,
       decimals,
       freshDuration,
-      stale: result.time != null && now - result.time.getTime() > freshDuration,
+      stale,
       fixedValue: fixedNumber(result.value, decimals),
     };
   });
diff --git a/src/plugins/history/components/MetricsEditor.vue b/src/plugins/history/components/MetricsEditor.vue
index 05a2eeaa9..cd6d685cd 100644
--- a/src/plugins/history/components/MetricsEditor.vue
+++ b/src/plugins/history/components/MetricsEditor.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
+import { Quantity } from 'brewblox-proto/ts';
+import { produce } from 'immer';
 import { QTreeNode } from 'quasar';
+import { computed, toRaw } from 'vue';
 import { createDialog } from '@/utils/dialog';
-import { durationString } from '@/utils/quantity';
+import { bloxQty, durationString } from '@/utils/quantity';
 import { DEFAULT_METRICS_DECIMALS, DEFAULT_METRICS_EXPIRY_MS } from '../const';
 import { MetricsConfig } from '../types';
 
@@ -15,6 +18,21 @@ const emit = defineEmits<{
   'update:config': [payload: MetricsConfig];
 }>();
 
+function updateConfig(
+  cb: (draft: MetricsConfig) => void | MetricsConfig,
+): void {
+  const updated = produce(toRaw(props.config), cb);
+  emit('update:config', updated);
+}
+
+const hideAfter = computed<Quantity>({
+  get: () => bloxQty(props.config.params.duration ?? '10m'),
+  set: (v) =>
+    updateConfig((draft) => {
+      draft.params.duration = durationString(v);
+    }),
+});
+
 function editLeaf(node: QTreeNode): void {
   createDialog({
     component: 'MetricsDisplayDialog',
@@ -46,6 +64,13 @@ function decimals(node: QTreeNode): number {
     :config="config"
     @update:config="(config) => emit('update:config', config)"
   >
+    <template #settings>
+      <DurationField
+        v-model="hideAfter"
+        label="Exclude metric values older than"
+        class="col-grow"
+      />
+    </template>
     <template #leaf="{ node }">
       <div @click="editLeaf(node)">
         {{ node.label }}

From b90e2b80cff774a65d991ff37b9048beb7dbd978 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:46:58 +0000
Subject: [PATCH 03/27] Bump tar from 6.2.0 to 6.2.1

Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dd6e5e93b..be9c599c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9298,8 +9298,8 @@ __metadata:
   linkType: hard
 
 "tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.2.0
-  resolution: "tar@npm:6.2.0"
+  version: 6.2.1
+  resolution: "tar@npm:6.2.1"
   dependencies:
     chownr: "npm:^2.0.0"
     fs-minipass: "npm:^2.0.0"
@@ -9307,7 +9307,7 @@ __metadata:
     minizlib: "npm:^2.1.1"
     mkdirp: "npm:^1.0.3"
     yallist: "npm:^4.0.0"
-  checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
+  checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537
   languageName: node
   linkType: hard
 

From 21c583a2c1a04fb35f731acf4628d293cbc36472 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Wed, 8 May 2024 18:41:24 +0200
Subject: [PATCH 04/27] implement GPIO module status changes

---
 firmware.ini                                  |   12 +-
 package.json                                  |   78 +-
 .../components/QuickstartChannelField.vue     |    2 +
 .../components/widget/GpioChannelDialog.vue   |    2 +
 .../components/widget/OneWireGpioEditor.vue   |    2 +
 .../OneWireGpioModuleWidget.vue               |   22 +-
 .../spark/features/OneWireGpioModule/index.ts |   36 +-
 yarn.lock                                     | 1862 +++++++++--------
 8 files changed, 1079 insertions(+), 937 deletions(-)

diff --git a/firmware.ini b/firmware.ini
index 88f63c5ed..ffd93a17a 100644
--- a/firmware.ini
+++ b/firmware.ini
@@ -1,8 +1,8 @@
 [FIRMWARE]
-firmware_version=3221611f
-firmware_date=2024-03-12
-firmware_sha=3221611f98c94f471802a0835a3084a3138a4771
-proto_version=041bfba2
-proto_date=2024-03-11
-proto_sha=041bfba27b044b143cfc907c152cf25509c3274a
+firmware_version=61cf28a6
+firmware_date=2024-05-08
+firmware_sha=61cf28a662895d1aa2184733fff19fc46ce1ca65
+proto_version=2e7314a6
+proto_date=2024-05-08
+proto_sha=2e7314a6a50cf459f49e725444c8e5cacd2bcd77
 system_version=3.2.0
diff --git a/package.json b/package.json
index a8dd82602..46416c4a7 100644
--- a/package.json
+++ b/package.json
@@ -33,81 +33,81 @@
     "components": "vue-global-type-gen && echo 'export {};' >> src/auto-import.d.ts"
   },
   "dependencies": {
-    "@quasar/extras": "^1.16.9",
-    "axios": "^1.6.7",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=041bfba27b044b143cfc907c152cf25509c3274a",
+    "@quasar/extras": "^1.16.11",
+    "axios": "^1.6.8",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
-    "core-js": "^3.35.1",
-    "d3": "^7.8.5",
-    "date-fns": "^3.3.1",
-    "dompurify": "^3.0.8",
-    "elkjs": "^0.9.1",
+    "core-js": "^3.37.0",
+    "d3": "^7.9.0",
+    "date-fns": "^3.6.0",
+    "dompurify": "^3.1.2",
+    "elkjs": "^0.9.3",
     "fromentries": "^1.3.2",
-    "immer": "^10.0.3",
+    "immer": "^10.1.1",
     "js-quantities": "^1.8.0",
     "lodash": "^4.17.21",
-    "marked": "^11.2.0",
-    "mqtt": "^5.3.5",
-    "nanoid": "^5.0.5",
+    "marked": "^12.0.2",
+    "mqtt": "^5.5.5",
+    "nanoid": "^5.0.7",
     "parse-duration": "^1.1.0",
     "pinia": "^2.1.7",
-    "plotly.js": "^2.29.0",
+    "plotly.js": "^2.32.0",
     "portal-vue": "^3.0.0",
     "process": "^0.11.10",
-    "quasar": "^2.14.3",
-    "simple-keyboard": "^3.7.54",
-    "simple-keyboard-layouts": "^3.3.65",
+    "quasar": "^2.16.2",
+    "simple-keyboard": "^3.7.79",
+    "simple-keyboard-layouts": "^3.3.102",
     "svg-path-properties": "^1.3.0",
     "typescript-string-enums": "^1.0.0",
     "url": "^0.11.3",
-    "vue": "^3.4.15",
-    "vue-router": "^4.2.5",
+    "vue": "^3.4.27",
+    "vue-router": "^4.3.2",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@ianvs/prettier-plugin-sort-imports": "^4.1.1",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@quasar/vite-plugin": "^1.6.0",
+    "@ianvs/prettier-plugin-sort-imports": "^4.2.1",
+    "@quasar/quasar-app-extension-testing-unit-vitest": "^1.0.0",
+    "@quasar/vite-plugin": "^1.7.0",
     "@rollup/plugin-inject": "^5.0.5",
     "@types/d3": "^7.4.3",
     "@types/dompurify": "^3.0.5",
     "@types/js-quantities": "^1.6.6",
-    "@types/lodash": "^4.14.202",
+    "@types/lodash": "^4.17.1",
     "@types/marked": "^6.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/node": "20.11.16",
-    "@types/plotly.js": "^2.29.0",
+    "@types/node": "20.12.11",
+    "@types/plotly.js": "^2.29.3",
     "@types/pluralize": "^0.0.33",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.0.3",
-    "@vitest/coverage-v8": "^1.2.2",
-    "@vue/compiler-sfc": "^3.4.15",
-    "@vue/eslint-config-typescript": "^12.0.0",
-    "@vue/test-utils": "^2.4.4",
-    "autoprefixer": "^10.4.17",
-    "eslint": "^8.56.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitest/coverage-v8": "^1.6.0",
+    "@vue/compiler-sfc": "^3.4.27",
+    "@vue/eslint-config-typescript": "^13.0.0",
+    "@vue/test-utils": "^2.4.6",
+    "autoprefixer": "^10.4.19",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-quasar": "^1.1.0",
-    "eslint-plugin-vue": "^9.19.2",
-    "jsdom": "^23.2.0",
+    "eslint-plugin-vue": "^9.25.0",
+    "jsdom": "^24.0.0",
     "minimist": "^1.2.8",
     "prettier": "^3.2.5",
-    "rollup": "^4.9.6",
+    "rollup": "^4.17.2",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "1.70.0",
+    "sass": "1.77.0",
     "svgpath": "^2.6.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.0.13",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.11",
     "vite-plugin-checker": "^0.6.4",
-    "vitest": "^1.2.2",
+    "vitest": "^1.6.0",
     "vue-global-type-gen": "^1.1.0",
-    "vue-tsc": "^1.8.27"
+    "vue-tsc": "^2.0.16"
   },
   "engines": {
     "node": ">= 18"
diff --git a/src/plugins/quickstart/components/QuickstartChannelField.vue b/src/plugins/quickstart/components/QuickstartChannelField.vue
index 9889781c0..83d19b16c 100644
--- a/src/plugins/quickstart/components/QuickstartChannelField.vue
+++ b/src/plugins/quickstart/components/QuickstartChannelField.vue
@@ -4,6 +4,7 @@ import {
   BlockType,
   ChannelCapabilities,
   GpioDeviceType,
+  GpioErrorFlags,
   GpioPins,
   IoArrayInterfaceBlock,
   IoChannel,
@@ -54,6 +55,7 @@ const local = computed<IoChannelAddress | null>({
           pinsMask: GpioPins.NONE,
           capabilities: ChannelCapabilities.CHAN_SUPPORTS_DIGITAL_OUTPUT,
           claimedBy: bloxLink(null),
+          errorFlags: GpioErrorFlags.NONE,
         });
         emit('update:modelValue', { ...addr, channelId });
       }
diff --git a/src/plugins/spark/components/widget/GpioChannelDialog.vue b/src/plugins/spark/components/widget/GpioChannelDialog.vue
index 1e78e0cd4..ff4fc54d6 100644
--- a/src/plugins/spark/components/widget/GpioChannelDialog.vue
+++ b/src/plugins/spark/components/widget/GpioChannelDialog.vue
@@ -2,6 +2,7 @@
 import {
   ChannelCapabilities,
   GpioDeviceType,
+  GpioErrorFlags,
   GpioModuleChannel,
   GpioPins,
 } from 'brewblox-proto/ts';
@@ -241,6 +242,7 @@ function save(): void {
     width,
     capabilities,
     claimedBy: bloxLink(null),
+    errorFlags: GpioErrorFlags.NONE,
   };
 
   onDialogOK(channel);
diff --git a/src/plugins/spark/components/widget/OneWireGpioEditor.vue b/src/plugins/spark/components/widget/OneWireGpioEditor.vue
index 04d33b65f..78ac18022 100644
--- a/src/plugins/spark/components/widget/OneWireGpioEditor.vue
+++ b/src/plugins/spark/components/widget/OneWireGpioEditor.vue
@@ -2,6 +2,7 @@
 import {
   ChannelCapabilities,
   GpioDeviceType,
+  GpioErrorFlags,
   GpioModuleChannel,
   GpioPins,
 } from 'brewblox-proto/ts';
@@ -208,6 +209,7 @@ function addChannel(): void {
     width: 2,
     capabilities: ChannelCapabilities.CHAN_SUPPORTS_DIGITAL_OUTPUT,
     claimedBy: bloxLink(null),
+    errorFlags: GpioErrorFlags.NONE,
   };
   modifyChannel(channel);
 }
diff --git a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue b/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
index 5f48b0095..27524f969 100644
--- a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
+++ b/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {
+  GpioErrorFlags,
   GpioModuleChannel,
-  GpioModuleStatus,
   GpioPins,
   OneWireGpioModuleBlock,
 } from 'brewblox-proto/ts';
@@ -56,32 +56,32 @@ const inputPins = computed<GpioPins>(() =>
 
 const errors = computed<string[]>(() => {
   const values: string[] = [];
-  const { moduleStatus, overCurrent, openLoad } = block.value.data;
+  const { moduleStatus, overCurrent, openLoad } = block.value.data.status;
   if (overCurrent !== GpioPins.NONE) {
     values.push(
       'ERROR: Overcurrent on pin ' + listedPins(overCurrent).toString(),
     );
-  } else if (moduleStatus & GpioModuleStatus.OVERCURRENT) {
+  } else if (moduleStatus & GpioErrorFlags.OVERCURRENT) {
     values.push('ERROR: Overcurrent');
   }
-  if (moduleStatus & GpioModuleStatus.OVERVOLTAGE) {
+  if (moduleStatus & GpioErrorFlags.OVERVOLTAGE) {
     values.push('ERROR: Overvoltage');
   }
-  if (moduleStatus & GpioModuleStatus.UNDERVOLTAGE_LOCKOUT) {
+  if (moduleStatus & GpioErrorFlags.UNDERVOLTAGE_LOCKOUT) {
     values.push('ERROR: Undervoltage');
   }
-  if (moduleStatus & GpioModuleStatus.OVERTEMPERATURE_SHUTDOWN) {
+  if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_SHUTDOWN) {
     values.push('ERROR: Overtemperature');
-  } else if (moduleStatus & GpioModuleStatus.OVERTEMPERATURE_WARNING) {
+  } else if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_WARNING) {
     values.push('WARNING: Overtemperature');
   }
-  if (moduleStatus & GpioModuleStatus.POWER_ON_RESET) {
+  if (moduleStatus & GpioErrorFlags.POWER_ON_RESET) {
     values.push('ERROR: Not yet initialized (power on reset)');
   }
-  if (moduleStatus & GpioModuleStatus.SPI_ERROR) {
+  if (moduleStatus & GpioErrorFlags.SPI_ERROR) {
     values.push('ERROR: SPI error');
   }
-  if (moduleStatus & GpioModuleStatus.OPEN_LOAD) {
+  if (moduleStatus & GpioErrorFlags.OPEN_LOAD) {
     const relevantPins = ~inputPins.value & openLoad;
     if (relevantPins != GpioPins.NONE) {
       values.push(
@@ -122,7 +122,7 @@ const errors = computed<string[]>(() => {
 
       <OneWireGpioEditor
         v-model:channels="channels"
-        :error-pins="block.data.overCurrent"
+        :error-pins="block.data.status.overCurrent"
       />
 
       <template v-if="context.mode === 'Full'">
diff --git a/src/plugins/spark/features/OneWireGpioModule/index.ts b/src/plugins/spark/features/OneWireGpioModule/index.ts
index 0b75f9a90..70fa0e103 100644
--- a/src/plugins/spark/features/OneWireGpioModule/index.ts
+++ b/src/plugins/spark/features/OneWireGpioModule/index.ts
@@ -1,6 +1,6 @@
 import {
   BlockType,
-  GpioModuleStatus,
+  GpioErrorFlags,
   GpioPins,
   OneWireGpioModuleBlock,
 } from 'brewblox-proto/ts';
@@ -28,25 +28,27 @@ const plugin: Plugin = {
         channels: [],
         modulePosition: 0,
         useExternalPower: false,
-        moduleStatus: GpioModuleStatus.NONE,
-        pullUpDesired: GpioPins.NONE,
-        pullUpStatus: GpioPins.NONE,
-        pullUpWhenActive: GpioPins.NONE,
-        pullUpWhenInactive: GpioPins.NONE,
-        pullDownDesired: GpioPins.NONE,
-        pullDownStatus: GpioPins.NONE,
-        pullDownWhenActive: GpioPins.NONE,
-        pullDownWhenInactive: GpioPins.NONE,
-        overCurrent: GpioPins.NONE,
-        openLoad: GpioPins.NONE,
-        faultsHistory5m: GpioModuleStatus.NONE,
-        faultsHistory60m: GpioModuleStatus.NONE,
+        status: {
+          moduleStatus: GpioErrorFlags.NONE,
+          pullUpDesired: GpioPins.NONE,
+          pullUpStatus: GpioPins.NONE,
+          pullUpWhenActive: GpioPins.NONE,
+          pullUpWhenInactive: GpioPins.NONE,
+          pullDownDesired: GpioPins.NONE,
+          pullDownStatus: GpioPins.NONE,
+          pullDownWhenActive: GpioPins.NONE,
+          pullDownWhenInactive: GpioPins.NONE,
+          overCurrent: GpioPins.NONE,
+          openLoad: GpioPins.NONE,
+          faultsHistory5m: GpioErrorFlags.NONE,
+          faultsHistory60m: GpioErrorFlags.NONE,
+        },
       }),
       analyze: (block: OneWireGpioModuleBlock) => {
-        const { moduleStatus } = block.data;
+        const { moduleStatus } = block.data.status;
         if (
-          moduleStatus != GpioModuleStatus.NONE &&
-          moduleStatus != GpioModuleStatus.OPEN_LOAD
+          moduleStatus != GpioErrorFlags.NONE &&
+          moduleStatus != GpioErrorFlags.OPEN_LOAD
         ) {
           return 'Invalid';
         }
diff --git a/yarn.lock b/yarn.lock
index be9c599c0..eb14e8993 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,17 +22,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asamuzakjp/dom-selector@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@asamuzakjp/dom-selector@npm:2.0.1"
-  dependencies:
-    bidi-js: "npm:^1.0.3"
-    css-tree: "npm:^2.3.1"
-    is-potential-custom-element-name: "npm:^1.0.1"
-  checksum: 10c0/232895f16f2f9dfc637764df2529084d16e1c122057766a79b16e1d40808e09fffae28c0f0cc8376f8a1564a85dba9d4b2f140a9a0b65f4f95c960192b797037
-  languageName: node
-  linkType: hard
-
 "@babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13":
   version: 7.22.13
   resolution: "@babel/code-frame@npm:7.22.13"
@@ -43,58 +32,68 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.9":
-  version: 7.23.3
-  resolution: "@babel/compat-data@npm:7.23.3"
-  checksum: 10c0/c6af331753c34ee8a5678bc94404320826cb56b1dda3efc1311ec8fb0774e78225132f3c1acc988440ace667f14a838e297a822692b95758aa63da406e1f97a1
+"@babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/code-frame@npm:7.24.2"
+  dependencies:
+    "@babel/highlight": "npm:^7.24.2"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.21.8":
-  version: 7.23.3
-  resolution: "@babel/core@npm:7.23.3"
+"@babel/compat-data@npm:^7.23.5":
+  version: 7.24.4
+  resolution: "@babel/compat-data@npm:7.24.4"
+  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.24.0":
+  version: 7.24.5
+  resolution: "@babel/core@npm:7.24.5"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/generator": "npm:^7.23.3"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.2"
-    "@babel/parser": "npm:^7.23.3"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.3"
-    "@babel/types": "npm:^7.23.3"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-module-transforms": "npm:^7.24.5"
+    "@babel/helpers": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/08d43b749e24052d12713a7fb1f0c0d1275d4fb056d00846faeb8da79ecf6d0ba91a11b6afec407b8b0f9388d00e2c2f485f282bef0ade4d6d0a17de191a4287
+  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.21.5, @babel/generator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/generator@npm:7.23.3"
+"@babel/generator@npm:^7.23.6, @babel/generator@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/generator@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.23.3"
-    "@jridgewell/gen-mapping": "npm:^0.3.2"
-    "@jridgewell/trace-mapping": "npm:^0.3.17"
+    "@babel/types": "npm:^7.24.5"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/d5fff1417eecfada040e01a7c77a4968e81c436aeb35815ce85b4e80cd01e731423613d61033044a6cb5563bb8449ee260e3379b63eb50b38ec0a9ea9c00abfd
+  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
+"@babel/helper-compilation-targets@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
-    "@babel/compat-data": "npm:^7.22.9"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    browserslist: "npm:^4.21.9"
+    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/45b9286861296e890f674a3abb199efea14a962a27d9b8adeb44970a9fd5c54e73a9e342e8414d2851cf4f98d5994537352fbce7b05ade32e9849bbd327f9ff1
+  checksum: 10c0/ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
   languageName: node
   linkType: hard
 
@@ -124,45 +123,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-module-imports@npm:7.22.15"
+"@babel/helper-module-imports@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/helper-module-imports@npm:7.24.3"
   dependencies:
-    "@babel/types": "npm:^7.22.15"
-  checksum: 10c0/4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+"@babel/helper-module-transforms@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-module-transforms@npm:7.24.5"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-simple-access": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-simple-access": "npm:^7.24.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946
+  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-simple-access@npm:7.22.5"
+"@babel/helper-simple-access@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-simple-access@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.22.6":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+"@babel/helper-split-export-declaration@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
   languageName: node
   linkType: hard
 
@@ -180,6 +179,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-string-parser@npm:7.24.1"
+  checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-validator-identifier@npm:7.22.20"
@@ -187,21 +193,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-validator-option@npm:7.22.15"
-  checksum: 10c0/e9661bf80ba18e2dd978217b350fb07298e57ac417f4f1ab9fa011505e20e4857f2c3b4b538473516a9dc03af5ce3a831e5ed973311c28326f4c330b6be981c2
+"@babel/helper-validator-identifier@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
+  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-option@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helper-validator-option@npm:7.23.5"
+  checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/helpers@npm:7.23.2"
+"@babel/helpers@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helpers@npm:7.24.5"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.2"
-    "@babel/types": "npm:^7.23.0"
-  checksum: 10c0/3a6a939c5277a27486e7c626812f0643b35d1c053ac2eb66911f5ae6c0a4e4bcdd40750eba36b766b0ee8a753484287f50ae56232a5f8f2947116723e44b9e35
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
   languageName: node
   linkType: hard
 
@@ -216,7 +229,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.3":
+"@babel/highlight@npm:^7.24.2":
+  version: 7.24.5
+  resolution: "@babel/highlight@npm:7.24.5"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    chalk: "npm:^2.4.2"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/e98047d3ad24608bfa596d000c861a2cc875af897427f2833b91a4e0d4cead07301a7ec15fa26093dcd61e036e2eed2db338ae54f93016fe0dc785fadc4159db
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.22.15":
   version: 7.23.3
   resolution: "@babel/parser@npm:7.23.3"
   bin:
@@ -225,21 +250,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/parser@npm:7.23.0"
+"@babel/parser@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/parser@npm:7.23.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/ab4ea9360ed4ba3c728c5a9bf33035103ebde20a7e943c4ae1d42becb02a313d731d12a93c795c5a19777031e4022e64b92a52262eda902522a1a18649826283
+  checksum: 10c0/6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/parser@npm:7.23.6"
+"@babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/parser@npm:7.24.5"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
+  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
   languageName: node
   linkType: hard
 
@@ -252,6 +277,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/runtime@npm:7.24.5"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346
+  languageName: node
+  linkType: hard
+
 "@babel/template@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/template@npm:7.22.15"
@@ -263,25 +297,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/traverse@npm:7.23.3"
+"@babel/template@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/generator": "npm:^7.23.3"
+    "@babel/code-frame": "npm:^7.23.5"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:^7.24.0, @babel/traverse@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/traverse@npm:7.24.5"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.3"
-    "@babel/types": "npm:^7.23.3"
-    debug: "npm:^4.1.0"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+    debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/3c2784f4765185126d64fd5eebce0413b7aee6d54f779998594a343a7f973a9693a441ba27533df84e7ab7ce22f1239c6837f35e903132a1b25f7fc7a67bc30f
+  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.21.5, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3":
+"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0":
   version: 7.23.3
   resolution: "@babel/types@npm:7.23.3"
   dependencies:
@@ -303,6 +348,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/types@npm:7.24.5"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.24.1"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.8.3":
   version: 7.23.0
   resolution: "@babel/types@npm:7.23.0"
@@ -755,7 +811,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
   checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
@@ -779,21 +835,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 10c0/60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.1"
-    debug: "npm:^4.1.1"
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
     minimatch: "npm:^3.0.5"
-  checksum: 10c0/d76ca802d853366094d0e98ff0d0994117fc8eff96649cd357b15e469e428228f597cd2e929d54ab089051684949955f16ee905bb19f7b2f0446fb377157be7a
+  checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
   languageName: node
   linkType: hard
 
@@ -804,30 +860,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 10c0/9dba24e59fdb4041829d92b693aacb778add3b6f612aaa9c0774f3b650c11a378cc64f042a59da85c11dae33df456580a3c36837b953541aed6ff94294f97fac
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "@humanwhocodes/object-schema@npm:2.0.3"
+  checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c
   languageName: node
   linkType: hard
 
-"@ianvs/prettier-plugin-sort-imports@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@ianvs/prettier-plugin-sort-imports@npm:4.1.1"
+"@ianvs/prettier-plugin-sort-imports@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@ianvs/prettier-plugin-sort-imports@npm:4.2.1"
   dependencies:
-    "@babel/core": "npm:^7.21.8"
-    "@babel/generator": "npm:^7.21.5"
-    "@babel/parser": "npm:^7.21.8"
-    "@babel/traverse": "npm:^7.21.5"
-    "@babel/types": "npm:^7.21.5"
+    "@babel/core": "npm:^7.24.0"
+    "@babel/generator": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     semver: "npm:^7.5.2"
   peerDependencies:
-    "@vue/compiler-sfc": ">=3.0.0"
+    "@vue/compiler-sfc": 2.7.x || 3.x
     prettier: 2 || 3
   peerDependenciesMeta:
     "@vue/compiler-sfc":
       optional: true
-  checksum: 10c0/3e630d2d8d0ef6ba5f19d5a8edd4053e154656e5c54dec7d7dc9c012bf389ddfce3b9c038a46634b66be21679dbfa3048e0df0fa5ba6fb0462fdff625a5247ec
+  checksum: 10c0/76e5c79a72ca35e03f52059d039a037b2a29224582aca6590ba08a17d85e5143673bee301d3a9cc2e0257570801e6d0ec30ffd01e1f5f0d973a986c6c359f9a8
   languageName: node
   linkType: hard
 
@@ -872,6 +928,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+  dependencies:
+    "@jridgewell/set-array": "npm:^1.2.1"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
+  languageName: node
+  linkType: hard
+
 "@jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.1
   resolution: "@jridgewell/resolve-uri@npm:3.1.1"
@@ -886,6 +953,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
+  languageName: node
+  linkType: hard
+
 "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
@@ -893,7 +967,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+  dependencies:
+    "@jridgewell/resolve-uri": "npm:^3.1.0"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.14"
+  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.9":
   version: 0.3.20
   resolution: "@jridgewell/trace-mapping@npm:0.3.20"
   dependencies:
@@ -1093,7 +1177,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@plotly/mapbox-gl@npm:v1.13.4":
+"@plotly/mapbox-gl@npm:1.13.4":
   version: 1.13.4
   resolution: "@plotly/mapbox-gl@npm:1.13.4"
   dependencies:
@@ -1141,43 +1225,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@quasar/extras@npm:^1.16.9":
-  version: 1.16.9
-  resolution: "@quasar/extras@npm:1.16.9"
-  checksum: 10c0/4feaa542c86d224430b0173be190fe259ec06fc2373d092a531c12bf8672b4b77253e479310bdb69158f1a38fd85f838f177a51d4c970aa8ad5b192182fdb743
+"@quasar/extras@npm:^1.16.11":
+  version: 1.16.11
+  resolution: "@quasar/extras@npm:1.16.11"
+  checksum: 10c0/cc61379a80d701573dc22f1588d91ee10202b3951916cc8c8c560680409017bb6eaea07133039fc51e0ce2199d67bf60078dd7ad7fcfee0b5fe28f0a7c650d21
   languageName: node
   linkType: hard
 
-"@quasar/quasar-app-extension-testing-unit-vitest@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@quasar/quasar-app-extension-testing-unit-vitest@npm:0.4.0"
+"@quasar/quasar-app-extension-testing-unit-vitest@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@quasar/quasar-app-extension-testing-unit-vitest@npm:1.0.0"
   dependencies:
-    happy-dom: "npm:^11.0.6"
+    happy-dom: "npm:^13.6.2"
     lodash-es: "npm:^4.17.21"
     vite-jsconfig-paths: "npm:^2.0.1"
-    vite-tsconfig-paths: "npm:^4.2.1"
+    vite-tsconfig-paths: "npm:^4.3.1"
   peerDependencies:
-    "@vitest/ui": ^0.34.0
-    "@vue/test-utils": ^2.4.1
+    "@vitest/ui": ^1.1.0
+    "@vue/test-utils": ^2.4.3
     quasar: ^2.12.7
-    vitest: ^0.34.0
+    vitest: ^1.1.0
     vue: ^3.3.4
   peerDependenciesMeta:
     "@vitest/ui":
       optional: true
-  checksum: 10c0/b2ffd5ab6ebc459f90f2d0ea0a88af53393e1326b0c42cc3021abdc715eed014a35c7059bf178b2835c908bc55892e5d3413240d2a906307240d9bac76fa7702
+  checksum: 10c0/00cc6cfb139f813a94cbc08539a782c829c08eed829002b66f2dfc4ca61b7e25c1ea396dc09526eda940ba72e8a48cc9cb3328dd8b2f68848da60f27bd9f0c81
   languageName: node
   linkType: hard
 
-"@quasar/vite-plugin@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "@quasar/vite-plugin@npm:1.6.0"
+"@quasar/vite-plugin@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "@quasar/vite-plugin@npm:1.7.0"
   peerDependencies:
-    "@vitejs/plugin-vue": ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-beta.0
-    quasar: ^2.8.0
-    vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-beta.0
+    "@vitejs/plugin-vue": ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
+    quasar: ^2.16.0
+    vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
     vue: ^3.0.0
-  checksum: 10c0/46283dd9baa368a0956869aadc7c23ae9e0ec7fc753f3e4dde397e094f2e6c70f83ef37a89a7390dd5b761ba62cdd08410417aa46dad01ea287f0f0741500374
+  checksum: 10c0/d04da314b16daeccebf28b3c45ab1773ddf5a9edc0fc1f08b0dfd99fd07b5d847df0e0e14b2f6986df9d25177c332316566d695de95c77a8fc2a15618a348e36
   languageName: node
   linkType: hard
 
@@ -1220,16 +1304,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.2.0"
+"@rollup/rollup-android-arm-eabi@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.17.2"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.6"
+"@rollup/rollup-android-arm-eabi@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.2.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -1241,16 +1325,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-android-arm64@npm:4.2.0"
+"@rollup/rollup-android-arm64@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-android-arm64@npm:4.17.2"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-android-arm64@npm:4.9.6"
+"@rollup/rollup-android-arm64@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-android-arm64@npm:4.2.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -1262,16 +1346,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.2.0"
+"@rollup/rollup-darwin-arm64@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.17.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.9.6"
+"@rollup/rollup-darwin-arm64@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.2.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -1283,16 +1367,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-darwin-x64@npm:4.2.0"
+"@rollup/rollup-darwin-x64@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-darwin-x64@npm:4.17.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-darwin-x64@npm:4.9.6"
+"@rollup/rollup-darwin-x64@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-darwin-x64@npm:4.2.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -1304,6 +1388,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.17.2"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0":
   version: 4.2.0
   resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0"
@@ -1311,10 +1402,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.6"
-  conditions: os=linux & cpu=arm
+"@rollup/rollup-linux-arm-musleabihf@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.17.2"
+  conditions: os=linux & cpu=arm & libc=musl
   languageName: node
   linkType: hard
 
@@ -1325,16 +1416,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.2.0"
+"@rollup/rollup-linux-arm64-gnu@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.17.2"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.6"
+"@rollup/rollup-linux-arm64-gnu@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.2.0"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
@@ -1346,16 +1437,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.2.0"
+"@rollup/rollup-linux-arm64-musl@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.17.2"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.6"
+"@rollup/rollup-linux-arm64-musl@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.2.0"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
@@ -1367,6 +1458,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.17.2"
+  conditions: os=linux & cpu=ppc64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-riscv64-gnu@npm:4.14.0":
   version: 4.14.0
   resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.14.0"
@@ -1374,9 +1472,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.6"
+"@rollup/rollup-linux-riscv64-gnu@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.17.2"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
@@ -1388,6 +1486,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/rollup-linux-s390x-gnu@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.17.2"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-linux-x64-gnu@npm:4.14.0":
   version: 4.14.0
   resolution: "@rollup/rollup-linux-x64-gnu@npm:4.14.0"
@@ -1395,16 +1500,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.2.0"
+"@rollup/rollup-linux-x64-gnu@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.17.2"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.6"
+"@rollup/rollup-linux-x64-gnu@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.2.0"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
@@ -1416,16 +1521,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.2.0"
+"@rollup/rollup-linux-x64-musl@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.17.2"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.6"
+"@rollup/rollup-linux-x64-musl@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.2.0"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
@@ -1437,16 +1542,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.2.0"
+"@rollup/rollup-win32-arm64-msvc@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.17.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.6"
+"@rollup/rollup-win32-arm64-msvc@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.2.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -1458,16 +1563,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.2.0"
+"@rollup/rollup-win32-ia32-msvc@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.17.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.6"
+"@rollup/rollup-win32-ia32-msvc@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.2.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -1479,16 +1584,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.2.0":
-  version: 4.2.0
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.2.0"
+"@rollup/rollup-win32-x64-msvc@npm:4.17.2":
+  version: 4.17.2
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.17.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.9.6":
-  version: 4.9.6
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.6"
+"@rollup/rollup-win32-x64-msvc@npm:4.2.0":
+  version: 4.2.0
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.2.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -1848,13 +1953,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/istanbul-lib-coverage@npm:^2.0.1":
-  version: 2.0.5
-  resolution: "@types/istanbul-lib-coverage@npm:2.0.5"
-  checksum: 10c0/e15cfc01a7ac60062f771314c959011bae7de7ceaef8e294f13427a11f21741cbfac98ad8cd9ecbf0e3d72ab7ddc327bacb3fab32c6b26ab19dbbbc1a69a9d3b
-  languageName: node
-  linkType: hard
-
 "@types/js-quantities@npm:^1.6.6":
   version: 1.6.6
   resolution: "@types/js-quantities@npm:1.6.6"
@@ -1869,6 +1967,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/json-schema@npm:^7.0.15":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
+  languageName: node
+  linkType: hard
+
 "@types/json5@npm:^0.0.29":
   version: 0.0.29
   resolution: "@types/json5@npm:0.0.29"
@@ -1876,10 +1981,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:^4.14.202":
-  version: 4.14.202
-  resolution: "@types/lodash@npm:4.14.202"
-  checksum: 10c0/6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
+"@types/lodash@npm:^4.17.1":
+  version: 4.17.1
+  resolution: "@types/lodash@npm:4.17.1"
+  checksum: 10c0/af2ad8a3c8d7deb170a7ec6e18afc5ae8980576e5f7fe798d8a95a1df7222c15bdf967a25a35879f575a3b64743de00145710ee461a0051e055e94e4fe253f45
   languageName: node
   linkType: hard
 
@@ -1908,19 +2013,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:20.11.16":
-  version: 20.11.16
-  resolution: "@types/node@npm:20.11.16"
+"@types/node@npm:20.12.11":
+  version: 20.12.11
+  resolution: "@types/node@npm:20.12.11"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: 10c0/4886b90278e9c877a84efd3edd4667cd990e032d77268d2a798b99ebc1901ea336fa7dfbe9eaf4ad6ad1da9ce2ec31baf300038a3905838692362eb19904ebde
+  checksum: 10c0/efaa7b08c50ba6e6982ac7d531ba08d5935539ba76e954807df1ff9382a319ead7e003ccaca5ad7cf33ecf53f212507f7c1f2794bd2ff52df6365fef21f6e1fb
   languageName: node
   linkType: hard
 
-"@types/plotly.js@npm:^2.29.0":
-  version: 2.29.0
-  resolution: "@types/plotly.js@npm:2.29.0"
-  checksum: 10c0/dd74274f9fcd5730a64d856ef922b4fc8e749459a5f9ffc76ab85c5271d28d311d4e444c577402fa8f84fb642211f9a0646b24a51ba84de5cdfda1af619308d1
+"@types/plotly.js@npm:^2.29.3":
+  version: 2.29.3
+  resolution: "@types/plotly.js@npm:2.29.3"
+  checksum: 10c0/72965bd35914397e11500c5d5297ec04d0b2558b42a4e2cae6ec5d548b9b24576530c69c2b5fc7c06b1fb0a7e7a2c15119e3966bf430644f682334125c6948c8
   languageName: node
   linkType: hard
 
@@ -1948,6 +2053,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/semver@npm:^7.5.8":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
+  languageName: node
+  linkType: hard
+
 "@types/trusted-types@npm:*":
   version: 2.0.5
   resolution: "@types/trusted-types@npm:2.0.5"
@@ -1989,28 +2101,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^6.7.0":
-  version: 6.9.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.9.1"
+"@typescript-eslint/eslint-plugin@npm:^7.1.1":
+  version: 7.8.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.8.0"
   dependencies:
-    "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.9.1"
-    "@typescript-eslint/type-utils": "npm:6.9.1"
-    "@typescript-eslint/utils": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
+    "@eslint-community/regexpp": "npm:^4.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/type-utils": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.2.4"
+    ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
-    eslint: ^7.0.0 || ^8.0.0
+    "@typescript-eslint/parser": ^7.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/f2455fe74f8c90d82df97801ee5e17bb3d81b1a59d23eedc7cad95b6eed30180339107bef0460578d5cc587033bb388fd112bae48b6b85f504fe4521f365ac69
+  checksum: 10c0/37ca22620d1834ff0baa28fa4b8fd92039a3903cb95748353de32d56bae2a81ce50d1bbaed27487eebc884e0a0f9387fcb0f1647593e4e6df5111ef674afa9f0
   languageName: node
   linkType: hard
 
@@ -2032,21 +2144,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.7.0":
-  version: 6.9.1
-  resolution: "@typescript-eslint/parser@npm:6.9.1"
+"@typescript-eslint/parser@npm:^7.1.1":
+  version: 7.8.0
+  resolution: "@typescript-eslint/parser@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.9.1"
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/typescript-estree": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a6896655b2005a55e15dd3bb8b8239e1cb1bb0379037f6af2409e910c426cf9cda5490d45cd1857a3ca7fe2727acc8250d8196770147a4dc274e4c700ead9d9c
+  checksum: 10c0/0dd994c1b31b810c25e1b755b8d352debb7bf21a31f9a91acaec34acf4e471320bcceaa67cf64c110c0b8f5fac10a037dbabac6ec423e17adf037e59a7bce9c1
   languageName: node
   linkType: hard
 
@@ -2060,13 +2172,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/scope-manager@npm:6.9.1"
+"@typescript-eslint/scope-manager@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
-  checksum: 10c0/53fa7c3813d22b119e464f9b6d7d23407dfe103ee8ad2dcacf9ad6d656fda20e2bb3346df39e62b0e6b6ce71572ce5838071c5d2cca6daa4e0ce117ff22eafe5
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
+  checksum: 10c0/c253b98e96d4bf0375f473ca2c4d081726f1fd926cdfa65ee14c9ee99cca8eddb763b2d238ac365daa7246bef21b0af38180d04e56e9df7443c0e6f8474d097c
   languageName: node
   linkType: hard
 
@@ -2087,20 +2199,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/type-utils@npm:6.9.1"
+"@typescript-eslint/type-utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/type-utils@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.9.1"
-    "@typescript-eslint/utils": "npm:6.9.1"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.0.1"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/9373c32c9bce736527e01baabc1dbee4b7f43774ebdcbbe20ee9cf61d1b01e7faab3d5df1ebbe75241308c52eabbc9500dd7826701f95caee4054ca659420304
+  checksum: 10c0/00f6315626b64f7dbc1f7fba6f365321bb8d34141ed77545b2a07970e59a81dbdf768c1e024225ea00953750d74409ddd8a16782fc4a39261e507c04192dacab
   languageName: node
   linkType: hard
 
@@ -2111,10 +2223,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/types@npm:6.9.1"
-  checksum: 10c0/4ba21ba18e256da210a4caedfbc5d4927cf8cb4f2c4d74f8ccc865576f3659b974e79119d3c94db2b68a4cec9cd687e43971d355450b7082d6d1736a5dd6db85
+"@typescript-eslint/types@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/types@npm:7.8.0"
+  checksum: 10c0/b2fdbfc21957bfa46f7d8809b607ad8c8b67c51821d899064d09392edc12f28b2318a044f0cd5d523d782e84e8f0558778877944964cf38e139f88790cf9d466
   languageName: node
   linkType: hard
 
@@ -2137,21 +2249,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/typescript-estree@npm:6.9.1"
+"@typescript-eslint/typescript-estree@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/850b1865a90107879186c3f2969968a2c08fc6fcc56d146483c297cf5be376e33d505ac81533ba8e8103ca4d2edfea7d21b178de9e52217f7ee2922f51a445fa
+  checksum: 10c0/1690b62679685073dcb0f62499f0b52b445b37ae6e12d02aa4acbafe3fb023cf999b01f714b6282e88f84fd934fe3e2eefb21a64455d19c348d22bbc68ca8e47
   languageName: node
   linkType: hard
 
@@ -2172,20 +2285,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/utils@npm:6.9.1"
+"@typescript-eslint/utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/utils@npm:7.8.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.12"
-    "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.9.1"
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/typescript-estree": "npm:6.9.1"
-    semver: "npm:^7.5.4"
+    "@types/json-schema": "npm:^7.0.15"
+    "@types/semver": "npm:^7.5.8"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    semver: "npm:^7.6.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: 10c0/3d329d54c3d155ed29e2b456a602aef76bda1b88dfcf847145849362e4ddefabe5c95de236de750d08d5da9bedcfb2131bdfd784ce4eb87cf82728f0b6662033
+    eslint: ^8.56.0
+  checksum: 10c0/31fb58388d15b082eb7bd5bce889cc11617aa1131dfc6950471541b3df64c82d1c052e2cccc230ca4ae80456d4f63a3e5dccb79899a8f3211ce36c089b7d7640
   languageName: node
   linkType: hard
 
@@ -2199,13 +2312,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/visitor-keys@npm:6.9.1"
+"@typescript-eslint/visitor-keys@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/ac5f375a177add30489e5b63cafa8d82a196b33624bb36418422ebe0d7973b3ba550dc7e0dda36ea75a94cf9b200b4fb5f5fb4d77c027fd801201c1a269d343b
+    "@typescript-eslint/types": "npm:7.8.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10c0/5892fb5d9c58efaf89adb225f7dbbb77f9363961f2ff420b6b130bdd102dddd7aa8a16c46a5a71c19889d27b781e966119a89270555ea2cb5653a04d8994123d
   languageName: node
   linkType: hard
 
@@ -2216,190 +2329,168 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "@vitejs/plugin-vue@npm:5.0.3"
+"@vitejs/plugin-vue@npm:^5.0.4":
+  version: 5.0.4
+  resolution: "@vitejs/plugin-vue@npm:5.0.4"
   peerDependencies:
     vite: ^5.0.0
     vue: ^3.2.25
-  checksum: 10c0/b03f9bd0bb5f75f133ec25599802c4563f85860fb5cd2774372988ae18727150d7aa2f7de97aa3f2100e362013942a95cbed5b53a0c0e31b84e7c85b6944a65b
+  checksum: 10c0/2e65900ff41037a013ef40351aa2fb68ee1963da461795b4e3d01fc4a0226c65e9ca4bc39941dc163f883773bcd80744ee0f1f96ecc2f46fae1a4cd71c741308
   languageName: node
   linkType: hard
 
-"@vitest/coverage-v8@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/coverage-v8@npm:1.2.2"
+"@vitest/coverage-v8@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/coverage-v8@npm:1.6.0"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.1"
     "@bcoe/v8-coverage": "npm:^0.2.3"
     debug: "npm:^4.3.4"
     istanbul-lib-coverage: "npm:^3.2.2"
     istanbul-lib-report: "npm:^3.0.1"
-    istanbul-lib-source-maps: "npm:^4.0.1"
+    istanbul-lib-source-maps: "npm:^5.0.4"
     istanbul-reports: "npm:^3.1.6"
     magic-string: "npm:^0.30.5"
     magicast: "npm:^0.3.3"
     picocolors: "npm:^1.0.0"
     std-env: "npm:^3.5.0"
+    strip-literal: "npm:^2.0.0"
     test-exclude: "npm:^6.0.0"
-    v8-to-istanbul: "npm:^9.2.0"
   peerDependencies:
-    vitest: ^1.0.0
-  checksum: 10c0/90e3cfdc7d36df86f95b4bc372851dbf0a9e78ca9d80177674ebb30cf5dff1e786660016aa7e369bd30ac7d1d3edc18d7ab0f6ccfdc9cdfe04ada0e0b5d5911a
+    vitest: 1.6.0
+  checksum: 10c0/a7beaf2a88b628a9dc16ddca7589f2b2e4681598e6788d68423dffbb06c608edc52b2dd421ada069eb3cfd83f8f592ddd6e8b8db2d037bf13965a56c5e5835ac
   languageName: node
   linkType: hard
 
-"@vitest/expect@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/expect@npm:1.2.2"
+"@vitest/expect@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/expect@npm:1.6.0"
   dependencies:
-    "@vitest/spy": "npm:1.2.2"
-    "@vitest/utils": "npm:1.2.2"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
     chai: "npm:^4.3.10"
-  checksum: 10c0/920e80b956d9d5ef7909cbe2bf883c8556da11c5123ea037396cb672d7038116c9773bd36915a3df7be2ffd76b661d5a6487e7e5ded78f39e2500cb36ae81e59
+  checksum: 10c0/a4351f912a70543e04960f5694f1f1ac95f71a856a46e87bba27d3eb72a08c5d11d35021cbdc6077452a152e7d93723fc804bba76c2cc53c8896b7789caadae3
   languageName: node
   linkType: hard
 
-"@vitest/runner@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/runner@npm:1.2.2"
+"@vitest/runner@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/runner@npm:1.6.0"
   dependencies:
-    "@vitest/utils": "npm:1.2.2"
+    "@vitest/utils": "npm:1.6.0"
     p-limit: "npm:^5.0.0"
     pathe: "npm:^1.1.1"
-  checksum: 10c0/25a9c03cca5b40738fe606757b14ee9d60d25193115b4674e3cc402c2b2c3844d234902d48bfa7646cb205455ea27891fef96733e033a570b85fe74ed29ff81c
+  checksum: 10c0/27d67fa51f40effe0e41ee5f26563c12c0ef9a96161f806036f02ea5eb9980c5cdf305a70673942e7a1e3d472d4d7feb40093ae93024ef1ccc40637fc65b1d2f
   languageName: node
   linkType: hard
 
-"@vitest/snapshot@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/snapshot@npm:1.2.2"
+"@vitest/snapshot@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/snapshot@npm:1.6.0"
   dependencies:
     magic-string: "npm:^0.30.5"
     pathe: "npm:^1.1.1"
     pretty-format: "npm:^29.7.0"
-  checksum: 10c0/0f8a69a289aa6466c7dd56f8327190d56a0bc7ad10412127de001c94784f6dba5e5bccb757def21f565f4efa3e00c307b92e8b6c302f11fc57889b743ba18a95
+  checksum: 10c0/be027fd268d524589ff50c5fad7b4faa1ac5742b59ac6c1dc6f5a3930aad553560e6d8775e90ac4dfae4be746fc732a6f134ba95606a1519707ce70db3a772a5
   languageName: node
   linkType: hard
 
-"@vitest/spy@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/spy@npm:1.2.2"
+"@vitest/spy@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/spy@npm:1.6.0"
   dependencies:
     tinyspy: "npm:^2.2.0"
-  checksum: 10c0/5480048d26c0d82b524317552fbdcc05fed6ea626d887620647826453a344798a360f2a75af477512a1569b1b6c918eae62338e8b35575f875fc2d7ef51419f3
+  checksum: 10c0/df66ea6632b44fb76ef6a65c1abbace13d883703aff37cd6d062add6dcd1b883f19ce733af8e0f7feb185b61600c6eb4042a518e4fb66323d0690ec357f9401c
   languageName: node
   linkType: hard
 
-"@vitest/utils@npm:1.2.2":
-  version: 1.2.2
-  resolution: "@vitest/utils@npm:1.2.2"
+"@vitest/utils@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/utils@npm:1.6.0"
   dependencies:
     diff-sequences: "npm:^29.6.3"
     estree-walker: "npm:^3.0.3"
     loupe: "npm:^2.3.7"
     pretty-format: "npm:^29.7.0"
-  checksum: 10c0/32449cb7eca8ecea56e0fce280c9770f65fa6b60bbba73be06ca2891096818899b4b3220bd3c815df8beb4266034db394fcf235e4de8959cce686b8b360948d1
+  checksum: 10c0/8b0d19835866455eb0b02b31c5ca3d8ad45f41a24e4c7e1f064b480f6b2804dc895a70af332f14c11ed89581011b92b179718523f55f5b14787285a0321b1301
   languageName: node
   linkType: hard
 
-"@volar/language-core@npm:1.11.1, @volar/language-core@npm:~1.11.1":
-  version: 1.11.1
-  resolution: "@volar/language-core@npm:1.11.1"
+"@volar/language-core@npm:2.2.1, @volar/language-core@npm:~2.2.0":
+  version: 2.2.1
+  resolution: "@volar/language-core@npm:2.2.1"
   dependencies:
-    "@volar/source-map": "npm:1.11.1"
-  checksum: 10c0/92c4439e3a9ccc534c970031388c318740f6fa032283d03e136c6c8c0228f549c68a7c363af1a28252617a0dca6069e14028329ac906d5acf1912931d0cdcb69
+    "@volar/source-map": "npm:2.2.1"
+  checksum: 10c0/152de63cc887102fb99a267cc94874ddd294bcf2439aeccb1ba5979da6ac3a1fcbf528ce6528babb5b1d48850316d973f39cccfa59c084ae9ee4a0e0a277cd80
   languageName: node
   linkType: hard
 
-"@volar/source-map@npm:1.11.1, @volar/source-map@npm:~1.11.1":
-  version: 1.11.1
-  resolution: "@volar/source-map@npm:1.11.1"
+"@volar/source-map@npm:2.2.1":
+  version: 2.2.1
+  resolution: "@volar/source-map@npm:2.2.1"
   dependencies:
-    muggle-string: "npm:^0.3.1"
-  checksum: 10c0/0bfc639889802705f8036ea8b2052a95a4d691a68bc2b6744ba8b9d312d887393dd3278101180a5ee5304972899d493972a483afafd41e097968746c77d724cb
+    muggle-string: "npm:^0.4.0"
+  checksum: 10c0/27426084f1dec9d62b43da8071e556014e1a001e2a0d9926cc1388bedf7cf95b488c736b996bcb4d7a82cc8b0bddb39ba079ac0e120067c6dc87639d1e22b79b
   languageName: node
   linkType: hard
 
-"@volar/typescript@npm:~1.11.1":
-  version: 1.11.1
-  resolution: "@volar/typescript@npm:1.11.1"
+"@volar/typescript@npm:~2.2.0":
+  version: 2.2.1
+  resolution: "@volar/typescript@npm:2.2.1"
   dependencies:
-    "@volar/language-core": "npm:1.11.1"
+    "@volar/language-core": "npm:2.2.1"
     path-browserify: "npm:^1.0.1"
-  checksum: 10c0/86fe153db3a14d8eb3632784a1d7fcbfbfb51fa5517c3878bfdd49ee8d15a83b1a09f9c589454b7396454c104d3a8e2db3a987dc99b37c33816772fc3e292bf2
+  checksum: 10c0/8f92e278925e3e87fc113716e5569f28a3933321487c34f24cfa8c30e0933776da7b14baa38154880ab23e9cd8969f8fe9a548a86b9d1021f9db2d53a80a6505
   languageName: node
   linkType: hard
 
-"@vue/compiler-core@npm:3.3.7":
-  version: 3.3.7
-  resolution: "@vue/compiler-core@npm:3.3.7"
+"@vue/compiler-core@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/compiler-core@npm:3.4.27"
   dependencies:
-    "@babel/parser": "npm:^7.23.0"
-    "@vue/shared": "npm:3.3.7"
-    estree-walker: "npm:^2.0.2"
-    source-map-js: "npm:^1.0.2"
-  checksum: 10c0/1450cf0ab26068b9d1f6eb2bca3a17a46d48de8c07a6bb53377b7d04c3032d199a239ec835a82d287623b56270c84bd7ca05370eb0dc3ee87c73a6f2d886e23a
-  languageName: node
-  linkType: hard
-
-"@vue/compiler-core@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/compiler-core@npm:3.4.15"
-  dependencies:
-    "@babel/parser": "npm:^7.23.6"
-    "@vue/shared": "npm:3.4.15"
+    "@babel/parser": "npm:^7.24.4"
+    "@vue/shared": "npm:3.4.27"
     entities: "npm:^4.5.0"
     estree-walker: "npm:^2.0.2"
-    source-map-js: "npm:^1.0.2"
-  checksum: 10c0/151dd9c1a4fae826c53ec60536d14298266baf81f8ed1729b1cbcd082d06410234ee951336c5f43aeaf00febafc0fdd7f82934d747a052b7435be0c2e89b8f2e
-  languageName: node
-  linkType: hard
-
-"@vue/compiler-dom@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/compiler-dom@npm:3.4.15"
-  dependencies:
-    "@vue/compiler-core": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
-  checksum: 10c0/d9339ca83f4e2e8fe21435c278e28b8551650d6ab09f0df1ba4afe983b4d692e07d753e70738dffee71e0d04af000eaafd7efebb8c4de5981b2e756ce03c3719
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/fbc9a4a6c467fa47609df3337c1b2012a55e3b07adbffc45a31435237ec1169d0a4ece22f3538607364427b779ce04154b86a0e8dd40d3bd4aa03358d4db136d
   languageName: node
   linkType: hard
 
-"@vue/compiler-dom@npm:^3.3.0":
-  version: 3.3.7
-  resolution: "@vue/compiler-dom@npm:3.3.7"
+"@vue/compiler-dom@npm:3.4.27, @vue/compiler-dom@npm:^3.4.0":
+  version: 3.4.27
+  resolution: "@vue/compiler-dom@npm:3.4.27"
   dependencies:
-    "@vue/compiler-core": "npm:3.3.7"
-    "@vue/shared": "npm:3.3.7"
-  checksum: 10c0/34c030df5fd0d403686c8b17369cf8b19119717d0c19c1d37e380b85023d3d9e69a97215633e983e1ffb89158ce57af53e107103afa344db9b51222c04b3672a
+    "@vue/compiler-core": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
+  checksum: 10c0/ceb8aef314b6b7df1ab6cd3c7c1290e5b60363a6092bbffc3ee6aca42f6f5247a070b0dcbe71530751e840d01beec00a6268e3663abcf4a6ac297a32bfb90e49
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:3.4.15, @vue/compiler-sfc@npm:^3.4.15":
-  version: 3.4.15
-  resolution: "@vue/compiler-sfc@npm:3.4.15"
+"@vue/compiler-sfc@npm:3.4.27, @vue/compiler-sfc@npm:^3.4.27":
+  version: 3.4.27
+  resolution: "@vue/compiler-sfc@npm:3.4.27"
   dependencies:
-    "@babel/parser": "npm:^7.23.6"
-    "@vue/compiler-core": "npm:3.4.15"
-    "@vue/compiler-dom": "npm:3.4.15"
-    "@vue/compiler-ssr": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
+    "@babel/parser": "npm:^7.24.4"
+    "@vue/compiler-core": "npm:3.4.27"
+    "@vue/compiler-dom": "npm:3.4.27"
+    "@vue/compiler-ssr": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
     estree-walker: "npm:^2.0.2"
-    magic-string: "npm:^0.30.5"
-    postcss: "npm:^8.4.33"
-    source-map-js: "npm:^1.0.2"
-  checksum: 10c0/8643f2b6114927034195c06e13b872d186e3b5ae8e84041ea697932613cdd6e848e9253ecf4cfb13302b81a120906e0673b0adf97d07a5e1a731b96aa43f3f75
+    magic-string: "npm:^0.30.10"
+    postcss: "npm:^8.4.38"
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/2ccb852c521bf799cf2b118ee8d2aa0eeaaaab1a2e8d3a4a0bd9db5aaccb6224d6673c0c8e39ff8a04e3a99b21128bdaa6ee643e08562af36d75803801cfd641
   languageName: node
   linkType: hard
 
-"@vue/compiler-ssr@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/compiler-ssr@npm:3.4.15"
+"@vue/compiler-ssr@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/compiler-ssr@npm:3.4.27"
   dependencies:
-    "@vue/compiler-dom": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
-  checksum: 10c0/c71c4df64c1df81f0b0e0e99236135a3e3989ba5d6204eb3c0fac804f7a927a0eb6f6ea67f96df63263ba3667f3a833adb20d76866236124befdf7652ca7a8cd
+    "@vue/compiler-dom": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
+  checksum: 10c0/5c51a43481e5faa3f4e66a01a19a5de8a0c25db5df25183d7f9227853740d8ea75c12b1b89f47198f840de852d2e4c258be114528c0c322aff50c5982a973e1f
   languageName: node
   linkType: hard
 
@@ -2410,35 +2501,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/eslint-config-typescript@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "@vue/eslint-config-typescript@npm:12.0.0"
+"@vue/devtools-api@npm:^6.5.1":
+  version: 6.6.1
+  resolution: "@vue/devtools-api@npm:6.6.1"
+  checksum: 10c0/ab9a1e09baae514b0d3a8bf1d670ecb7724f7e55b82eea30aa2e7255e6200b45c1086c1376560f243cf86e98c0726e94d69cefe0ad23dfd50c7c49dfcb1fbf21
+  languageName: node
+  linkType: hard
+
+"@vue/eslint-config-typescript@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "@vue/eslint-config-typescript@npm:13.0.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": "npm:^6.7.0"
-    "@typescript-eslint/parser": "npm:^6.7.0"
+    "@typescript-eslint/eslint-plugin": "npm:^7.1.1"
+    "@typescript-eslint/parser": "npm:^7.1.1"
     vue-eslint-parser: "npm:^9.3.1"
   peerDependencies:
-    eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
     eslint-plugin-vue: ^9.0.0
-    typescript: "*"
+    typescript: ">=4.7.4"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/3edb549c5d0ee7049e8c49c69fca5272df53376fba66afd7cf3e088c89dfc154ccb9406ac9729c275e643f93ff5ae6d4b35fbd7b808517dd02c3488ab9392d64
+  checksum: 10c0/a960e1157f805e38837107ae8d2a6d280cf8f7cc3fa9ab492e10f52622085076637ee92438ca473c4e3305097448417f66c0d6cbf6130b731dbac9189e4566ca
   languageName: node
   linkType: hard
 
-"@vue/language-core@npm:1.8.27":
-  version: 1.8.27
-  resolution: "@vue/language-core@npm:1.8.27"
+"@vue/language-core@npm:2.0.16":
+  version: 2.0.16
+  resolution: "@vue/language-core@npm:2.0.16"
   dependencies:
-    "@volar/language-core": "npm:~1.11.1"
-    "@volar/source-map": "npm:~1.11.1"
-    "@vue/compiler-dom": "npm:^3.3.0"
-    "@vue/shared": "npm:^3.3.0"
+    "@volar/language-core": "npm:~2.2.0"
+    "@vue/compiler-dom": "npm:^3.4.0"
+    "@vue/shared": "npm:^3.4.0"
     computeds: "npm:^0.0.1"
     minimatch: "npm:^9.0.3"
-    muggle-string: "npm:^0.3.1"
     path-browserify: "npm:^1.0.1"
     vue-template-compiler: "npm:^2.7.14"
   peerDependencies:
@@ -2446,79 +2542,66 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/2018214d8ce2643d19e8e84eddaeacddca28b2980984d7916d97f97556c3716be184cf9f8c4f506d072a11f265401e3bc0391117cf7cfcc1e4a25048f4432dc7
+  checksum: 10c0/90d52932710470df3acd1a2245c4143d74eec6f694a9af263c6102ae9a9cf9eef1e1113a33a0b591d16fe0391c9d89e44ade8c310b7eb38a7bd6b587157deee8
   languageName: node
   linkType: hard
 
-"@vue/reactivity@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/reactivity@npm:3.4.15"
+"@vue/reactivity@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/reactivity@npm:3.4.27"
   dependencies:
-    "@vue/shared": "npm:3.4.15"
-  checksum: 10c0/2eb51e6f642817d5078ebc36ae5b0f94712403448f26794bedbefd05ec23f229dcf7b2512e609170b9d31e1c80bd17c5ff40cc9f82e50d6f0d41c3d542955d01
+    "@vue/shared": "npm:3.4.27"
+  checksum: 10c0/5a30fa92cb1b467f56c467d9851a9d594475c80952a600db444c38a8fe2dfc53e4aa09fed6b0e6074eca667c915c730d02b386be26d5f7a0565e70ae04fe92b7
   languageName: node
   linkType: hard
 
-"@vue/runtime-core@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/runtime-core@npm:3.4.15"
+"@vue/runtime-core@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/runtime-core@npm:3.4.27"
   dependencies:
-    "@vue/reactivity": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
-  checksum: 10c0/f8784c2b65bb8bec705a0e1723f7b47079604c1d1c075497af6f303f81fa5e228d3ca56da2fac3e6e303a42ab26febfcc7a3be5b932a3c0a2f588f1256b9af38
+    "@vue/reactivity": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
+  checksum: 10c0/dc02dfefebeec49c6b8aab9e133551b6cedef3c55e7441732a696aba66b865945549ba0f92a97a0f4ab080b828bca2cc2ce669ad7c6d2ee129d5050948f03817
   languageName: node
   linkType: hard
 
-"@vue/runtime-dom@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/runtime-dom@npm:3.4.15"
+"@vue/runtime-dom@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/runtime-dom@npm:3.4.27"
   dependencies:
-    "@vue/runtime-core": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
+    "@vue/runtime-core": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
     csstype: "npm:^3.1.3"
-  checksum: 10c0/e9202ca15481e72dce4f2dce2c29401afc82ee89e7f01f2989cee2a94d7689b75139e900717e3c8bfb59b741f403051a02664b5784e5389a49d639f919e234c4
+  checksum: 10c0/2ace60cab29400c4d466b6743552ae3af360f908d7716316c23a641bd5adce7aa05d2b4522ecf3b6b2f912bb525c8e055708db11791e50aea24ff6b2a71e0a8e
   languageName: node
   linkType: hard
 
-"@vue/server-renderer@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/server-renderer@npm:3.4.15"
+"@vue/server-renderer@npm:3.4.27":
+  version: 3.4.27
+  resolution: "@vue/server-renderer@npm:3.4.27"
   dependencies:
-    "@vue/compiler-ssr": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
+    "@vue/compiler-ssr": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
   peerDependencies:
-    vue: 3.4.15
-  checksum: 10c0/43f86060774b8fa7331c672c564402ec58363642f0457147492b7b69c44fb1c26515968dc72d2ca0be053e838e9c2cf8f274356f982bb2bf9e886b1f4916ecaf
-  languageName: node
-  linkType: hard
-
-"@vue/shared@npm:3.3.7, @vue/shared@npm:^3.3.0":
-  version: 3.3.7
-  resolution: "@vue/shared@npm:3.3.7"
-  checksum: 10c0/7199c5a26d528fd6f04ce9aa97eb7cd5cb98d4b9e9bc77661837960a01f36cd4c0f88725b9b7739fb6e4c864ab9849b96db662da51b1c56f0b70a6905c5db755
+    vue: 3.4.27
+  checksum: 10c0/5e6761ecd74c0a9ca9fd991f7a980140d2e09427712dbdc74b536bc5a9b97c06825ca4fa006b4a7cd6ba224fdb13c1c6a600e7d039d2a40f036b13ed611aa20f
   languageName: node
   linkType: hard
 
-"@vue/shared@npm:3.4.15":
-  version: 3.4.15
-  resolution: "@vue/shared@npm:3.4.15"
-  checksum: 10c0/eddcc1c82e8e550d9f3d622e33fd841c0c3b5c6f04f21f1cb10d3415068daabac0746279c88031861183d75d7a082fb599eec9201757d457de177d86989a9bc7
+"@vue/shared@npm:3.4.27, @vue/shared@npm:^3.4.0":
+  version: 3.4.27
+  resolution: "@vue/shared@npm:3.4.27"
+  checksum: 10c0/4a21918858270bcc654bb94b3429d9acbe95af097ea3063e192b36bd502dc896ca47778fa74a863b01f677ec271b189eb90f8b372943c10e52725a6bdc7f6cd5
   languageName: node
   linkType: hard
 
-"@vue/test-utils@npm:^2.4.4":
-  version: 2.4.4
-  resolution: "@vue/test-utils@npm:2.4.4"
+"@vue/test-utils@npm:^2.4.6":
+  version: 2.4.6
+  resolution: "@vue/test-utils@npm:2.4.6"
   dependencies:
     js-beautify: "npm:^1.14.9"
-    vue-component-type-helpers: "npm:^1.8.21"
-  peerDependencies:
-    "@vue/server-renderer": ^3.0.1
-    vue: ^3.0.1
-  peerDependenciesMeta:
-    "@vue/server-renderer":
-      optional: true
-  checksum: 10c0/fa213b6733bbc0249f5ab5c98e669d63f77aa57a18985382e146c20380fffda687668c570dd6002f0f969efa24900d67f8ff607f7dfaf41179d75cd24f1b3e53
+    vue-component-type-helpers: "npm:^2.0.0"
+  checksum: 10c0/37fa46cb6b98f90affb2faf5aa41422617bbd23ff35bc714d08035334e593ae31d18757d5ae688f778dd8b4c28de431601c0b9b7ca17fc1b55f1401a5577375e
   languageName: node
   linkType: hard
 
@@ -2836,12 +2919,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.17":
-  version: 10.4.17
-  resolution: "autoprefixer@npm:10.4.17"
+"autoprefixer@npm:^10.4.19":
+  version: 10.4.19
+  resolution: "autoprefixer@npm:10.4.19"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    caniuse-lite: "npm:^1.0.30001578"
+    browserslist: "npm:^4.23.0"
+    caniuse-lite: "npm:^1.0.30001599"
     fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
@@ -2850,7 +2933,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 10c0/1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
+  checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19
   languageName: node
   linkType: hard
 
@@ -2861,14 +2944,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.6.7":
-  version: 1.6.7
-  resolution: "axios@npm:1.6.7"
+"axios@npm:^1.6.8":
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
   dependencies:
-    follow-redirects: "npm:^1.15.4"
+    follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/131bf8e62eee48ca4bd84e6101f211961bf6a21a33b95e5dfb3983d5a2fe50d9fffde0b57668d7ce6f65063d3dc10f2212cbcb554f75cfca99da1c73b210358d
+  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
   languageName: node
   linkType: hard
 
@@ -2893,15 +2976,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bidi-js@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "bidi-js@npm:1.0.3"
-  dependencies:
-    require-from-string: "npm:^2.0.2"
-  checksum: 10c0/fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
-  languageName: node
-  linkType: hard
-
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
@@ -2986,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=041bfba27b044b143cfc907c152cf25509c3274a":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=041bfba27b044b143cfc907c152cf25509c3274a"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/8d600119053b99d48586de894eae522ae14cbe1e31e6d57f5e8de84f96ba136ac7aea8f012e10d1f0ac00110f51f426a41074684751f5505763db5750f380c10
+  checksum: 10c0/cfb9d17ef3fe0ed66c17fd963dfeb7c5d953f244d4372c9ab71134d5390b27729f988bc597a0ea41ae9dccb8a0f8b2040f3d4e1580a6f0c9b03a2df5364955da
   languageName: node
   linkType: hard
 
@@ -2999,107 +3073,107 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "brewblox-ui@workspace:."
   dependencies:
-    "@ianvs/prettier-plugin-sort-imports": "npm:^4.1.1"
-    "@quasar/extras": "npm:^1.16.9"
-    "@quasar/quasar-app-extension-testing-unit-vitest": "npm:^0.4.0"
-    "@quasar/vite-plugin": "npm:^1.6.0"
+    "@ianvs/prettier-plugin-sort-imports": "npm:^4.2.1"
+    "@quasar/extras": "npm:^1.16.11"
+    "@quasar/quasar-app-extension-testing-unit-vitest": "npm:^1.0.0"
+    "@quasar/vite-plugin": "npm:^1.7.0"
     "@rollup/plugin-inject": "npm:^5.0.5"
     "@types/d3": "npm:^7.4.3"
     "@types/dompurify": "npm:^3.0.5"
     "@types/js-quantities": "npm:^1.6.6"
-    "@types/lodash": "npm:^4.14.202"
+    "@types/lodash": "npm:^4.17.1"
     "@types/marked": "npm:^6.0.0"
     "@types/minimist": "npm:^1.2.5"
-    "@types/node": "npm:20.11.16"
-    "@types/plotly.js": "npm:^2.29.0"
+    "@types/node": "npm:20.12.11"
+    "@types/plotly.js": "npm:^2.29.3"
     "@types/pluralize": "npm:^0.0.33"
     "@typescript-eslint/eslint-plugin": "npm:^6.21.0"
     "@typescript-eslint/parser": "npm:^6.21.0"
-    "@vitejs/plugin-vue": "npm:^5.0.3"
-    "@vitest/coverage-v8": "npm:^1.2.2"
-    "@vue/compiler-sfc": "npm:^3.4.15"
-    "@vue/eslint-config-typescript": "npm:^12.0.0"
-    "@vue/test-utils": "npm:^2.4.4"
-    autoprefixer: "npm:^10.4.17"
-    axios: "npm:^1.6.7"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=041bfba27b044b143cfc907c152cf25509c3274a"
+    "@vitejs/plugin-vue": "npm:^5.0.4"
+    "@vitest/coverage-v8": "npm:^1.6.0"
+    "@vue/compiler-sfc": "npm:^3.4.27"
+    "@vue/eslint-config-typescript": "npm:^13.0.0"
+    "@vue/test-utils": "npm:^2.4.6"
+    autoprefixer: "npm:^10.4.19"
+    axios: "npm:^1.6.8"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"
-    core-js: "npm:^3.35.1"
-    d3: "npm:^7.8.5"
-    date-fns: "npm:^3.3.1"
-    dompurify: "npm:^3.0.8"
-    elkjs: "npm:^0.9.1"
-    eslint: "npm:^8.56.0"
+    core-js: "npm:^3.37.0"
+    d3: "npm:^7.9.0"
+    date-fns: "npm:^3.6.0"
+    dompurify: "npm:^3.1.2"
+    elkjs: "npm:^0.9.3"
+    eslint: "npm:^8.57.0"
     eslint-config-prettier: "npm:^9.1.0"
     eslint-plugin-import: "npm:^2.29.1"
     eslint-plugin-node: "npm:^11.1.0"
     eslint-plugin-promise: "npm:^6.1.1"
     eslint-plugin-quasar: "npm:^1.1.0"
-    eslint-plugin-vue: "npm:^9.19.2"
+    eslint-plugin-vue: "npm:^9.25.0"
     fromentries: "npm:^1.3.2"
-    immer: "npm:^10.0.3"
+    immer: "npm:^10.1.1"
     js-quantities: "npm:^1.8.0"
-    jsdom: "npm:^23.2.0"
+    jsdom: "npm:^24.0.0"
     lodash: "npm:^4.17.21"
-    marked: "npm:^11.2.0"
+    marked: "npm:^12.0.2"
     minimist: "npm:^1.2.8"
-    mqtt: "npm:^5.3.5"
-    nanoid: "npm:^5.0.5"
+    mqtt: "npm:^5.5.5"
+    nanoid: "npm:^5.0.7"
     parse-duration: "npm:^1.1.0"
     pinia: "npm:^2.1.7"
-    plotly.js: "npm:^2.29.0"
+    plotly.js: "npm:^2.32.0"
     portal-vue: "npm:^3.0.0"
     prettier: "npm:^3.2.5"
     process: "npm:^0.11.10"
-    quasar: "npm:^2.14.3"
-    rollup: "npm:^4.9.6"
+    quasar: "npm:^2.16.2"
+    rollup: "npm:^4.17.2"
     rollup-plugin-visualizer: "npm:^5.12.0"
-    sass: "npm:1.70.0"
-    simple-keyboard: "npm:^3.7.54"
-    simple-keyboard-layouts: "npm:^3.3.65"
+    sass: "npm:1.77.0"
+    simple-keyboard: "npm:^3.7.79"
+    simple-keyboard-layouts: "npm:^3.3.102"
     svg-path-properties: "npm:^1.3.0"
     svgpath: "npm:^2.6.0"
-    typescript: "npm:^5.3.3"
+    typescript: "npm:^5.4.5"
     typescript-string-enums: "npm:^1.0.0"
     url: "npm:^0.11.3"
-    vite: "npm:^5.0.13"
+    vite: "npm:^5.2.11"
     vite-plugin-checker: "npm:^0.6.4"
-    vitest: "npm:^1.2.2"
-    vue: "npm:^3.4.15"
+    vitest: "npm:^1.6.0"
+    vue: "npm:^3.4.27"
     vue-global-type-gen: "npm:^1.1.0"
-    vue-router: "npm:^4.2.5"
-    vue-tsc: "npm:^1.8.27"
+    vue-router: "npm:^4.3.2"
+    vue-tsc: "npm:^2.0.16"
     vuedraggable: "npm:^4.1.0"
   languageName: unknown
   linkType: soft
 
-"browserslist@npm:^4.21.9":
-  version: 4.22.1
-  resolution: "browserslist@npm:4.22.1"
+"browserslist@npm:^4.22.2":
+  version: 4.22.3
+  resolution: "browserslist@npm:4.22.3"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001541"
-    electron-to-chromium: "npm:^1.4.535"
-    node-releases: "npm:^2.0.13"
+    caniuse-lite: "npm:^1.0.30001580"
+    electron-to-chromium: "npm:^1.4.648"
+    node-releases: "npm:^2.0.14"
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 10c0/6810f2d63f171d0b7b8d38cf091708e00cb31525501810a507839607839320d66e657293b0aa3d7f051ecbc025cb07390a90c037682c1d05d12604991e41050b
+  checksum: 10c0/5a1f673ce0d6e61a68369835a6b66e199669bde02c3bed5ec51e77598d8daafd91719dba55b15af2021b9ad0bbaa94951fd702eb71087449eb28be8002815ece
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.22.2":
-  version: 4.22.3
-  resolution: "browserslist@npm:4.22.3"
+"browserslist@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "browserslist@npm:4.23.0"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001580"
-    electron-to-chromium: "npm:^1.4.648"
+    caniuse-lite: "npm:^1.0.30001587"
+    electron-to-chromium: "npm:^1.4.668"
     node-releases: "npm:^2.0.14"
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 10c0/5a1f673ce0d6e61a68369835a6b66e199669bde02c3bed5ec51e77598d8daafd91719dba55b15af2021b9ad0bbaa94951fd702eb71087449eb28be8002815ece
+  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
   languageName: node
   linkType: hard
 
@@ -3165,20 +3239,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001541":
-  version: 1.0.30001559
-  resolution: "caniuse-lite@npm:1.0.30001559"
-  checksum: 10c0/32377e386580dcb977f552b488e7b56fb489aa0a83f4f43087af6e8fe1fe7fda529bc29e76ef38c0f9c56c964389d322059a0dd7a544859a7b88063f7fc761d7
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001580":
+"caniuse-lite@npm:^1.0.30001580":
   version: 1.0.30001584
   resolution: "caniuse-lite@npm:1.0.30001584"
   checksum: 10c0/9f353d7b14ea218bf90f9aa908947be1119f3744bb4080aeef59dd2fbca2ca663a6eecad29deba41f7d02ef9f516240353809f31208396a1ec9824b515467d87
   languageName: node
   linkType: hard
 
+"caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
+  version: 1.0.30001616
+  resolution: "caniuse-lite@npm:1.0.30001616"
+  checksum: 10c0/4c29f0a6c65ec888fadf5112cffc3b162872b74dce6ca4964d242c1c0fd05ab284f8e500f85739d5c96573589cf6e0e911424646b1009440a7c142ef6a5187ce
+  languageName: node
+  linkType: hard
+
 "canvas-fit@npm:^1.5.0":
   version: 1.5.0
   resolution: "canvas-fit@npm:1.5.0"
@@ -3391,14 +3465,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-parse@npm:1.3.8":
-  version: 1.3.8
-  resolution: "color-parse@npm:1.3.8"
+"color-parse@npm:2.0.0":
+  version: 2.0.0
+  resolution: "color-parse@npm:2.0.0"
   dependencies:
     color-name: "npm:^1.0.0"
-    defined: "npm:^1.0.0"
-    is-plain-obj: "npm:^1.1.0"
-  checksum: 10c0/245c7ffa93961f7daff995ae09875edf52d3007e020c0a3a675dc06fd478ba624d88f79d653de4feb33573fa27629d88caf4ca1d24cf7e48326888a8ecc8bbdc
+  checksum: 10c0/f489deaea5bb323e05f41436d747e22bbb45928420fce8a989c209a4baa71c7ee90f8b43298d9565844af1d02580743d5d87b506519f755b4b218df6b72eb4a0
   languageName: node
   linkType: hard
 
@@ -3555,10 +3627,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:^3.35.1":
-  version: 3.35.1
-  resolution: "core-js@npm:3.35.1"
-  checksum: 10c0/ebc8e22c36d13bcf2140cbc1d8ad65d1b08192bff4c43ade70c72eac103cb4dcfbc521f2b1ad1c74881b0a4353e64986537893ae4f07888e49228340efa13ae6
+"core-js@npm:^3.37.0":
+  version: 3.37.0
+  resolution: "core-js@npm:3.37.0"
+  checksum: 10c0/7e00331f346318ca3f595c08ce9e74ddae744715aef137486c1399163afd79792fb94c3161280863adfdc3e30f8026912d56bd3036f93cacfc689d33e185f2ee
   languageName: node
   linkType: hard
 
@@ -3653,23 +3725,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "css-tree@npm:2.3.1"
-  dependencies:
-    mdn-data: "npm:2.0.30"
-    source-map-js: "npm:^1.0.1"
-  checksum: 10c0/6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24
-  languageName: node
-  linkType: hard
-
-"css.escape@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "css.escape@npm:1.5.1"
-  checksum: 10c0/5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
-  languageName: node
-  linkType: hard
-
 "csscolorparser@npm:~1.0.3":
   version: 1.0.3
   resolution: "csscolorparser@npm:1.0.3"
@@ -4102,9 +4157,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3@npm:^7.8.5":
-  version: 7.8.5
-  resolution: "d3@npm:7.8.5"
+"d3@npm:^7.9.0":
+  version: 7.9.0
+  resolution: "d3@npm:7.9.0"
   dependencies:
     d3-array: "npm:3"
     d3-axis: "npm:3"
@@ -4136,7 +4191,7 @@ __metadata:
     d3-timer: "npm:3"
     d3-transition: "npm:3"
     d3-zoom: "npm:3"
-  checksum: 10c0/408758dcc2437cbff8cd207b9d82760030b5c53c1df6a2ce5b1a76633388a6892fd65c0632cfa83da963e239722d49805062e5fb05d99e0fb078bda14cb22222
+  checksum: 10c0/3dd9c08c73cfaa69c70c49e603c85e049c3904664d9c79a1a52a0f52795828a1ff23592dc9a7b2257e711d68a615472a13103c212032f38e016d609796e087e8
   languageName: node
   linkType: hard
 
@@ -4160,10 +4215,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "date-fns@npm:3.3.1"
-  checksum: 10c0/e04ff79244010e03b912d791cd3250af5f18866ce868604958d76bd87e5fb0b79f0a810b8e7066248452b41779b288c4fd21de1cac2cd4b6d384e9dd931c9674
+"date-fns@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "date-fns@npm:3.6.0"
+  checksum: 10c0/0b5fb981590ef2f8e5a3ba6cd6d77faece0ea7f7158948f2eaae7bbb7c80a8f63ae30b01236c2923cf89bb3719c33aeb150c715ea4fe4e86e37dcf06bed42fb6
   languageName: node
   linkType: hard
 
@@ -4320,10 +4375,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "dompurify@npm:3.0.8"
-  checksum: 10c0/e89e03d3dbd99abd64cd90705ce2cdfbc60ee9726ee53f9860e8a2d91b828ef2c173e7031529f9a3aa169ad0fbb76115c6a6683b545bf1ac5d94cc6176fb2a50
+"dompurify@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "dompurify@npm:3.1.2"
+  checksum: 10c0/6f072da177ba850c196184d76a277933a19831e59313edd90f094e8884579c8193b21ea105889d89059771f058f4b2e0c14fc5a58f19f7dad2a6756be807d091
   languageName: node
   linkType: hard
 
@@ -4391,13 +4446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.535":
-  version: 1.4.572
-  resolution: "electron-to-chromium@npm:1.4.572"
-  checksum: 10c0/12bcd1ec9bfe6947186951decac2c5bb32188d99ddf1d2a26739a84fb8e1bfa0d6bb439e16a4bdddcf0dddad4e6defcdea1f4bd02964962c198998c6b63f35d3
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.4.648":
   version: 1.4.657
   resolution: "electron-to-chromium@npm:1.4.657"
@@ -4405,6 +4453,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-to-chromium@npm:^1.4.668":
+  version: 1.4.758
+  resolution: "electron-to-chromium@npm:1.4.758"
+  checksum: 10c0/60151ca87bfdf50ee8fc47df4db32f62f33c972259856bc308134bf278d21af62842d9f9f1e1f397df6bb82925e83745f6d3a4ecda00813d14c2156f0e681d3f
+  languageName: node
+  linkType: hard
+
 "element-size@npm:^1.1.1":
   version: 1.1.1
   resolution: "element-size@npm:1.1.1"
@@ -4421,10 +4476,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elkjs@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "elkjs@npm:0.9.1"
-  checksum: 10c0/2472dd26fafd009632f17609b36f8b61cfbd0c29d516d3e66ee54f2b078c21f559ff7db05de6590b1e0136272d141dfa8e7f7edbe963166ae45e4d5f9ed8c386
+"elkjs@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "elkjs@npm:0.9.3"
+  checksum: 10c0/caf544ff4fce8442d1d3dd6dface176c9b2fe26fc1e34f56122828e6eef7d2d7fe70d3202f9f3ecf0feb6287d4c8430949f483e63e450a7454bb39ccffab3808
   languageName: node
   linkType: hard
 
@@ -4912,20 +4967,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-vue@npm:^9.19.2":
-  version: 9.19.2
-  resolution: "eslint-plugin-vue@npm:9.19.2"
+"eslint-plugin-vue@npm:^9.25.0":
+  version: 9.25.0
+  resolution: "eslint-plugin-vue@npm:9.25.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
+    globals: "npm:^13.24.0"
     natural-compare: "npm:^1.4.0"
     nth-check: "npm:^2.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
-    semver: "npm:^7.5.4"
-    vue-eslint-parser: "npm:^9.3.1"
+    postcss-selector-parser: "npm:^6.0.15"
+    semver: "npm:^7.6.0"
+    vue-eslint-parser: "npm:^9.4.2"
     xml-name-validator: "npm:^4.0.0"
   peerDependencies:
-    eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
-  checksum: 10c0/b48c24c6aedcc690b4cf2432df08da62fba6f7f24f3a561d7a2592329c2c947d01ba51b49b2a256f65735dcea4f73b44cbffc0c373fec461f49f5a02a078561e
+    eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+  checksum: 10c0/43332208612ed2b8afb50280ca6bb79cd381b99bb9173c2d250f94fd2fe14b3e22454f0ec0928d2dfbdfd50553949f3f8ef04f190e57be96d1f0411bca551a15
   languageName: node
   linkType: hard
 
@@ -4962,15 +5018,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.56.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
+"eslint@npm:^8.57.0":
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.56.0"
-    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
     "@ungap/structured-clone": "npm:^1.2.0"
@@ -5006,7 +5062,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
+  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
   languageName: node
   linkType: hard
 
@@ -5218,6 +5274,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-unique-numbers@npm:^8.0.13":
+  version: 8.0.13
+  resolution: "fast-unique-numbers@npm:8.0.13"
+  dependencies:
+    "@babel/runtime": "npm:^7.23.8"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/bf826d92345083c3146debf44e7dc93414d428eb81bd095dd46fcc6654f77977e0d04a2f65bccfcf0b9fc495a4276259afe99dbee009f463d19a1503f4e9bfac
+  languageName: node
+  linkType: hard
+
 "fastq@npm:^1.6.0":
   version: 1.15.0
   resolution: "fastq@npm:1.15.0"
@@ -5282,7 +5348,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.15.4":
+"follow-redirects@npm:^1.15.6":
   version: 1.15.6
   resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
@@ -5530,9 +5596,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gl-text@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "gl-text@npm:1.3.1"
+"gl-text@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "gl-text@npm:1.4.0"
   dependencies:
     bit-twiddle: "npm:^1.0.2"
     color-normalize: "npm:^1.5.0"
@@ -5551,7 +5617,7 @@ __metadata:
     regl: "npm:^2.0.0"
     to-px: "npm:^1.0.1"
     typedarray-pool: "npm:^1.1.0"
-  checksum: 10c0/2bffa1cf6264d6211b7dcc8da7016850d985b4d46d8bba1f38edbdbf379b5f150610ff9449ef9561c274d07f34659bd66ab8dc2e3470c2e59a697cc29a6acc9b
+  checksum: 10c0/bb694f69bd6b8c6186482990c12a3d07c54fc92d7c13623ca3cffd3c564045336e7db00d638623517dbd1678cf25986515f6db8f8a984b119867c60bfab6069d
   languageName: node
   linkType: hard
 
@@ -5667,6 +5733,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globals@npm:^13.24.0":
+  version: 13.24.0
+  resolution: "globals@npm:13.24.0"
+  dependencies:
+    type-fest: "npm:^0.20.2"
+  checksum: 10c0/d3c11aeea898eb83d5ec7a99508600fbe8f83d2cf00cbb77f873dbf2bcb39428eff1b538e4915c993d8a3b3473fa71eeebfe22c9bb3a3003d1e26b1f2c8a42cd
+  languageName: node
+  linkType: hard
+
 "globalthis@npm:^1.0.3":
   version: 1.0.3
   resolution: "globalthis@npm:1.0.3"
@@ -5831,7 +5906,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glslify@npm:^7.0.0, glslify@npm:^7.1.1":
+"glslify@npm:^7.0.0":
   version: 7.1.1
   resolution: "glslify@npm:7.1.1"
   dependencies:
@@ -5886,17 +5961,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"happy-dom@npm:^11.0.6":
-  version: 11.2.0
-  resolution: "happy-dom@npm:11.2.0"
+"happy-dom@npm:^13.6.2":
+  version: 13.10.1
+  resolution: "happy-dom@npm:13.10.1"
   dependencies:
-    css.escape: "npm:^1.5.1"
     entities: "npm:^4.5.0"
-    iconv-lite: "npm:^0.6.3"
     webidl-conversions: "npm:^7.0.0"
-    whatwg-encoding: "npm:^2.0.0"
     whatwg-mimetype: "npm:^3.0.0"
-  checksum: 10c0/2045ed0c3af5cc3852552f414fb6b185baf3c9310e83a2e16a33e019e13aaeb213dba6ccab1a8b015d2b57fbafc8826ec92a265f179e7d4cf0c2dad2a424d81a
+  checksum: 10c0/bbe9edafde6622a8ab485f5576c3eb210caa1e083c176282322385f57535506092480ea62c139a71a64fcdb0027be97776670609fefd428745b4282d7211b174
   languageName: node
   linkType: hard
 
@@ -6063,7 +6135,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6, iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
+"iconv-lite@npm:0.6, iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -6095,10 +6167,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immer@npm:^10.0.3":
-  version: 10.0.3
-  resolution: "immer@npm:10.0.3"
-  checksum: 10c0/282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
+"ignore@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+  languageName: node
+  linkType: hard
+
+"immer@npm:^10.1.1":
+  version: 10.1.1
+  resolution: "immer@npm:10.1.1"
+  checksum: 10c0/b749e10d137ccae91788f41bd57e9387f32ea6d6ea8fd7eb47b23fd7766681575efc7f86ceef7fe24c3bc9d61e38ff5d2f49c2663b2b0c056e280a4510923653
   languageName: node
   linkType: hard
 
@@ -6516,14 +6595,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-source-maps@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "istanbul-lib-source-maps@npm:4.0.1"
+"istanbul-lib-source-maps@npm:^5.0.4":
+  version: 5.0.4
+  resolution: "istanbul-lib-source-maps@npm:5.0.4"
   dependencies:
+    "@jridgewell/trace-mapping": "npm:^0.3.23"
     debug: "npm:^4.1.1"
     istanbul-lib-coverage: "npm:^3.0.0"
-    source-map: "npm:^0.6.1"
-  checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
+  checksum: 10c0/48b48294590675005ba439888a53157fc71a99d78321428f3ce5f64e28cdfb6bc6eb45871333f448437118ef56a0ef371f4958163e2c2d066d3a703415a71b2e
   languageName: node
   linkType: hard
 
@@ -6587,6 +6666,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-tokens@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "js-tokens@npm:9.0.0"
+  checksum: 10c0/4ad1c12f47b8c8b2a3a99e29ef338c1385c7b7442198a425f3463f3537384dab6032012791bfc2f056ea5ecdb06b1ed4f70e11a3ab3f388d3dcebfe16a52b27d
+  languageName: node
+  linkType: hard
+
 "js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -6598,11 +6684,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^23.2.0":
-  version: 23.2.0
-  resolution: "jsdom@npm:23.2.0"
+"jsdom@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "jsdom@npm:24.0.0"
   dependencies:
-    "@asamuzakjp/dom-selector": "npm:^2.0.1"
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
@@ -6611,6 +6696,7 @@ __metadata:
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.2"
     is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.7"
     parse5: "npm:^7.1.2"
     rrweb-cssom: "npm:^0.6.0"
     saxes: "npm:^6.0.0"
@@ -6628,7 +6714,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/b062af50f7be59d914ba75236b7817c848ef3cd007aea1d6b8020a41eb263b7d5bd2652298106e9756b56892f773d990598778d02adab7d0d0d8e58726fc41d3
+  checksum: 10c0/7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
   languageName: node
   linkType: hard
 
@@ -6826,6 +6912,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.10":
+  version: 0.30.10
+  resolution: "magic-string@npm:0.30.10"
+  dependencies:
+    "@jridgewell/sourcemap-codec": "npm:^1.4.15"
+  checksum: 10c0/aa9ca17eae571a19bce92c8221193b6f93ee8511abb10f085e55ffd398db8e4c089a208d9eac559deee96a08b7b24d636ea4ab92f09c6cf42a7d1af51f7fd62b
+  languageName: node
+  linkType: hard
+
 "magic-string@npm:^0.30.3, magic-string@npm:^0.30.5":
   version: 0.30.5
   resolution: "magic-string@npm:0.30.5"
@@ -6892,12 +6987,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked@npm:^11.2.0":
-  version: 11.2.0
-  resolution: "marked@npm:11.2.0"
+"marked@npm:^12.0.2":
+  version: 12.0.2
+  resolution: "marked@npm:12.0.2"
   bin:
     marked: bin/marked.js
-  checksum: 10c0/4713cceabdcd0b4de9a156d601a55ae7e9091cd89ba75d8283042ddbbedb7cd765e02445a80be01131aa24a79003346fc650d66bf4423f7aa186dcc46b403849
+  checksum: 10c0/45ae2e1e3f06b30a5b5f64efc6cde9830c81d1d024fd7668772a3217f1bc0f326e66a6b8970482d9783edf1f581fecac7023a7fa160f2c14dbcc16e064b4eafb
   languageName: node
   linkType: hard
 
@@ -6908,13 +7003,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mdn-data@npm:2.0.30":
-  version: 2.0.30
-  resolution: "mdn-data@npm:2.0.30"
-  checksum: 10c0/a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9
-  languageName: node
-  linkType: hard
-
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -6998,6 +7086,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
+  languageName: node
+  linkType: hard
+
 "minimist-options@npm:^4.1.0":
   version: 4.1.0
   resolution: "minimist-options@npm:4.1.0"
@@ -7195,9 +7292,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mqtt@npm:^5.3.5":
-  version: 5.3.5
-  resolution: "mqtt@npm:5.3.5"
+"mqtt@npm:^5.5.5":
+  version: 5.5.5
+  resolution: "mqtt@npm:5.5.5"
   dependencies:
     "@types/readable-stream": "npm:^4.0.5"
     "@types/ws": "npm:^8.5.9"
@@ -7214,13 +7311,13 @@ __metadata:
     reinterval: "npm:^1.1.0"
     rfdc: "npm:^1.3.0"
     split2: "npm:^4.2.0"
-    worker-timers: "npm:^7.0.78"
+    worker-timers: "npm:^7.1.4"
     ws: "npm:^8.14.2"
   bin:
     mqtt: build/bin/mqtt.js
     mqtt_pub: build/bin/pub.js
     mqtt_sub: build/bin/sub.js
-  checksum: 10c0/33812556f3c36c687edb2a50a971148cac45077aadea44c447e9fdd1303e20dfda935c5061384656411c4bccc4cd86ee8be02babac05dce57c6b9bf1c698fa09
+  checksum: 10c0/7da771d962898a8271a63c17f3314968912b11b00f1cfb0390bfaac35e4d7baa59a47a0eb350899b6b8d2cb1b1d960b0365834b1418aa35e4b05ab8fce6faccd
   languageName: node
   linkType: hard
 
@@ -7245,10 +7342,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"muggle-string@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "muggle-string@npm:0.3.1"
-  checksum: 10c0/489b0575fa76e30914393915a36638590052409fca2206a6bef0fb0ad7b181c1cbf99761191bfd16fe402c6f5a3164897965422fa32ef20ada1b44024ba46ab6
+"muggle-string@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "muggle-string@npm:0.4.1"
+  checksum: 10c0/e914b63e24cd23f97e18376ec47e4ba3aa24365e4776212b666add2e47bb158003212980d732c49abf3719568900af7861873844a6e2d3a7ca7e86952c0e99e9
   languageName: node
   linkType: hard
 
@@ -7288,12 +7385,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "nanoid@npm:5.0.5"
+"nanoid@npm:^5.0.7":
+  version: 5.0.7
+  resolution: "nanoid@npm:5.0.7"
   bin:
     nanoid: bin/nanoid.js
-  checksum: 10c0/b1f881b08d6e918bf70d37dece3e59fff8d99cc29b80a956e29d1852e09d3a7bf35a4884f4b9d5ff26963018937d0c91bef83842c15758a668d88c94704d2da7
+  checksum: 10c0/a3fb1c157e3e35378f44e5a7130c70f80c9037f66c9a37285e5e3d8298e8405fcb2399baaa420980b0fe5fd9c2e4186a6a31c3526f21de03cf34c1b459871401
   languageName: node
   linkType: hard
 
@@ -7358,13 +7455,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "node-releases@npm:2.0.13"
-  checksum: 10c0/2fb44bf70fc949d27f3a48a7fd1a9d1d603ddad4ccd091f26b3fb8b1da976605d919330d7388ccd55ca2ade0dc8b2e12841ba19ef249c8bb29bf82532d401af7
-  languageName: node
-  linkType: hard
-
 "node-releases@npm:^2.0.14":
   version: 2.0.14
   resolution: "node-releases@npm:2.0.14"
@@ -7459,6 +7549,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.2.7":
+  version: 2.2.9
+  resolution: "nwsapi@npm:2.2.9"
+  checksum: 10c0/e6ebbaedf44d1c1e13f7193e5129c8da1b2e8064862b70458ab9bd9e9640b8ad035a0e48d509e787527ecdddea74d5a02798420cd971264a4e03c2b173fadac8
+  languageName: node
+  linkType: hard
+
 "object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -7833,14 +7930,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"plotly.js@npm:^2.29.0":
-  version: 2.29.0
-  resolution: "plotly.js@npm:2.29.0"
+"plotly.js@npm:^2.32.0":
+  version: 2.32.0
+  resolution: "plotly.js@npm:2.32.0"
   dependencies:
     "@plotly/d3": "npm:3.8.1"
     "@plotly/d3-sankey": "npm:0.7.2"
     "@plotly/d3-sankey-circular": "npm:0.33.1"
-    "@plotly/mapbox-gl": "npm:v1.13.4"
+    "@plotly/mapbox-gl": "npm:1.13.4"
     "@turf/area": "npm:^6.4.0"
     "@turf/bbox": "npm:^6.4.0"
     "@turf/centroid": "npm:^6.0.2"
@@ -7848,7 +7945,7 @@ __metadata:
     canvas-fit: "npm:^1.5.0"
     color-alpha: "npm:1.0.4"
     color-normalize: "npm:1.5.0"
-    color-parse: "npm:1.3.8"
+    color-parse: "npm:2.0.0"
     color-rgba: "npm:2.1.1"
     country-regex: "npm:^1.1.0"
     d3-force: "npm:^1.2.1"
@@ -7861,8 +7958,7 @@ __metadata:
     d3-time-format: "npm:^2.2.3"
     fast-isnumeric: "npm:^1.1.4"
     gl-mat4: "npm:^1.2.0"
-    gl-text: "npm:^1.3.1"
-    glslify: "npm:^7.1.1"
+    gl-text: "npm:^1.4.0"
     has-hover: "npm:^1.0.1"
     has-passive-events: "npm:^1.0.0"
     is-mobile: "npm:^4.0.0"
@@ -7876,7 +7972,7 @@ __metadata:
     probe-image-size: "npm:^7.2.3"
     regl: "npm:@plotly/regl@^2.1.2"
     regl-error2d: "npm:^2.0.12"
-    regl-line2d: "npm:^3.1.2"
+    regl-line2d: "npm:^3.1.3"
     regl-scatter2d: "npm:^3.3.1"
     regl-splom: "npm:^1.0.14"
     strongly-connected-components: "npm:^1.0.1"
@@ -7887,7 +7983,7 @@ __metadata:
     topojson-client: "npm:^3.1.0"
     webgl-context: "npm:^2.2.0"
     world-calendars: "npm:^1.0.3"
-  checksum: 10c0/0001f80362b9f5bd3166f2bda94d9fbbae16f954d22b81450ee9944602ebbe65e63f787b8f2e16ba6edab5f25deb3fad4c28968522c22af8e9d2a62e0f52b49c
+  checksum: 10c0/f013b3a95788c205c73b0975ef97892123b41d8814c49175790ae40714287d39cd498be42af2059ea6f72948f4be056b8cd44c32e7915532db2d313f3359bad7
   languageName: node
   linkType: hard
 
@@ -7917,13 +8013,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13":
-  version: 6.0.13
-  resolution: "postcss-selector-parser@npm:6.0.13"
+"postcss-selector-parser@npm:^6.0.15":
+  version: 6.0.16
+  resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/51f099b27f7c7198ea1826470ef0adfa58b3bd3f59b390fda123baa0134880a5fa9720137b6009c4c1373357b144f700b0edac73335d0067422063129371444e
+  checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf
   languageName: node
   linkType: hard
 
@@ -7945,17 +8041,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.33":
-  version: 8.4.34
-  resolution: "postcss@npm:8.4.34"
-  dependencies:
-    nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.0"
-    source-map-js: "npm:^1.0.2"
-  checksum: 10c0/4d6f072cdfdc1ced16b4336263d830f8b4397fc47b9b382e02f6448fda9386d881aa9d27fbe0dd124f59c76f3a5da4f360919d25dfc818eca50b48f042af35a8
-  languageName: node
-  linkType: hard
-
 "postcss@npm:^8.4.38":
   version: 8.4.38
   resolution: "postcss@npm:8.4.38"
@@ -8101,10 +8186,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"quasar@npm:^2.14.3":
-  version: 2.14.3
-  resolution: "quasar@npm:2.14.3"
-  checksum: 10c0/a2d19dc733da98bae2c89facf368a536b9171ee8f4f064200d3cadd379ecf75a45b78a76dd3f778cebe5b34b65ac07969508731cd138be7c3795364e96ea82aa
+"quasar@npm:^2.16.2":
+  version: 2.16.2
+  resolution: "quasar@npm:2.16.2"
+  checksum: 10c0/f292e1b8c2cc3fcc4324eb2f6af6d15cdde782bce016fca4c8ffa40873e5ec3afb3a3a2e420fad56241c30d30985d9fc6b2c6b98f945f3dbefd857cd73387cb5
   languageName: node
   linkType: hard
 
@@ -8271,9 +8356,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regl-line2d@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "regl-line2d@npm:3.1.2"
+"regl-line2d@npm:^3.1.3":
+  version: 3.1.3
+  resolution: "regl-line2d@npm:3.1.3"
   dependencies:
     array-bounds: "npm:^1.0.1"
     array-find-index: "npm:^1.0.2"
@@ -8282,12 +8367,11 @@ __metadata:
     earcut: "npm:^2.1.5"
     es6-weak-map: "npm:^2.0.3"
     flatten-vertex-data: "npm:^1.0.2"
-    glslify: "npm:^7.0.0"
     object-assign: "npm:^4.1.1"
     parse-rect: "npm:^1.2.0"
     pick-by-alias: "npm:^1.2.0"
     to-float32: "npm:^1.1.0"
-  checksum: 10c0/42d04016d74fcfb888c73300cdc7230e05d780079a5c274a8135f811d0a57efc11bb7dff308ad523a48c9dc1ca945c46eeb9c118d4c0231562292a915fa2c369
+  checksum: 10c0/70673f4b362db65cf878d2008847cb5c6f08c3b0b15c6e4df896f276a6b1b5185aaed2e0248fafe8d2c203d88814f6026060b2656d532d87268151f7c011dabc
   languageName: node
   linkType: hard
 
@@ -8381,13 +8465,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"require-from-string@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "require-from-string@npm:2.0.2"
-  checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2
-  languageName: node
-  linkType: hard
-
 "requireindex@npm:~1.2.0":
   version: 1.2.0
   resolution: "requireindex@npm:1.2.0"
@@ -8583,22 +8660,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "rollup@npm:4.2.0"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.2.0"
-    "@rollup/rollup-android-arm64": "npm:4.2.0"
-    "@rollup/rollup-darwin-arm64": "npm:4.2.0"
-    "@rollup/rollup-darwin-x64": "npm:4.2.0"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.2.0"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.2.0"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.2.0"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.2.0"
-    "@rollup/rollup-linux-x64-musl": "npm:4.2.0"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.2.0"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.2.0"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.2.0"
+"rollup@npm:^4.17.2":
+  version: 4.17.2
+  resolution: "rollup@npm:4.17.2"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.17.2"
+    "@rollup/rollup-android-arm64": "npm:4.17.2"
+    "@rollup/rollup-darwin-arm64": "npm:4.17.2"
+    "@rollup/rollup-darwin-x64": "npm:4.17.2"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.17.2"
+    "@rollup/rollup-linux-arm-musleabihf": "npm:4.17.2"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.17.2"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.17.2"
+    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.17.2"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.17.2"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.17.2"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.17.2"
+    "@rollup/rollup-linux-x64-musl": "npm:4.17.2"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.17.2"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.17.2"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.17.2"
+    "@types/estree": "npm:1.0.5"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
     "@rollup/rollup-android-arm-eabi":
@@ -8611,10 +8693,18 @@ __metadata:
       optional: true
     "@rollup/rollup-linux-arm-gnueabihf":
       optional: true
+    "@rollup/rollup-linux-arm-musleabihf":
+      optional: true
     "@rollup/rollup-linux-arm64-gnu":
       optional: true
     "@rollup/rollup-linux-arm64-musl":
       optional: true
+    "@rollup/rollup-linux-powerpc64le-gnu":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-s390x-gnu":
+      optional: true
     "@rollup/rollup-linux-x64-gnu":
       optional: true
     "@rollup/rollup-linux-x64-musl":
@@ -8629,28 +8719,26 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10c0/8a55437b8af30410b9381ab9e8397bce2f0fe4c76861caf65e7dfb4ce093f4d6faa0777b6a72d2e333217f8474b51e877cf2eb5e8efaed54c1f4924b3c17b337
+  checksum: 10c0/4fa6644e5c7fc4a34f654ea7e209be6c2c5897ed9dd43e7135230137204df748a795c7553804130f6c41da0b71e83f8c35a4a7881d385a77996adee50b609a6e
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.9.6":
-  version: 4.9.6
-  resolution: "rollup@npm:4.9.6"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.9.6"
-    "@rollup/rollup-android-arm64": "npm:4.9.6"
-    "@rollup/rollup-darwin-arm64": "npm:4.9.6"
-    "@rollup/rollup-darwin-x64": "npm:4.9.6"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.9.6"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.9.6"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.9.6"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.9.6"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.9.6"
-    "@rollup/rollup-linux-x64-musl": "npm:4.9.6"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.9.6"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.9.6"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.9.6"
-    "@types/estree": "npm:1.0.5"
+"rollup@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "rollup@npm:4.2.0"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.2.0"
+    "@rollup/rollup-android-arm64": "npm:4.2.0"
+    "@rollup/rollup-darwin-arm64": "npm:4.2.0"
+    "@rollup/rollup-darwin-x64": "npm:4.2.0"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.2.0"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.2.0"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.2.0"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.2.0"
+    "@rollup/rollup-linux-x64-musl": "npm:4.2.0"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.2.0"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.2.0"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.2.0"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
     "@rollup/rollup-android-arm-eabi":
@@ -8667,8 +8755,6 @@ __metadata:
       optional: true
     "@rollup/rollup-linux-arm64-musl":
       optional: true
-    "@rollup/rollup-linux-riscv64-gnu":
-      optional: true
     "@rollup/rollup-linux-x64-gnu":
       optional: true
     "@rollup/rollup-linux-x64-musl":
@@ -8683,7 +8769,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10c0/fcd9ab091cd2e604525ab919137f7868f002e27dc12921a3e09be2c85fa6e477c9dbd7ca54730500622db64e1fa53d1e5e2db3567e273a31d96d594932c8ae3b
+  checksum: 10c0/8a55437b8af30410b9381ab9e8397bce2f0fe4c76861caf65e7dfb4ce093f4d6faa0777b6a72d2e333217f8474b51e877cf2eb5e8efaed54c1f4924b3c17b337
   languageName: node
   linkType: hard
 
@@ -8754,16 +8840,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.70.0":
-  version: 1.70.0
-  resolution: "sass@npm:1.70.0"
+"sass@npm:1.77.0":
+  version: 1.77.0
+  resolution: "sass@npm:1.77.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
+  checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19
   languageName: node
   linkType: hard
 
@@ -8810,6 +8896,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.6.0":
+  version: 7.6.1
+  resolution: "semver@npm:7.6.1"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/fd28315954ffc80204df0cb5c62355160ebf54059f5ffe386e9903162ddf687ed14004c30f6e5347fa695fc77bafa242798af8d351f1d260207f007cfbeccb82
+  languageName: node
+  linkType: hard
+
 "set-function-length@npm:^1.1.1":
   version: 1.1.1
   resolution: "set-function-length@npm:1.1.1"
@@ -8888,17 +8983,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-keyboard-layouts@npm:^3.3.65":
-  version: 3.3.65
-  resolution: "simple-keyboard-layouts@npm:3.3.65"
-  checksum: 10c0/1e26f105f9c8571cafcd7a65d20fe98dfc626ad43749f577a859b1fe559c00ccd9b5a1034890e392fdc71f80fa43badf8ec30ef9c8e32681a9ff6debdb26a742
+"simple-keyboard-layouts@npm:^3.3.102":
+  version: 3.3.102
+  resolution: "simple-keyboard-layouts@npm:3.3.102"
+  checksum: 10c0/00310eb2d89cea1f20384c96a5c0e880eda16fb1b939b76fab1774ccdd1779be5f83ac0d91c4159ed300f3505310733dfb7803c278798776ec4fa0e8a7738650
   languageName: node
   linkType: hard
 
-"simple-keyboard@npm:^3.7.54":
-  version: 3.7.54
-  resolution: "simple-keyboard@npm:3.7.54"
-  checksum: 10c0/f5fb3f1bd417df20fbe59498ab0de8ef3831da6c9122478fb285d02d657c8e2699d960e68606792c2538eb82e149e669a98313f819d669776af13446e33799e9
+"simple-keyboard@npm:^3.7.79":
+  version: 3.7.79
+  resolution: "simple-keyboard@npm:3.7.79"
+  checksum: 10c0/a94d745178473fef98ff13c0e5796a8b1826515b76aa0378ffdff4ca6b4dbe7f05590f44021f75cca1fbac747ecc7f28be22b3b975d1e015d4e3af7de733d4c2
   languageName: node
   linkType: hard
 
@@ -8944,7 +9039,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.2":
   version: 1.0.2
   resolution: "source-map-js@npm:1.0.2"
   checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
@@ -8958,13 +9053,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.6.1, source-map@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "source-map@npm:0.6.1"
-  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
-  languageName: node
-  linkType: hard
-
 "source-map@npm:^0.7.4":
   version: 0.7.4
   resolution: "source-map@npm:0.7.4"
@@ -8972,6 +9060,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map@npm:~0.6.1":
+  version: 0.6.1
+  resolution: "source-map@npm:0.6.1"
+  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
+  languageName: node
+  linkType: hard
+
 "split2@npm:^4.2.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
@@ -9162,12 +9257,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-literal@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "strip-literal@npm:1.3.0"
+"strip-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "strip-literal@npm:2.1.0"
   dependencies:
-    acorn: "npm:^8.10.0"
-  checksum: 10c0/3c0c9ee41eb346e827eede61ef288457f53df30e3e6ff8b94fa81b636933b0c13ca4ea5c97d00a10d72d04be326da99ac819f8769f0c6407ba8177c98344a916
+    js-tokens: "npm:^9.0.0"
+  checksum: 10c0/bc8b8c8346125ae3c20fcdaf12e10a498ff85baf6f69597b4ab2b5fbf2e58cfd2827f1a44f83606b852da99a5f6c8279770046ddea974c510c17c98934c9cc24
   languageName: node
   linkType: hard
 
@@ -9388,10 +9483,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinypool@npm:^0.8.2":
-  version: 0.8.2
-  resolution: "tinypool@npm:0.8.2"
-  checksum: 10c0/8998626614172fc37c394e9a14e701dc437727fc6525488a4d4fd42044a4b2b59d6f076d750cbf5c699f79c58dd4e40599ab09e2f1ae0df4b23516b98c9c3055
+"tinypool@npm:^0.8.3":
+  version: 0.8.4
+  resolution: "tinypool@npm:0.8.4"
+  checksum: 10c0/779c790adcb0316a45359652f4b025958c1dff5a82460fe49f553c864309b12ad732c8288be52f852973bc76317f5e7b3598878aee0beb8a33322c0e72c4a66c
   languageName: node
   linkType: hard
 
@@ -9493,6 +9588,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "ts-api-utils@npm:1.3.0"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c
+  languageName: node
+  linkType: hard
+
 "ts-interface-checker@npm:^0.1.9":
   version: 0.1.13
   resolution: "ts-interface-checker@npm:0.1.13"
@@ -9500,17 +9604,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfck@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "tsconfck@npm:2.1.2"
+"tsconfck@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "tsconfck@npm:3.0.3"
   peerDependencies:
-    typescript: ^4.3.5 || ^5.0.0
+    typescript: ^5.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     tsconfck: bin/tsconfck.js
-  checksum: 10c0/6efc9cbbccdbbcafc86a744a1804fcd8438097c2beaac370444cc413fa1582a019a74002a111e3005b89ca0b0169ace730161864628fc751754e29b335c3c79f
+  checksum: 10c0/d45009230c4caa5fc765bdded96f3b8703a7cdd44a1d63024914b0fb1c4dabf9e94d28cc9f9edccaef9baa7b99adc963502d34943d82fcb07b92e1161ee03c56
   languageName: node
   linkType: hard
 
@@ -9676,23 +9780,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
+"typescript@npm:^5.4.5":
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
+  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.3.3#optional!builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
+"typescript@patch:typescript@npm%3A^5.4.5#optional!builtin<compat/typescript>":
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=d69c25"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
+  checksum: 10c0/9cf4c053893bcf327d101b6c024a55baf05430dc30263f9adb1bf354aeffc11306fe1f23ba2f9a0209674359f16219b5b7d229e923477b94831d07d5a33a4217
   languageName: node
   linkType: hard
 
@@ -9818,17 +9922,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-to-istanbul@npm:^9.2.0":
-  version: 9.2.0
-  resolution: "v8-to-istanbul@npm:9.2.0"
-  dependencies:
-    "@jridgewell/trace-mapping": "npm:^0.3.12"
-    "@types/istanbul-lib-coverage": "npm:^2.0.1"
-    convert-source-map: "npm:^2.0.0"
-  checksum: 10c0/e691ba4dd0dea4a884e52c37dbda30cce6f9eeafe9b26721e449429c6bb0f4b6d1e33fabe7711d0f67f7a34c3bfd56c873f7375bba0b1534e6a2843ce99550e5
-  languageName: node
-  linkType: hard
-
 "vite-jsconfig-paths@npm:^2.0.1":
   version: 2.0.1
   resolution: "vite-jsconfig-paths@npm:2.0.1"
@@ -9843,9 +9936,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-node@npm:1.2.2":
-  version: 1.2.2
-  resolution: "vite-node@npm:1.2.2"
+"vite-node@npm:1.6.0":
+  version: 1.6.0
+  resolution: "vite-node@npm:1.6.0"
   dependencies:
     cac: "npm:^6.7.14"
     debug: "npm:^4.3.4"
@@ -9854,7 +9947,7 @@ __metadata:
     vite: "npm:^5.0.0"
   bin:
     vite-node: vite-node.mjs
-  checksum: 10c0/39a5b9d9c806a012aab208eee0f59e4e12446ec19a4cf149a6459e7ff86491c289e189fda4f55a63b7e37d713f5edbda0e9efed95af4f7ebefa6d39eee093c0b
+  checksum: 10c0/0807e6501ac7763e0efa2b4bd484ce99fb207e92c98624c9f8999d1f6727ac026e457994260fa7fdb7060d87546d197081e46a705d05b0136a38b6f03715cbc2
   languageName: node
   linkType: hard
 
@@ -9908,19 +10001,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-tsconfig-paths@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "vite-tsconfig-paths@npm:4.2.1"
+"vite-tsconfig-paths@npm:^4.3.1":
+  version: 4.3.2
+  resolution: "vite-tsconfig-paths@npm:4.3.2"
   dependencies:
     debug: "npm:^4.1.1"
     globrex: "npm:^0.1.2"
-    tsconfck: "npm:^2.1.0"
+    tsconfck: "npm:^3.0.3"
   peerDependencies:
     vite: "*"
   peerDependenciesMeta:
     vite:
       optional: true
-  checksum: 10c0/982fb89b9e970fa69536688cecef020a7d0df3651364b88dba66297800b81cfbe397dec41b11f9afbd3a0559bf15964ee2b4caf9a308ebd3efc158fffdc401bf
+  checksum: 10c0/f390ac1d1c3992fc5ac50f9274c1090f8b55ab34a89ea88893db9a6924a3b26c9f64bc1163615150ad100749db73b6b2cf1d57f6cd60df6e762ceb5b8ad30024
   languageName: node
   linkType: hard
 
@@ -9964,9 +10057,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.13":
-  version: 5.2.8
-  resolution: "vite@npm:5.2.8"
+"vite@npm:^5.2.11":
+  version: 5.2.11
+  resolution: "vite@npm:5.2.11"
   dependencies:
     esbuild: "npm:^0.20.1"
     fsevents: "npm:~2.3.3"
@@ -10000,21 +10093,20 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/b5717bb00c2570c08ff6d8ed917655e79184efcafa9dd62d52eea19c5d6dfc5a708ec3de9ebc670a7165fc5d401c2bdf1563bb39e2748d8e51e1593d286a9a13
+  checksum: 10c0/664b8d68e4f5152ae16bd2041af1bbaf11c43630ac461835bc31ff7d019913b33e465386e09f66dc1037d7aeefbb06939e0173787c063319bc2bd30c3b9ad8e4
   languageName: node
   linkType: hard
 
-"vitest@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "vitest@npm:1.2.2"
+"vitest@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "vitest@npm:1.6.0"
   dependencies:
-    "@vitest/expect": "npm:1.2.2"
-    "@vitest/runner": "npm:1.2.2"
-    "@vitest/snapshot": "npm:1.2.2"
-    "@vitest/spy": "npm:1.2.2"
-    "@vitest/utils": "npm:1.2.2"
+    "@vitest/expect": "npm:1.6.0"
+    "@vitest/runner": "npm:1.6.0"
+    "@vitest/snapshot": "npm:1.6.0"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
     acorn-walk: "npm:^8.3.2"
-    cac: "npm:^6.7.14"
     chai: "npm:^4.3.10"
     debug: "npm:^4.3.4"
     execa: "npm:^8.0.1"
@@ -10023,17 +10115,17 @@ __metadata:
     pathe: "npm:^1.1.1"
     picocolors: "npm:^1.0.0"
     std-env: "npm:^3.5.0"
-    strip-literal: "npm:^1.3.0"
+    strip-literal: "npm:^2.0.0"
     tinybench: "npm:^2.5.1"
-    tinypool: "npm:^0.8.2"
+    tinypool: "npm:^0.8.3"
     vite: "npm:^5.0.0"
-    vite-node: "npm:1.2.2"
+    vite-node: "npm:1.6.0"
     why-is-node-running: "npm:^2.2.2"
   peerDependencies:
     "@edge-runtime/vm": "*"
     "@types/node": ^18.0.0 || >=20.0.0
-    "@vitest/browser": ^1.0.0
-    "@vitest/ui": ^1.0.0
+    "@vitest/browser": 1.6.0
+    "@vitest/ui": 1.6.0
     happy-dom: "*"
     jsdom: "*"
   peerDependenciesMeta:
@@ -10051,7 +10143,7 @@ __metadata:
       optional: true
   bin:
     vitest: vitest.mjs
-  checksum: 10c0/085cb62146191b32dc98fac1a5b0de6d1c63c44cc1e7946a7d38309dd4135539432ec27b4bfad38ce79736688a0ce20d9b93f58de4ce4a41677cb3c5ca6ad980
+  checksum: 10c0/065da5b8ead51eb174d93dac0cd50042ca9539856dc25e340ea905d668c41961f7e00df3e388e6c76125b2c22091db2e8465f993d0f6944daf9598d549e562e7
   languageName: node
   linkType: hard
 
@@ -10126,10 +10218,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-component-type-helpers@npm:^1.8.21":
-  version: 1.8.27
-  resolution: "vue-component-type-helpers@npm:1.8.27"
-  checksum: 10c0/3403d70951e422162321e810f54f23f11ee5d2642631d2ca2cb1de18e5d35a0b7b05dd1f9bd02a0ae77dfa0b80751d826865d98f928ae6d6fbce9303406c9820
+"vue-component-type-helpers@npm:^2.0.0":
+  version: 2.0.16
+  resolution: "vue-component-type-helpers@npm:2.0.16"
+  checksum: 10c0/5f5b100411f356d6e6c88c51e2f1cfe554362c94a6b36bc7a3da5bfb950aae243837e742fbdcc5fb7490d9230cc530f0a975080e0a2e31f9029c8cf2a86cbf34
   languageName: node
   linkType: hard
 
@@ -10166,6 +10258,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-eslint-parser@npm:^9.4.2":
+  version: 9.4.2
+  resolution: "vue-eslint-parser@npm:9.4.2"
+  dependencies:
+    debug: "npm:^4.3.4"
+    eslint-scope: "npm:^7.1.1"
+    eslint-visitor-keys: "npm:^3.3.0"
+    espree: "npm:^9.3.1"
+    esquery: "npm:^1.4.0"
+    lodash: "npm:^4.17.21"
+    semver: "npm:^7.3.6"
+  peerDependencies:
+    eslint: ">=6.0.0"
+  checksum: 10c0/79593073adbce8971565133c70a203f12f0be0f8c5e3a4063796fd56e5de64f1f3ad7f91be5a787a7a3fe751306ed22086ee8369d52725be95f452827ce670de
+  languageName: node
+  linkType: hard
+
 "vue-global-type-gen@npm:^1.1.0":
   version: 1.1.0
   resolution: "vue-global-type-gen@npm:1.1.0"
@@ -10180,14 +10289,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-router@npm:^4.2.5":
-  version: 4.2.5
-  resolution: "vue-router@npm:4.2.5"
+"vue-router@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "vue-router@npm:4.3.2"
   dependencies:
-    "@vue/devtools-api": "npm:^6.5.0"
+    "@vue/devtools-api": "npm:^6.5.1"
   peerDependencies:
     vue: ^3.2.0
-  checksum: 10c0/63e51f437a1f10a97fce97c04cde3f87958049c5e20f8b238b66b9a9080c99db0124e680ed0e9921af1f6d81c00bf181e280e36e2370cafea581539334d895ef
+  checksum: 10c0/63d5be4a983622e130c1ebe6e26dd17dee2346d77b35ef3f09ee0d8693fd38ad2387551c2db87a5cb258348dbc24dd815f48b4a55cc3ccb680c81aa4837ca88e
   languageName: node
   linkType: hard
 
@@ -10201,36 +10310,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-tsc@npm:^1.8.27":
-  version: 1.8.27
-  resolution: "vue-tsc@npm:1.8.27"
+"vue-tsc@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "vue-tsc@npm:2.0.16"
   dependencies:
-    "@volar/typescript": "npm:~1.11.1"
-    "@vue/language-core": "npm:1.8.27"
+    "@volar/typescript": "npm:~2.2.0"
+    "@vue/language-core": "npm:2.0.16"
     semver: "npm:^7.5.4"
   peerDependencies:
     typescript: "*"
   bin:
     vue-tsc: bin/vue-tsc.js
-  checksum: 10c0/6e6ba37eb7a0c8b9cc613225729c74edf8bd0632d265e62aca28b1969b5615b9dbe2de03aefb8aed2e26fdbd4b93f134785c8ab0095f92c2469192e2db5d09fd
+  checksum: 10c0/00a040efe77fa0970e4a4f1c55740bf7c8106a071e4bc5157d0fe84c4873bbfeccab535e9c2f2c0d9649b70affeeb348d6bbe67689fe932480796324f488e5a7
   languageName: node
   linkType: hard
 
-"vue@npm:^3.4.15":
-  version: 3.4.15
-  resolution: "vue@npm:3.4.15"
+"vue@npm:^3.4.27":
+  version: 3.4.27
+  resolution: "vue@npm:3.4.27"
   dependencies:
-    "@vue/compiler-dom": "npm:3.4.15"
-    "@vue/compiler-sfc": "npm:3.4.15"
-    "@vue/runtime-dom": "npm:3.4.15"
-    "@vue/server-renderer": "npm:3.4.15"
-    "@vue/shared": "npm:3.4.15"
+    "@vue/compiler-dom": "npm:3.4.27"
+    "@vue/compiler-sfc": "npm:3.4.27"
+    "@vue/runtime-dom": "npm:3.4.27"
+    "@vue/server-renderer": "npm:3.4.27"
+    "@vue/shared": "npm:3.4.27"
   peerDependencies:
     typescript: "*"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/7410135553f38d390ece3d5edcb6e2c158c3717e002a4e0766a95f6054f0ab7a8ce69000f5e29ff41f631f3cc7211123fbe34ab591b43b14f4af77c4ac01d116
+  checksum: 10c0/73349e05cf554891d5e0076be10083150c92831c1cffdeee1e25c2222a8a4d8291630825a897049add753c4925e1c916c3614fe8d9c0392d9ff0186e553fe24b
   languageName: node
   linkType: hard
 
@@ -10284,15 +10393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-encoding@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "whatwg-encoding@npm:2.0.0"
-  dependencies:
-    iconv-lite: "npm:0.6.3"
-  checksum: 10c0/91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e
-  languageName: node
-  linkType: hard
-
 "whatwg-encoding@npm:^3.1.1":
   version: 3.1.1
   resolution: "whatwg-encoding@npm:3.1.1"
@@ -10412,6 +10512,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"worker-timers-broker@npm:^6.1.8":
+  version: 6.1.8
+  resolution: "worker-timers-broker@npm:6.1.8"
+  dependencies:
+    "@babel/runtime": "npm:^7.24.5"
+    fast-unique-numbers: "npm:^8.0.13"
+    tslib: "npm:^2.6.2"
+    worker-timers-worker: "npm:^7.0.71"
+  checksum: 10c0/95257411662bd4f23b17f33fc17872d61c4bfc5ea4f438c370b525d40dc33a4fd7d89e2efb60b38a6d42b5c6f36ab5a9ca8220a6dab1aabb2fc9b7346037dbb7
+  languageName: node
+  linkType: hard
+
 "worker-timers-worker@npm:^7.0.64":
   version: 7.0.64
   resolution: "worker-timers-worker@npm:7.0.64"
@@ -10422,6 +10534,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"worker-timers-worker@npm:^7.0.71":
+  version: 7.0.71
+  resolution: "worker-timers-worker@npm:7.0.71"
+  dependencies:
+    "@babel/runtime": "npm:^7.24.5"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/3e1eb4f500688540554bcd20d5abd4bceb80f2ee085aef6558a081c2fc3e1aa0dec9426e3f447cd811cd42a60d9ba13da951658378519f6ca4d2571c9bb525b5
+  languageName: node
+  linkType: hard
+
 "worker-timers@npm:^7.0.78":
   version: 7.0.80
   resolution: "worker-timers@npm:7.0.80"
@@ -10434,6 +10556,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"worker-timers@npm:^7.1.4":
+  version: 7.1.8
+  resolution: "worker-timers@npm:7.1.8"
+  dependencies:
+    "@babel/runtime": "npm:^7.24.5"
+    tslib: "npm:^2.6.2"
+    worker-timers-broker: "npm:^6.1.8"
+    worker-timers-worker: "npm:^7.0.71"
+  checksum: 10c0/ca36aee2bf7b9fd8a2d2c6da237f1bb8e6c9af09b14113532606966fd6c5df9cb903e321525a11d16642a8249e56e2d22c03ebbcb0cf69a23bb1e43f840dfe94
+  languageName: node
+  linkType: hard
+
 "world-calendars@npm:^1.0.3":
   version: 1.0.3
   resolution: "world-calendars@npm:1.0.3"

From 343df44a6d5d7f5c525bc79c736b35ad6e855321 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Fri, 17 May 2024 18:23:51 +0200
Subject: [PATCH 05/27] Add rough support for AnalogGpioModule and
 TempSensorAnalog

---
 firmware.ini                                  |  12 +-
 package.json                                  |   2 +-
 src/auto-import.d.ts                          |   4 +-
 .../BrewKettle/BrewKettleIoTask.vue           |   2 +-
 .../quickstart/Ferment/FermentIoTask.vue      |   2 +-
 .../quickstart/Fridge/FridgeIoTask.vue        |   2 +-
 .../quickstart/Glycol/GlycolIoTask.vue        |   2 +-
 src/plugins/quickstart/Herms/HermsIoTask.vue  |   2 +-
 src/plugins/quickstart/Rims/RimsIoTask.vue    |   2 +-
 .../form/AnalogChannelSelectField.vue         | 101 ++++++++++
 .../components/widget/AnalogArrayEditor.vue   |  31 +++
 ...WireGpioEditor.vue => GpioArrayEditor.vue} |   0
 .../spark/components/widget/IoArray.vue       |   4 +-
 .../spark/components/widget/ValveArray.vue    |   4 +-
 src/plugins/spark/const.ts                    |  29 +++
 .../AnalogGpioModuleWidget.vue                | 190 ++++++++++++++++++
 .../spark/features/AnalogGpioModule/index.ts  |  78 +++++++
 .../DigitalActuator/DigitalActuatorWidget.vue |   4 +-
 .../DigitalInput/DigitalInputWidget.vue       |   4 +-
 .../spark/features/FastPwm/FastPwmWidget.vue  |   4 +-
 .../features/MotorValve/MotorValveWidget.vue  |   4 +-
 .../OneWireGpioModuleWidget.vue               |   2 +-
 .../spark/features/OneWireGpioModule/index.ts |  12 +-
 .../TempSensorAnalogWidget.vue                | 119 +++++++++++
 .../spark/features/TempSensorAnalog/index.ts  |  83 ++++++++
 src/plugins/spark/features/index.ts           |   4 +
 src/plugins/spark/utils/configuration.ts      |  77 ++++++-
 yarn.lock                                     |   8 +-
 28 files changed, 743 insertions(+), 45 deletions(-)
 create mode 100644 src/plugins/spark/components/form/AnalogChannelSelectField.vue
 create mode 100644 src/plugins/spark/components/widget/AnalogArrayEditor.vue
 rename src/plugins/spark/components/widget/{OneWireGpioEditor.vue => GpioArrayEditor.vue} (100%)
 create mode 100644 src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue
 create mode 100644 src/plugins/spark/features/AnalogGpioModule/index.ts
 create mode 100644 src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
 create mode 100644 src/plugins/spark/features/TempSensorAnalog/index.ts

diff --git a/firmware.ini b/firmware.ini
index ffd93a17a..da4129369 100644
--- a/firmware.ini
+++ b/firmware.ini
@@ -1,8 +1,8 @@
 [FIRMWARE]
-firmware_version=61cf28a6
-firmware_date=2024-05-08
-firmware_sha=61cf28a662895d1aa2184733fff19fc46ce1ca65
-proto_version=2e7314a6
-proto_date=2024-05-08
-proto_sha=2e7314a6a50cf459f49e725444c8e5cacd2bcd77
+firmware_version=7debb0ff
+firmware_date=2024-05-17
+firmware_sha=7debb0ff847e26973987fe974b96443f0de06eb4
+proto_version=085aa575
+proto_date=2024-05-17
+proto_sha=085aa5756728fe8815c434d6d2a61976b642f4b4
 system_version=3.2.0
diff --git a/package.json b/package.json
index 46416c4a7..f58e006df 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.6.8",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
diff --git a/src/auto-import.d.ts b/src/auto-import.d.ts
index 6cf0ad6e5..851bab023 100644
--- a/src/auto-import.d.ts
+++ b/src/auto-import.d.ts
@@ -12,11 +12,12 @@ declare module '@vue/runtime-core' {
     UnknownBlockWidget: typeof import('src/plugins/spark/components/widget/UnknownBlockWidget.vue').default;
     RelationsDialog: typeof import('src/plugins/spark/components/widget/RelationsDialog.vue').default;
     RelationsDiagram: typeof import('src/plugins/spark/components/widget/RelationsDiagram.vue').default;
-    OneWireGpioEditor: typeof import('src/plugins/spark/components/widget/OneWireGpioEditor.vue').default;
     IoArray: typeof import('src/plugins/spark/components/widget/IoArray.vue').default;
     GpioChannelDialog: typeof import('src/plugins/spark/components/widget/GpioChannelDialog.vue').default;
+    GpioArrayEditor: typeof import('src/plugins/spark/components/widget/GpioArrayEditor.vue').default;
     BlockWidgetWrapper: typeof import('src/plugins/spark/components/widget/BlockWidgetWrapper.vue').default;
     BlockGraph: typeof import('src/plugins/spark/components/widget/BlockGraph.vue').default;
+    AnalogArrayEditor: typeof import('src/plugins/spark/components/widget/AnalogArrayEditor.vue').default;
     BlockWidgetToolbar: typeof import('src/plugins/spark/components/toolbar/BlockWidgetToolbar.vue').default;
     BlockActions: typeof import('src/plugins/spark/components/toolbar/BlockActions.vue').default;
     SparkWifiDialog: typeof import('src/plugins/spark/components/menu/SparkWifiDialog.vue').default;
@@ -49,6 +50,7 @@ declare module '@vue/runtime-core' {
     AnalogConstraintsValEdit: typeof import('src/plugins/spark/components/form/AnalogConstraintsValEdit.vue').default;
     AnalogConstraintsField: typeof import('src/plugins/spark/components/form/AnalogConstraintsField.vue').default;
     AnalogConstraintsEditor: typeof import('src/plugins/spark/components/form/AnalogConstraintsEditor.vue').default;
+    AnalogChannelSelectField: typeof import('src/plugins/spark/components/form/AnalogChannelSelectField.vue').default;
     QuickstartTaskMaster: typeof import('src/plugins/quickstart/components/QuickstartTaskMaster.vue').default;
     QuickstartServiceTask: typeof import('src/plugins/quickstart/components/QuickstartServiceTask.vue').default;
     QuickstartSensorField: typeof import('src/plugins/quickstart/components/QuickstartSensorField.vue').default;
diff --git a/src/plugins/quickstart/BrewKettle/BrewKettleIoTask.vue b/src/plugins/quickstart/BrewKettle/BrewKettleIoTask.vue
index c37099f12..bedf48b9a 100644
--- a/src/plugins/quickstart/BrewKettle/BrewKettleIoTask.vue
+++ b/src/plugins/quickstart/BrewKettle/BrewKettleIoTask.vue
@@ -47,7 +47,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/quickstart/Ferment/FermentIoTask.vue b/src/plugins/quickstart/Ferment/FermentIoTask.vue
index 8199c022c..051ff9279 100644
--- a/src/plugins/quickstart/Ferment/FermentIoTask.vue
+++ b/src/plugins/quickstart/Ferment/FermentIoTask.vue
@@ -51,7 +51,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/quickstart/Fridge/FridgeIoTask.vue b/src/plugins/quickstart/Fridge/FridgeIoTask.vue
index b2e40dcf3..4c201292e 100644
--- a/src/plugins/quickstart/Fridge/FridgeIoTask.vue
+++ b/src/plugins/quickstart/Fridge/FridgeIoTask.vue
@@ -48,7 +48,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/quickstart/Glycol/GlycolIoTask.vue b/src/plugins/quickstart/Glycol/GlycolIoTask.vue
index a6487485d..da89e4047 100644
--- a/src/plugins/quickstart/Glycol/GlycolIoTask.vue
+++ b/src/plugins/quickstart/Glycol/GlycolIoTask.vue
@@ -61,7 +61,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/quickstart/Herms/HermsIoTask.vue b/src/plugins/quickstart/Herms/HermsIoTask.vue
index bbcc65e16..ab22ba2d9 100644
--- a/src/plugins/quickstart/Herms/HermsIoTask.vue
+++ b/src/plugins/quickstart/Herms/HermsIoTask.vue
@@ -51,7 +51,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/quickstart/Rims/RimsIoTask.vue b/src/plugins/quickstart/Rims/RimsIoTask.vue
index 05b5a6281..9982ee6c1 100644
--- a/src/plugins/quickstart/Rims/RimsIoTask.vue
+++ b/src/plugins/quickstart/Rims/RimsIoTask.vue
@@ -51,7 +51,7 @@ function taskDone(): void {
       <div class="text-subtitle1">
         Position {{ change.modulePosition }}: GPIO Module {{ change.blockId }}
       </div>
-      <OneWireGpioEditor v-model:channels="change.channels" />
+      <GpioArrayEditor v-model:channels="change.channels" />
     </q-card-section>
     <template #actions>
       <q-btn
diff --git a/src/plugins/spark/components/form/AnalogChannelSelectField.vue b/src/plugins/spark/components/form/AnalogChannelSelectField.vue
new file mode 100644
index 000000000..35a8236c9
--- /dev/null
+++ b/src/plugins/spark/components/form/AnalogChannelSelectField.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import {
+  AnalogArrayInterfaceBlock,
+  BlockIntfType,
+  ChannelCapabilities,
+  Link,
+} from 'brewblox-proto/ts';
+import { computed } from 'vue';
+import { useSparkStore } from '@/plugins/spark/store';
+import { channelName } from '@/plugins/spark/utils/formatting';
+import { isBlockCompatible } from '@/plugins/spark/utils/info';
+import { bloxLink } from '@/utils/link';
+import { prettyLink } from '@/utils/quantity';
+
+interface ChannelAddress {
+  analogDevice: Link;
+  analogChannel: number;
+}
+
+interface Props {
+  serviceId: string;
+  modelValue: ChannelAddress;
+  capabilities?: ChannelCapabilities;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  capabilities: ChannelCapabilities.CHAN_SUPPORTS_NONE,
+});
+
+const emit = defineEmits<{
+  'update:modelValue': [payload: ChannelAddress];
+}>();
+
+const sparkStore = useSparkStore();
+
+const model = computed<string | null>({
+  get: () => {
+    const { analogDevice, analogChannel } = props.modelValue;
+    return analogDevice.id && analogChannel
+      ? `${analogDevice.id}/${analogChannel}`
+      : '';
+  },
+  set: (v) => {
+    if (v) {
+      const [blockId, channelId] = v.split('/');
+      emit('update:modelValue', {
+        analogDevice: bloxLink(blockId),
+        analogChannel: Number(channelId),
+      });
+    } else {
+      emit('update:modelValue', {
+        analogDevice: bloxLink(null),
+        analogChannel: 0,
+      });
+    }
+  },
+});
+
+const channelLabel = computed<string>(() => {
+  const block = sparkStore.blockByLink(
+    props.serviceId,
+    props.modelValue.analogDevice,
+  );
+  return channelName(block, props.modelValue.analogChannel) ?? '';
+});
+
+const channelOpts = computed<SelectOption[]>(() =>
+  sparkStore
+    .blocksByService(props.serviceId)
+    .filter((block): block is AnalogArrayInterfaceBlock =>
+      isBlockCompatible(block, BlockIntfType.AnalogArrayInterface),
+    )
+    .flatMap((block: AnalogArrayInterfaceBlock) =>
+      block.data.analogChannels.map((analogChannel) => ({
+        block,
+        analogChannel,
+      })),
+    )
+    .map(({ block, analogChannel }) => ({
+      label:
+        `<b>${block.id}</b> ${channelName(block, analogChannel.id)}` +
+        (analogChannel.claimedBy.id
+          ? ` <small>(replace ${analogChannel.claimedBy.id})</small>`
+          : ''),
+      value: `${block.id}/${analogChannel.id}`,
+      html: true,
+    })),
+);
+</script>
+
+<template>
+  <SelectField
+    v-model="model"
+    :options="channelOpts"
+    :select-props="{ displayValueHtml: true }"
+  >
+    <template #value>
+      {{ prettyLink(modelValue.analogDevice) }} {{ channelLabel }}
+    </template>
+  </SelectField>
+</template>
diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
new file mode 100644
index 000000000..42333a3df
--- /dev/null
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import { AnalogModuleChannel } from 'brewblox-proto/ts';
+
+interface Props {
+  channels: AnalogModuleChannel[];
+}
+
+defineProps<Props>();
+</script>
+
+<template>
+  <div class="column q-gutter-y-sm">
+    <div
+      v-for="channel in channels"
+      :key="`channel-${channel.id}`"
+      class="row q-gutter-sm"
+    >
+      <NumberField
+        v-model="channel.id"
+        label="ID"
+        readonly
+      />
+      <LabeledField
+        label="Sensor Type"
+        readonly
+      >
+        {{ channel.sensorType }}
+      </LabeledField>
+    </div>
+  </div>
+</template>
diff --git a/src/plugins/spark/components/widget/OneWireGpioEditor.vue b/src/plugins/spark/components/widget/GpioArrayEditor.vue
similarity index 100%
rename from src/plugins/spark/components/widget/OneWireGpioEditor.vue
rename to src/plugins/spark/components/widget/GpioArrayEditor.vue
diff --git a/src/plugins/spark/components/widget/IoArray.vue b/src/plugins/spark/components/widget/IoArray.vue
index f312b766a..0514e53c3 100644
--- a/src/plugins/spark/components/widget/IoArray.vue
+++ b/src/plugins/spark/components/widget/IoArray.vue
@@ -16,7 +16,7 @@ import { computed } from 'vue';
 import { useBlockWidget } from '@/plugins/spark/composables';
 import { PWM_SELECT_OPTIONS } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 import {
   channelName,
   prettyLimitations,
@@ -68,7 +68,7 @@ async function replaceActuator(
   channel: EditableChannel,
   link: Link,
 ): Promise<void> {
-  setExclusiveChannelActuator(
+  setExclusiveIoChannelClaimer(
     sparkStore.blockByLink(serviceId, link),
     bloxLink(block.value.id),
     channel.id,
diff --git a/src/plugins/spark/components/widget/ValveArray.vue b/src/plugins/spark/components/widget/ValveArray.vue
index 61a4a88e7..f9889e1d3 100644
--- a/src/plugins/spark/components/widget/ValveArray.vue
+++ b/src/plugins/spark/components/widget/ValveArray.vue
@@ -11,7 +11,7 @@ import {
 import { computed } from 'vue';
 import { useBlockWidget } from '@/plugins/spark/composables';
 import { useSparkStore } from '@/plugins/spark/store';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 import {
   channelName,
   prettyLimitations,
@@ -42,7 +42,7 @@ async function replaceActuator(
   channel: EditableChannel,
   link: Link,
 ): Promise<void> {
-  setExclusiveChannelActuator(
+  setExclusiveIoChannelClaimer(
     sparkStore.blockByLink(serviceId, link),
     bloxLink(block.value.id),
     channel.id,
diff --git a/src/plugins/spark/const.ts b/src/plugins/spark/const.ts
index c967cfce6..f14f957ff 100644
--- a/src/plugins/spark/const.ts
+++ b/src/plugins/spark/const.ts
@@ -1,6 +1,7 @@
 import {
   AnalogCompareOp,
   AnalogConstraintKey,
+  AnalogSensorType,
   AnyConstraintKey,
   DigitalCompareOp,
   DigitalConstraintKey,
@@ -11,6 +12,8 @@ import {
   PwmFrequency,
   SensorCombiFunc,
   SequenceStoreMode,
+  TempSensorAnalogSpec,
+  TempSensorAnalogType,
   TransitionDurationPreset,
   ValveState,
 } from 'brewblox-proto/ts';
@@ -145,3 +148,29 @@ export const ENUM_LABELS_STORE_MODE: EnumLabels<SequenceStoreMode> = {
   AT_FIRST_INSTRUCTION_NEVER_ENABLED:
     'Go to first instruction and disable sequence',
 };
+
+export const ENUM_LABELS_TEMP_SENSOR_ANALOG_TYPE: EnumLabels<TempSensorAnalogType> =
+  {
+    TEMP_SENSOR_TYPE_NOT_SET: 'Not set',
+    TEMP_SENSOR_TYPE_RTD_2WIRE: 'RTD (two wire)',
+    TEMP_SENSOR_TYPE_RTD_3WIRE: 'RTD (three wire)',
+    TEMP_SENSOR_TYPE_RTD_4WIRE: 'RTD (four wire)',
+  };
+
+export const ENUM_LABELS_TEMP_SENSOR_ANALOG_SPEC: EnumLabels<TempSensorAnalogSpec> =
+  {
+    SPEC_NOT_SET: 'Not set',
+    SPEC_PT100_385: 'PT100 (385)',
+    SPEC_PT100_392: 'PT100 (392)',
+    SPEC_PT1000_385: 'PT1000 (385)',
+    SPEC_PT1000_392: 'PT1000 (392)',
+  };
+
+export const ENUM_LABELS_ANALOG_SENSOR_TYPE: EnumLabels<AnalogSensorType> = {
+  ANALOG_SENSOR_TYPE_NONE: 'None',
+  ANALOG_SENSOR_TYPE_STRAIN_GAUGE: 'Strain gauge',
+  ANALOG_SENSOR_TYPE_RTD_2WIRE: 'RTD (two wire)',
+  ANALOG_SENSOR_TYPE_RTD_3WIRE: 'RTD (three wire)',
+  ANALOG_SENSOR_TYPE_RTD_4WIRE: 'RTD (four wire)',
+  ANALOG_SENSOR_TYPE_RTD_3WIRE_LS: 'RTD (three wire LS)',
+};
diff --git a/src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue b/src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue
new file mode 100644
index 000000000..3dc8c4a00
--- /dev/null
+++ b/src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue
@@ -0,0 +1,190 @@
+<script setup lang="ts">
+import {
+  AnalogGpioModuleBlock,
+  AnalogModuleChannel,
+  GpioErrorFlags,
+  GpioModuleChannel,
+  GpioPins,
+} from 'brewblox-proto/ts';
+import { computed } from 'vue';
+import { useContext } from '@/composables';
+import { useBlockWidget } from '@/plugins/spark/composables';
+import { createDialogPromise } from '@/utils/dialog';
+
+/**
+ * Converts GpioPins bitmask to list of 1-indexed pin numbers
+ */
+function listedPins(pins: GpioPins): number[] {
+  return [...Array(8).keys()].filter((i) => (1 << i) & pins).map((i) => i + 1);
+}
+
+const { context } = useContext.setup();
+const { block, patchBlock } = useBlockWidget.setup<AnalogGpioModuleBlock>();
+
+const power = computed<boolean>({
+  get: () => block.value.data.useExternalPower,
+  set: async (useExternalPower) => {
+    const ok =
+      !useExternalPower ||
+      (await createDialogPromise({
+        component: 'ConfirmDialog',
+        componentProps: {
+          title: 'Switch to external power',
+          message:
+            'If enabled, all channels on this module will use the external power supply.' +
+            ' Are you sure?',
+        },
+      }));
+    if (ok) {
+      patchBlock({ useExternalPower });
+    }
+  },
+});
+
+const channels = computed<GpioModuleChannel[]>({
+  get: () => block.value.data.channels,
+  set: (channels) => patchBlock({ channels }),
+});
+
+const analogChannels = computed<AnalogModuleChannel[]>({
+  get: () => block.value.data.analogChannels,
+  set: (analogChannels) => patchBlock({ analogChannels }),
+});
+
+const inputPins = computed<GpioPins>(() =>
+  block.value.data.channels
+    .filter((chan) => chan.deviceType.includes('DEV_DETECT'))
+    .reduce(
+      (pins: GpioPins, chan: GpioModuleChannel) => pins | chan.pinsMask,
+      GpioPins.NONE,
+    ),
+);
+
+const errors = computed<string[]>(() => {
+  const values: string[] = [];
+  const { moduleStatus, overCurrent, openLoad } = block.value.data.status;
+  if (overCurrent !== GpioPins.NONE) {
+    values.push(
+      'ERROR: Overcurrent on pin ' + listedPins(overCurrent).toString(),
+    );
+  } else if (moduleStatus & GpioErrorFlags.OVERCURRENT) {
+    values.push('ERROR: Overcurrent');
+  }
+  if (moduleStatus & GpioErrorFlags.OVERVOLTAGE) {
+    values.push('ERROR: Overvoltage');
+  }
+  if (moduleStatus & GpioErrorFlags.UNDERVOLTAGE_LOCKOUT) {
+    values.push('ERROR: Undervoltage');
+  }
+  if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_SHUTDOWN) {
+    values.push('ERROR: Overtemperature');
+  } else if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_WARNING) {
+    values.push('WARNING: Overtemperature');
+  }
+  if (moduleStatus & GpioErrorFlags.POWER_ON_RESET) {
+    values.push('ERROR: Not yet initialized (power on reset)');
+  }
+  if (moduleStatus & GpioErrorFlags.SPI_ERROR) {
+    values.push('ERROR: SPI error');
+  }
+  if (moduleStatus & GpioErrorFlags.OPEN_LOAD) {
+    const relevantPins = ~inputPins.value & openLoad;
+    if (relevantPins != GpioPins.NONE) {
+      values.push(
+        'WARNING: Open Load on pin ' + listedPins(relevantPins).toString(),
+      );
+    }
+  }
+  return values;
+});
+</script>
+
+<template>
+  <Card>
+    <template #toolbar>
+      <BlockWidgetToolbar has-mode-toggle />
+    </template>
+
+    <CardWarning v-if="errors.length">
+      <template #message>
+        <div
+          v-for="e in errors"
+          :key="`error-${e}`"
+        >
+          {{ e }}
+        </div>
+      </template>
+    </CardWarning>
+
+    <div class="widget-body">
+      <div class="row q-gutter-sm">
+        <LabeledField
+          label="Module position"
+          class="col-grow"
+        >
+          {{ block.data.modulePosition }}
+        </LabeledField>
+      </div>
+
+      <GpioArrayEditor
+        v-model:channels="channels"
+        :error-pins="block.data.status.overCurrent"
+      />
+
+      <AnalogArrayEditor v-model:channels="analogChannels" />
+
+      <div class="col-break" />
+
+      <QuantityField
+        v-if="block.data.baroPressure != undefined"
+        :model-value="block.data.baroPressure"
+        label="Barometric pressure"
+        class="col-grow"
+        readonly
+      />
+
+      <NumberField
+        v-if="block.data.baroTemperature != undefined"
+        :model-value="block.data.baroTemperature"
+        label="Barometric temperature"
+        class="col-grow"
+        readonly
+      />
+
+      <template v-if="context.mode === 'Full'">
+        <q-separator inset />
+
+        <div class="column q-gutter-sm">
+          <div>
+            All channels in a module use the same power source. This is either
+            5V, or the external power supply.
+          </div>
+          <div>
+            There are two ways to attach an external power source: connected to
+            the two right-most pins in any GPIO module, or using a Power over
+            Ethernet (PoE) adapter. <br />
+            Any external power supply is a valid source for all modules.
+          </div>
+        </div>
+        <LabeledField label="Module power source">
+          <q-btn-group
+            outline
+            class="fit"
+            @click="power = !power"
+          >
+            <q-btn
+              outline
+              label="5V"
+              :color="power ? '' : 'primary'"
+            />
+            <q-btn
+              outline
+              label="External"
+              :color="power ? 'primary' : ''"
+            />
+          </q-btn-group>
+        </LabeledField>
+      </template>
+    </div>
+  </Card>
+</template>
diff --git a/src/plugins/spark/features/AnalogGpioModule/index.ts b/src/plugins/spark/features/AnalogGpioModule/index.ts
new file mode 100644
index 000000000..bca337081
--- /dev/null
+++ b/src/plugins/spark/features/AnalogGpioModule/index.ts
@@ -0,0 +1,78 @@
+import {
+  AnalogGpioModuleBlock,
+  BlockType,
+  GpioErrorFlags,
+  GpioPins,
+} from 'brewblox-proto/ts';
+import { Plugin } from 'vue';
+import { discoveredBlockFeature } from '@/plugins/spark/generic';
+import { useBlockSpecStore } from '@/plugins/spark/store';
+import { BlockSpec } from '@/plugins/spark/types';
+import { useFeatureStore, WidgetFeature } from '@/store/features';
+import { cref } from '@/utils/component-ref';
+import widget from './AnalogGpioModuleWidget.vue';
+
+const type = BlockType.AnalogGpioModule;
+const title = 'Analog GPIO Module';
+
+const plugin: Plugin = {
+  install(app) {
+    const specStore = useBlockSpecStore();
+    const featureStore = useFeatureStore();
+
+    const blockSpec: BlockSpec<AnalogGpioModuleBlock> = {
+      type,
+      title,
+      hasRelations: true,
+      generate: (): AnalogGpioModuleBlock['data'] => ({
+        channels: [],
+        modulePosition: 0,
+        useExternalPower: false,
+        status: {
+          moduleStatus: GpioErrorFlags.NONE,
+          pullUpDesired: GpioPins.NONE,
+          pullUpStatus: GpioPins.NONE,
+          pullUpWhenActive: GpioPins.NONE,
+          pullUpWhenInactive: GpioPins.NONE,
+          pullDownDesired: GpioPins.NONE,
+          pullDownStatus: GpioPins.NONE,
+          pullDownWhenActive: GpioPins.NONE,
+          pullDownWhenInactive: GpioPins.NONE,
+          overCurrent: GpioPins.NONE,
+          openLoad: GpioPins.NONE,
+          faultsHistory5m: GpioErrorFlags.NONE,
+          faultsHistory60m: GpioErrorFlags.NONE,
+        },
+        analogChannels: [],
+      }),
+      analyze: (block: AnalogGpioModuleBlock) => {
+        const { moduleStatus } = block.data.status;
+        switch (moduleStatus) {
+          case GpioErrorFlags.NONE:
+          case GpioErrorFlags.OPEN_LOAD:
+            return 'Active';
+          default:
+            return 'Invalid';
+        }
+      },
+    };
+
+    const feature: WidgetFeature = {
+      ...discoveredBlockFeature,
+      id: type,
+      title,
+      role: 'Output',
+      component: cref(app, widget),
+      widgetSize: {
+        cols: 4,
+        rows: 4,
+      },
+      experimental: true,
+    };
+
+    specStore.addBlockSpec(blockSpec);
+    featureStore.addWidgetFeature(feature);
+  },
+};
+
+export default plugin;
diff --git a/src/plugins/spark/features/DigitalActuator/DigitalActuatorWidget.vue b/src/plugins/spark/features/DigitalActuator/DigitalActuatorWidget.vue
index 596e6c30d..0ec6b6240 100644
--- a/src/plugins/spark/features/DigitalActuator/DigitalActuatorWidget.vue
+++ b/src/plugins/spark/features/DigitalActuator/DigitalActuatorWidget.vue
@@ -10,7 +10,7 @@ import { useContext } from '@/composables';
 import { useBlockWidget } from '@/plugins/spark/composables';
 import { ENUM_LABELS_TRANSITION_PRESET } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 import { selectable } from '@/utils/collections';
 import { prettyQty } from '@/utils/quantity';
 
@@ -98,7 +98,7 @@ const softStartSupported = computed<boolean>(() => {
           class="col-grow"
           @update:model-value="
             ({ hwDevice, channel }) =>
-              setExclusiveChannelActuator(block, hwDevice, channel)
+              setExclusiveIoChannelClaimer(block, hwDevice, channel)
           "
         />
         <LabeledField
diff --git a/src/plugins/spark/features/DigitalInput/DigitalInputWidget.vue b/src/plugins/spark/features/DigitalInput/DigitalInputWidget.vue
index 9a55816b4..b07aadc2c 100644
--- a/src/plugins/spark/features/DigitalInput/DigitalInputWidget.vue
+++ b/src/plugins/spark/features/DigitalInput/DigitalInputWidget.vue
@@ -6,7 +6,7 @@ import {
 } from 'brewblox-proto/ts';
 import { useContext } from '@/composables';
 import { useBlockWidget } from '@/plugins/spark/composables';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 
 const behaviorOpts: SelectOption<ToggleBehavior>[] = [
   { value: ToggleBehavior.DIRECT, label: 'Direct' },
@@ -60,7 +60,7 @@ const { serviceId, block, patchBlock } =
           class="col-grow"
           @update:model-value="
             ({ hwDevice, channel }) =>
-              setExclusiveChannelActuator(block, hwDevice, channel)
+              setExclusiveIoChannelClaimer(block, hwDevice, channel)
           "
         />
         <LabeledField
diff --git a/src/plugins/spark/features/FastPwm/FastPwmWidget.vue b/src/plugins/spark/features/FastPwm/FastPwmWidget.vue
index 833e7eef6..0607f5852 100644
--- a/src/plugins/spark/features/FastPwm/FastPwmWidget.vue
+++ b/src/plugins/spark/features/FastPwm/FastPwmWidget.vue
@@ -14,7 +14,7 @@ import {
   PWM_SELECT_OPTIONS,
 } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 import { channelName, prettyBlock } from '@/plugins/spark/utils/formatting';
 import { selectable } from '@/utils/collections';
 import { fixedNumber, prettyQty, roundedNumber } from '@/utils/quantity';
@@ -171,7 +171,7 @@ const pwmDesired = computed<number | null>(() => {
             class="col-grow"
             @update:model-value="
               ({ hwDevice, channel }) =>
-                setExclusiveChannelActuator(block, hwDevice, channel)
+                setExclusiveIoChannelClaimer(block, hwDevice, channel)
             "
           />
           <LabeledField
diff --git a/src/plugins/spark/features/MotorValve/MotorValveWidget.vue b/src/plugins/spark/features/MotorValve/MotorValveWidget.vue
index 1aac21e3d..79252eb93 100644
--- a/src/plugins/spark/features/MotorValve/MotorValveWidget.vue
+++ b/src/plugins/spark/features/MotorValve/MotorValveWidget.vue
@@ -10,7 +10,7 @@ import { useContext } from '@/composables';
 import { useBlockWidget } from '@/plugins/spark/composables';
 import { ENUM_LABELS_VALVE_STATE } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
-import { setExclusiveChannelActuator } from '@/plugins/spark/utils/configuration';
+import { setExclusiveIoChannelClaimer } from '@/plugins/spark/utils/configuration';
 import { getSpark3PinsBlock } from '@/plugins/spark/utils/system';
 
 const sparkStore = useSparkStore();
@@ -118,7 +118,7 @@ function enable12V(): void {
           class="col-grow"
           @update:model-value="
             ({ hwDevice, channel }) =>
-              setExclusiveChannelActuator(block, hwDevice, channel)
+              setExclusiveIoChannelClaimer(block, hwDevice, channel)
           "
         />
 
diff --git a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue b/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
index 27524f969..5fda624f6 100644
--- a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
+++ b/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
@@ -120,7 +120,7 @@ const errors = computed<string[]>(() => {
         </LabeledField>
       </div>
 
-      <OneWireGpioEditor
+      <GpioArrayEditor
         v-model:channels="channels"
         :error-pins="block.data.status.overCurrent"
       />
diff --git a/src/plugins/spark/features/OneWireGpioModule/index.ts b/src/plugins/spark/features/OneWireGpioModule/index.ts
index 70fa0e103..3380107ce 100644
--- a/src/plugins/spark/features/OneWireGpioModule/index.ts
+++ b/src/plugins/spark/features/OneWireGpioModule/index.ts
@@ -46,13 +46,13 @@ const plugin: Plugin = {
       }),
       analyze: (block: OneWireGpioModuleBlock) => {
         const { moduleStatus } = block.data.status;
-        if (
-          moduleStatus != GpioErrorFlags.NONE &&
-          moduleStatus != GpioErrorFlags.OPEN_LOAD
-        ) {
-          return 'Invalid';
+        switch (moduleStatus) {
+          case GpioErrorFlags.NONE:
+          case GpioErrorFlags.OPEN_LOAD:
+            return 'Active';
+          default:
+            return 'Invalid';
         }
-        return 'Active';
       },
     };
 
diff --git a/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue b/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
new file mode 100644
index 000000000..80dd334a3
--- /dev/null
+++ b/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import { TempSensorAnalogBlock } from 'brewblox-proto/ts';
+import { computed } from 'vue';
+import { useContext } from '@/composables';
+import { useBlockWidget } from '@/plugins/spark/composables';
+import {
+  ENUM_LABELS_ANALOG_SENSOR_TYPE,
+  ENUM_LABELS_TEMP_SENSOR_ANALOG_SPEC,
+  ENUM_LABELS_TEMP_SENSOR_ANALOG_TYPE,
+} from '@/plugins/spark/const';
+import { setExclusiveAnalogChannelClaimer } from '@/plugins/spark/utils/configuration';
+import { selectable } from '@/utils/collections';
+
+const tempSensorAnalogTypeOpts = selectable(
+  ENUM_LABELS_TEMP_SENSOR_ANALOG_TYPE,
+);
+const tempSensorAnalogSpecOpts = selectable(
+  ENUM_LABELS_TEMP_SENSOR_ANALOG_SPEC,
+);
+
+const { context, inDialog } = useContext.setup();
+const { block, serviceId, patchBlock } =
+  useBlockWidget.setup<TempSensorAnalogBlock>();
+
+const hasValue = computed<boolean>(() => block.value.data.value.value !== null);
+</script>
+
+<template>
+  <PreviewCard :enabled="inDialog">
+    <template #preview>
+      <BlockHistoryGraph />
+    </template>
+
+    <template #toolbar>
+      <BlockWidgetToolbar has-mode-toggle />
+    </template>
+
+    <div>
+      <CardWarning v-if="!hasValue">
+        <template #message> Analog Sensor could not be read. </template>
+      </CardWarning>
+
+      <div class="q-ma-md row justify-center">
+        <div
+          v-if="hasValue"
+          class="col-auto row items-center"
+        >
+          <q-icon
+            name="mdi-thermometer"
+            size="md"
+            color="green-3"
+            class="col-auto"
+          />
+          <QuantityField
+            :model-value="block.data.value"
+            readonly
+            tag="big"
+            class="col-auto"
+          />
+        </div>
+      </div>
+
+      <template v-if="context.mode === 'Full'">
+        <q-separator inset />
+
+        <div class="widget-body row">
+          <AnalogChannelSelectField
+            :model-value="{
+              analogDevice: block.data.analogDevice,
+              analogChannel: block.data.analogChannel,
+            }"
+            :service-id="serviceId"
+            clearable
+            title="Target channel"
+            label="Channel"
+            class="col-grow"
+            @update:model-value="
+              ({ analogDevice, analogChannel }) =>
+                setExclusiveAnalogChannelClaimer(
+                  block,
+                  analogDevice,
+                  analogChannel,
+                )
+            "
+          />
+          <QuantityField
+            :model-value="block.data.offset"
+            title="Offset"
+            label="Offset"
+            class="col-grow"
+            @update:model-value="(v) => patchBlock({ offset: v })"
+          />
+          <SelectField
+            :model-value="block.data.sensorType"
+            :options="tempSensorAnalogTypeOpts"
+            title="Sensor type"
+            label="Sensor type"
+            class="col-grow"
+            @update:model-value="(v) => patchBlock({ sensorType: v })"
+          />
+          <SelectField
+            :model-value="block.data.spec"
+            :options="tempSensorAnalogSpecOpts"
+            title="Sensor spec"
+            label="Sensor spec"
+            class="col-grow"
+            @update:model-value="(v) => patchBlock({ spec: v })"
+          />
+          <LabeledField
+            v-model="ENUM_LABELS_ANALOG_SENSOR_TYPE[block.data.sensorType]"
+            readonly
+            label="Detected type"
+            class="col-grow"
+          />
+        </div>
+      </template>
+    </div>
+  </PreviewCard>
+</template>
diff --git a/src/plugins/spark/features/TempSensorAnalog/index.ts b/src/plugins/spark/features/TempSensorAnalog/index.ts
new file mode 100644
index 000000000..9023a4a0e
--- /dev/null
+++ b/src/plugins/spark/features/TempSensorAnalog/index.ts
@@ -0,0 +1,83 @@
+import {
+  AnalogSensorType,
+  BlockIntfType,
+  BlockType,
+  TempSensorAnalogBlock,
+  TempSensorAnalogSpec,
+  TempSensorAnalogType,
+} from 'brewblox-proto/ts';
+import { Plugin } from 'vue';
+import { genericBlockFeature } from '@/plugins/spark/generic';
+import { useBlockSpecStore } from '@/plugins/spark/store';
+import { BlockFieldSpec, BlockSpec } from '@/plugins/spark/types';
+import { useFeatureStore, WidgetFeature } from '@/store/features';
+import { cref } from '@/utils/component-ref';
+import { bloxLink } from '@/utils/link';
+import { deltaTempQty, tempQty } from '@/utils/quantity';
+import widget from './TempSensorAnalogWidget.vue';
+
+const type = BlockType.TempSensorAnalog;
+const title = 'Analog Temp Sensor';
+
+const plugin: Plugin = {
+  install(app) {
+    const specStore = useBlockSpecStore();
+    const featureStore = useFeatureStore();
+
+    const blockSpec: BlockSpec<TempSensorAnalogBlock> = {
+      type,
+      title,
+      hasRelations: true,
+      generate: (): TempSensorAnalogBlock['data'] => ({
+        value: tempQty(20),
+        offset: deltaTempQty(0),
+        sensorType: TempSensorAnalogType.TEMP_SENSOR_TYPE_NOT_SET,
+        analogDevice: bloxLink(null, BlockIntfType.AnalogArrayInterface),
+        analogChannel: 0,
+        detected: AnalogSensorType.ANALOG_SENSOR_TYPE_NONE,
+        spec: TempSensorAnalogSpec.SPEC_NOT_SET,
+      }),
+      analyze: (block: TempSensorAnalogBlock) => {
+        const { value, analogDevice, analogChannel } = block.data;
+        if (analogChannel == 0 || analogDevice.id == null) {
+          return 'Invalid';
+        }
+        if (value.value == null) {
+          return 'Inactive';
+        }
+        return 'Active';
+      },
+    };
+
+    const fieldSpecs: BlockFieldSpec<TempSensorAnalogBlock>[] = [
+      {
+        type,
+        key: 'value',
+        title: 'Sensor value',
+        component: 'QuantityValEdit',
+        generate: () => tempQty(20),
+        readonly: true,
+        graphed: true,
+      },
+    ];
+
+    const feature: WidgetFeature = {
+      ...genericBlockFeature,
+      id: type,
+      title,
+      role: 'Process',
+      component: cref(app, widget),
+      widgetSize: {
+        cols: 4,
+        rows: 2,
+      },
+      experimental: true,
+    };
+
+    specStore.addBlockSpec(blockSpec);
+    specStore.addFieldSpecs(fieldSpecs);
+    featureStore.addWidgetFeature(feature);
+  },
+};
+
+export default plugin;
diff --git a/src/plugins/spark/features/index.ts b/src/plugins/spark/features/index.ts
index 54d7fc1ad..3867f2b02 100644
--- a/src/plugins/spark/features/index.ts
+++ b/src/plugins/spark/features/index.ts
@@ -3,6 +3,7 @@ import ActuatorAnalogMock from './ActuatorAnalogMock';
 import ActuatorLogic from './ActuatorLogic';
 import ActuatorOffset from './ActuatorOffset';
 import ActuatorPwm from './ActuatorPwm';
+import AnalogGpioModule from './AnalogGpioModule';
 import Balancer from './Balancer';
 import DeprecatedObject from './DeprecatedObject';
 import DigitalActuator from './DigitalActuator';
@@ -26,6 +27,7 @@ import Spark2Pins from './Spark2Pins';
 import Spark3Pins from './Spark3Pins';
 import SparkDisplay from './SparkDisplay';
 import SysInfo from './SysInfo';
+import TempSensorAnalog from './TempSensorAnalog';
 import TempSensorCombi from './TempSensorCombi';
 import TempSensorExternal from './TempSensorExternal';
 import TempSensorMock from './TempSensorMock';
@@ -37,6 +39,7 @@ const plugins: Plugin[] = [
   ActuatorLogic,
   ActuatorOffset,
   ActuatorPwm,
+  AnalogGpioModule,
   Balancer,
   DigitalActuator,
   DigitalInput,
@@ -60,6 +63,7 @@ const plugins: Plugin[] = [
   SysInfo,
   QuickActions,
   QuickValues,
+  TempSensorAnalog,
   TempSensorCombi,
   TempSensorExternal,
   TempSensorMock,
diff --git a/src/plugins/spark/utils/configuration.ts b/src/plugins/spark/utils/configuration.ts
index e447c8234..c7931a7b3 100644
--- a/src/plugins/spark/utils/configuration.ts
+++ b/src/plugins/spark/utils/configuration.ts
@@ -1,4 +1,5 @@
 import {
+  AnalogClaimerInterfaceBlock,
   AnalogConstraintKey,
   AnalogConstraints,
   Block,
@@ -16,7 +17,7 @@ import {
   DeprecatedMutexedConstraint,
   DigitalConstraintKey,
   DigitalConstraints,
-  IoDriverInterfaceBlock,
+  IoClaimerInterfaceBlock,
   Link,
   SetpointProfileBlock,
 } from 'brewblox-proto/ts';
@@ -149,7 +150,7 @@ export function calculateWiFiPct(dbm: number): number {
   return Math.round(-0.0154 * dbm * dbm - 0.3794 * dbm + 98.182);
 }
 
-export async function unlinkChannelActuators(
+export async function unlinkIoChannelClaimers(
   serviceId: string,
   hwDevice: Link,
   channel: number,
@@ -163,8 +164,8 @@ export async function unlinkChannelActuators(
   await Promise.all(
     sparkStore
       .blocksByService(serviceId)
-      .filter((block): block is IoDriverInterfaceBlock =>
-        isBlockCompatible(block, BlockIntfType.IoDriverInterface),
+      .filter((block): block is IoClaimerInterfaceBlock =>
+        isBlockCompatible(block, BlockIntfType.IoClaimerInterface),
       )
       .filter(
         (block) =>
@@ -177,15 +178,46 @@ export async function unlinkChannelActuators(
   );
 }
 
-export async function setExclusiveChannelActuator(
+export async function unlinkAnalogChannelClaimers(
+  serviceId: string,
+  analogDevice: Link,
+  analogChannel: number,
+): Promise<void> {
+  if (!analogDevice.id || !analogChannel) {
+    return;
+  }
+
+  const sparkStore = useSparkStore();
+
+  await Promise.all(
+    sparkStore
+      .blocksByService(serviceId)
+      .filter((block): block is AnalogClaimerInterfaceBlock =>
+        isBlockCompatible(block, BlockIntfType.AnalogClaimerInterface),
+      )
+      .filter(
+        (block) =>
+          block.data.analogDevice.id === analogDevice.id &&
+          block.data.analogChannel === analogChannel,
+      )
+      .map((block) =>
+        sparkStore.patchBlock(block, {
+          analogDevice: bloxLink(null),
+          analogChannel: 0,
+        }),
+      ),
+  );
+}
+
+export async function setExclusiveIoChannelClaimer(
   actuator: Maybe<Block>,
   hwDevice: Link,
   channel: number,
 ): Promise<void> {
   if (
-    !isBlockCompatible<IoDriverInterfaceBlock>(
+    !isBlockCompatible<IoClaimerInterfaceBlock>(
       actuator,
-      BlockIntfType.IoDriverInterface,
+      BlockIntfType.IoClaimerInterface,
     )
   ) {
     return;
@@ -198,10 +230,39 @@ export async function setExclusiveChannelActuator(
     return; // no change
   }
 
-  await unlinkChannelActuators(actuator.serviceId, hwDevice, channel);
+  await unlinkIoChannelClaimers(actuator.serviceId, hwDevice, channel);
   await useSparkStore().patchBlock(actuator, { hwDevice, channel });
 }
 
+export async function setExclusiveAnalogChannelClaimer(
+  actuator: Maybe<Block>,
+  analogDevice: Link,
+  analogChannel: number,
+): Promise<void> {
+  if (
+    !isBlockCompatible<AnalogClaimerInterfaceBlock>(
+      actuator,
+      BlockIntfType.AnalogClaimerInterface,
+    )
+  ) {
+    return;
+  }
+
+  if (
+    actuator.data.analogDevice.id === analogDevice.id &&
+    actuator.data.analogChannel === analogChannel
+  ) {
+    return; // no change
+  }
+
+  await unlinkAnalogChannelClaimers(
+    actuator.serviceId,
+    analogDevice,
+    analogChannel,
+  );
+  await useSparkStore().patchBlock(actuator, { analogDevice, analogChannel });
+}
+
 export function emptyAnalogConstraints(): DeepNonNullable<AnalogConstraints> {
   return {
     min: { enabled: false, limiting: false, value: 0 },
diff --git a/yarn.lock b/yarn.lock
index eb14e8993..ca4942a7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=085aa5756728fe8815c434d6d2a61976b642f4b4"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/cfb9d17ef3fe0ed66c17fd963dfeb7c5d953f244d4372c9ab71134d5390b27729f988bc597a0ea41ae9dccb8a0f8b2040f3d4e1580a6f0c9b03a2df5364955da
+  checksum: 10c0/7e47060b6d60125661ce0e90636a3e833e30131970bce84d153f3e288da089dcfe696ebd4ac386180015694dd60d732eb952c69c577a5d4fc173cb75aa4d9b53
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
     "@vue/test-utils": "npm:^2.4.6"
     autoprefixer: "npm:^10.4.19"
     axios: "npm:^1.6.8"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=2e7314a6a50cf459f49e725444c8e5cacd2bcd77"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"

From c4e76b1d2ce77b4a0d4524cf8bf477f1ce630cda Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Sat, 18 May 2024 12:43:08 +0200
Subject: [PATCH 06/27] manually pull proto with yarn updates

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f58e006df..2a68235fa 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.6.8",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
diff --git a/yarn.lock b/yarn.lock
index ca4942a7e..1e2fb235c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=085aa5756728fe8815c434d6d2a61976b642f4b4"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/7e47060b6d60125661ce0e90636a3e833e30131970bce84d153f3e288da089dcfe696ebd4ac386180015694dd60d732eb952c69c577a5d4fc173cb75aa4d9b53
+  checksum: 10c0/8cb1404a290d8b237069a110c5162b2314acd0733ba551c515a07f1dbcffbefa4377a3b60152d04d6b0f737559090283d29fdfbb958509a14ca967c50ae6ad48
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
     "@vue/test-utils": "npm:^2.4.6"
     autoprefixer: "npm:^10.4.19"
     axios: "npm:^1.6.8"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=085aa5756728fe8815c434d6d2a61976b642f4b4"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"

From 8d27189fa7a2b9cbb0a37498e92ffe6a165a5f12 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Thu, 6 Jun 2024 11:21:59 +0200
Subject: [PATCH 07/27] use correct data field for detected type

---
 .../TempSensorAnalogWidget.vue                | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue b/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
index 80dd334a3..3866e9371 100644
--- a/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
+++ b/src/plugins/spark/features/TempSensorAnalog/TempSensorAnalogWidget.vue
@@ -83,13 +83,6 @@ const hasValue = computed<boolean>(() => block.value.data.value.value !== null);
                 )
             "
           />
-          <QuantityField
-            :model-value="block.data.offset"
-            title="Offset"
-            label="Offset"
-            class="col-grow"
-            @update:model-value="(v) => patchBlock({ offset: v })"
-          />
           <SelectField
             :model-value="block.data.sensorType"
             :options="tempSensorAnalogTypeOpts"
@@ -106,8 +99,18 @@ const hasValue = computed<boolean>(() => block.value.data.value.value !== null);
             class="col-grow"
             @update:model-value="(v) => patchBlock({ spec: v })"
           />
+
+          <div class="col-break" />
+
+          <QuantityField
+            :model-value="block.data.offset"
+            title="Offset"
+            label="Offset"
+            class="col-grow"
+            @update:model-value="(v) => patchBlock({ offset: v })"
+          />
           <LabeledField
-            v-model="ENUM_LABELS_ANALOG_SENSOR_TYPE[block.data.sensorType]"
+            v-model="ENUM_LABELS_ANALOG_SENSOR_TYPE[block.data.detected]"
             readonly
             label="Detected type"
             class="col-grow"

From 85dbd63cad4182caac835e1bc70618081c20cb19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:36:02 +0000
Subject: [PATCH 08/27] Bump braces from 3.0.2 to 3.0.3

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1e2fb235c..0df14ae17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3052,11 +3052,11 @@ __metadata:
   linkType: hard
 
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: "npm:^7.0.1"
-  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+    fill-range: "npm:^7.1.1"
+  checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04
   languageName: node
   linkType: hard
 
@@ -5302,12 +5302,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: "npm:^5.0.1"
-  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018
   languageName: node
   linkType: hard
 

From 83329293974b0ef2cc8b824d1f312b313e871e59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 17:50:15 +0000
Subject: [PATCH 09/27] Bump ws from 8.14.2 to 8.17.1

Bumps [ws](https://github.com/websockets/ws) from 8.14.2 to 8.17.1.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.14.2...8.17.1)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1e2fb235c..74d9330fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10606,9 +10606,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.14.2":
-  version: 8.14.2
-  resolution: "ws@npm:8.14.2"
+"ws@npm:^8.14.2, ws@npm:^8.16.0":
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -10617,22 +10617,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/35b4c2da048b8015c797fd14bcb5a5766216ce65c8a5965616a5440ca7b6c3681ee3cbd0ea0c184a59975556e9d58f2002abf8485a14d11d3371770811050a16
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe
   languageName: node
   linkType: hard
 

From a1c8d5d8cd4e1ffbda8097b9646d90fa4a973dc3 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Fri, 21 Jun 2024 15:30:48 +0200
Subject: [PATCH 10/27] fix commented config for service overrides

---
 docker-compose.override.yml | 20 +++++---------------
 docker-compose.yml          |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index b411d5b3b..d61ff584a 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -19,21 +19,11 @@ services:
     labels:
       - traefik.http.routers.ui.rule=PathPrefix(`/ui`) || PathPrefix(`/static`) || Path(`/`)
 
-  # node-red:
-  #   volumes:
-  #     - type: bind
-  #       source: ./dev/node-red
-  #       target: /data
-  #     - type: bind
-  #       source: ../node-red-contrib-brewblox
-  #       target: /node-red-contrib-brewblox
-
   # history:
-  #   image: brewblox/brewblox-history:develop
   #   volumes:
   #     - type: bind
-  #       source: ../brewblox-history
-  #       target: /app
+  #       source: ../brewblox-history/brewblox_history
+  #       target: /app/brewblox_history
 
   # sparkey:
   #   volumes:
@@ -62,11 +52,11 @@ services:
   # tilt:
   #   volumes:
   #     - type: bind
-  #       source: ../brewblox-tilt
-  #       target: /app
+  #       source: ../brewblox-tilt/brewblox_tilt
+  #       target: /app/brewblox_tilt
   #       read_only: true
   #     - type: bind
-  #       source: ./dev/tilt_share
+  #       source: ${BREWBLOX_CACHE_DIR}/tilt
   #       target: /share
 
   # hass:
diff --git a/docker-compose.yml b/docker-compose.yml
index d69d1285d..8725f0f99 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     image: ghcr.io/brewblox/brewblox-history:develop
 
   node-red:
-    image: ghcr.io/brewblox/node-red:develop
+    image: nodered/node-red:latest-minimal
     volumes:
       - type: bind
         source: ${BREWBLOX_CACHE_DIR}/node-red

From a63f4672aa52d1e25d50ce1d47a824d75f060885 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Fri, 21 Jun 2024 16:15:57 +0200
Subject: [PATCH 11/27] add conditional messages to troubleshooter if USB is
 enabled

---
 .../spark/service/SparkTroubleshooter.vue      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/plugins/spark/service/SparkTroubleshooter.vue b/src/plugins/spark/service/SparkTroubleshooter.vue
index 461abda4b..78f839b8e 100644
--- a/src/plugins/spark/service/SparkTroubleshooter.vue
+++ b/src/plugins/spark/service/SparkTroubleshooter.vue
@@ -52,6 +52,15 @@ const connectionStep = computed<ConnectionStep>(() => {
   return status.value.connection_status;
 });
 
+const usbSupported = computed<boolean>(() => {
+  if (!status.value) {
+    return true;
+  }
+  // The Spark 4 does not support USB, and has a device ID of 12 (hex MAC address)
+  // If there is no desired device ID, we assume USB may be supported.
+  return status.value.service.device.device_id?.length != 12;
+});
+
 function isStepDone(step: ConnectionStep): boolean {
   return stepOrder.indexOf(step) < stepOrder.indexOf(connectionStep.value);
 }
@@ -146,11 +155,10 @@ function serviceReboot(): void {
                 <li>Does your controller have the correct firmware?</li>
                 <li>WiFi: Does your controller display its IP address?</li>
                 <li>Are there any error messages in your service logs?</li>
-                <li>
-                  USB: Your service must have been (re)started after plugging in
-                  the USB cable.
-                </li>
-                <li>USB: Can your service access USB devices? (Mac hosts)</li>
+                <template v-if="usbSupported">
+                  <li>USB: Is the USB proxy enabled in brewblox.yml?</li>
+                  <li>USB: Can your service access USB devices? (Mac hosts)</li>
+                </template>
               </ul>
             </template>
             <template v-else>

From 6d11663a53efd80b2ea8b97199fa4ea5a9e20c72 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Tue, 25 Jun 2024 13:08:59 +0200
Subject: [PATCH 12/27] list detected USB devices in troubleshooter

---
 docker-compose.yml                            |  7 +++
 .../spark/service/SparkTroubleshooter.vue     | 44 ++++++++++++++++---
 src/plugins/spark/store/spark-api.ts          | 15 ++++++-
 src/plugins/spark/types.ts                    |  5 +++
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8725f0f99..007fa9b40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,6 +64,13 @@ services:
         source: ${BREWBLOX_CACHE_DIR}/simulator__spock
         target: /app/simulator
 
+  usb-proxy:
+    image: ghcr.io/brewblox/brewblox-usb-proxy:develop
+    restart: unless-stopped
+    privileged: true
+    labels:
+      - traefik.http.services.usb-proxy.loadbalancer.server.port=5000
+
   tilt:
     image: ghcr.io/brewblox/brewblox-tilt:develop
     restart: unless-stopped
diff --git a/src/plugins/spark/service/SparkTroubleshooter.vue b/src/plugins/spark/service/SparkTroubleshooter.vue
index 78f839b8e..ce214d405 100644
--- a/src/plugins/spark/service/SparkTroubleshooter.vue
+++ b/src/plugins/spark/service/SparkTroubleshooter.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { SparkStatusDescription } from 'brewblox-proto/ts';
-import { computed, provide, reactive } from 'vue';
+import { computed, inject, provide, reactive, ref, watch } from 'vue';
 import { useSparkStore } from '@/plugins/spark/store';
+import { fetchKnownUsbDevices } from '@/plugins/spark/store/spark-api';
+import { SparkUsbDevices } from '@/plugins/spark/types';
 import { WidgetContext } from '@/store/features';
-import { ContextKey } from '@/symbols';
+import { ContextKey, NowKey } from '@/symbols';
 import { createDialog } from '@/utils/dialog';
 import { shortDateString } from '@/utils/quantity';
 
@@ -36,6 +38,8 @@ provide(
 );
 
 const sparkStore = useSparkStore();
+const now = inject(NowKey)!;
+const usbDevices = ref<SparkUsbDevices | null>(null);
 
 const status = computed<SparkStatusDescription | null>(() =>
   sparkStore.statusByService(props.serviceId),
@@ -86,6 +90,16 @@ function startFirmwareUpdate(): void {
 function serviceReboot(): void {
   sparkStore.serviceReboot(props.serviceId);
 }
+
+watch(
+  () => now.value,
+  async () => {
+    if (usbSupported.value) {
+      usbDevices.value = await fetchKnownUsbDevices(props.serviceId);
+    }
+  },
+  { immediate: true },
+);
 </script>
 
 <template>
@@ -152,12 +166,30 @@ function serviceReboot(): void {
               controller.
               <ul>
                 <li>Is your controller turned on?</li>
-                <li>Does your controller have the correct firmware?</li>
-                <li>WiFi: Does your controller display its IP address?</li>
                 <li>Are there any error messages in your service logs?</li>
+                <li>WiFi: Does your controller display its IP address?</li>
                 <template v-if="usbSupported">
-                  <li>USB: Is the USB proxy enabled in brewblox.yml?</li>
-                  <li>USB: Can your service access USB devices? (Mac hosts)</li>
+                  <template v-if="usbDevices == null">
+                    USB: Checking USB devices...
+                  </template>
+                  <template v-else-if="usbDevices.enabled">
+                    <li>
+                      USB: Detected {{ usbDevices.devices.length }} USB
+                      device(s)
+                      <ul>
+                        <li
+                          v-for="dev in usbDevices.devices"
+                          :key="dev"
+                        >
+                          {{ dev }}
+                        </li>
+                      </ul>
+                    </li>
+                    <li>USB: Can Docker access USB devices? (Mac hosts)</li>
+                  </template>
+                  <template v-else>
+                    <li>USB: The USB proxy is not enabled in brewblox.yml.</li>
+                  </template>
                 </template>
               </ul>
             </template>
diff --git a/src/plugins/spark/store/spark-api.ts b/src/plugins/spark/store/spark-api.ts
index 35a1c3768..6d75cac3c 100644
--- a/src/plugins/spark/store/spark-api.ts
+++ b/src/plugins/spark/store/spark-api.ts
@@ -1,6 +1,11 @@
 import { AxiosResponse } from 'axios';
 import { Block, SparkStatusDescription } from 'brewblox-proto/ts';
-import { BlockIds, BlockPatchArgs, SparkBackup } from '@/plugins/spark/types';
+import {
+  BlockIds,
+  BlockPatchArgs,
+  SparkBackup,
+  SparkUsbDevices,
+} from '@/plugins/spark/types';
 import { http, intercept } from '@/utils/http';
 import { notify } from '@/utils/notify';
 
@@ -280,3 +285,11 @@ export const controllerReboot = (serviceId: string): Promise<any> =>
     .post(`/${encodeURIComponent(serviceId)}/system/reboot/controller`, {})
     .then((resp) => resp.data)
     .catch(intercept(`Failed to reboot ${serviceId}`));
+
+export const fetchKnownUsbDevices = (
+  serviceId: string,
+): Promise<SparkUsbDevices> =>
+  http
+    .post(`/${encodeURIComponent(serviceId)}/system/usb`, {})
+    .then((resp) => resp.data)
+    .catch(intercept(`Failed to query USB devices for ${serviceId}`));
diff --git a/src/plugins/spark/types.ts b/src/plugins/spark/types.ts
index a5afa8e95..590580a87 100644
--- a/src/plugins/spark/types.ts
+++ b/src/plugins/spark/types.ts
@@ -56,6 +56,11 @@ export interface SparkBackup {
   store: SparkStoreEntry[];
 }
 
+export interface SparkUsbDevices {
+  enabled: boolean;
+  devices: string[];
+}
+
 export interface BlockLimitation {
   target: string;
   constraint: AnyConstraintKey;

From 20d434cc33049bcd8a76db21dfdef165707e7238 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Tue, 25 Jun 2024 13:55:16 +0200
Subject: [PATCH 13/27] don't fetch USB when service is unreachable

---
 src/plugins/spark/service/SparkTroubleshooter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/spark/service/SparkTroubleshooter.vue b/src/plugins/spark/service/SparkTroubleshooter.vue
index ce214d405..5e82dbdb0 100644
--- a/src/plugins/spark/service/SparkTroubleshooter.vue
+++ b/src/plugins/spark/service/SparkTroubleshooter.vue
@@ -94,7 +94,7 @@ function serviceReboot(): void {
 watch(
   () => now.value,
   async () => {
-    if (usbSupported.value) {
+    if (connectionStep.value != 'UNREACHABLE' && usbSupported.value) {
       usbDevices.value = await fetchKnownUsbDevices(props.serviceId);
     }
   },

From 4018fffd05a704dbfe6778bfc9abc1b2c9e75f7e Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Wed, 26 Jun 2024 13:47:27 +0200
Subject: [PATCH 14/27] remove block name cleanup action

---
 src/plugins/spark/service/SparkActions.vue |  6 ------
 src/plugins/spark/store/spark-api.ts       |  6 ------
 src/plugins/spark/store/spark-store.ts     |  5 -----
 src/plugins/spark/utils/formatting.ts      | 19 -------------------
 4 files changed, 36 deletions(-)

diff --git a/src/plugins/spark/service/SparkActions.vue b/src/plugins/spark/service/SparkActions.vue
index 7e6403387..faa9ad290 100644
--- a/src/plugins/spark/service/SparkActions.vue
+++ b/src/plugins/spark/service/SparkActions.vue
@@ -6,7 +6,6 @@ import {
   discoverBlocks,
   startResetBlocks,
 } from '@/plugins/spark/utils/actions';
-import { cleanUnusedNames } from '@/plugins/spark/utils/formatting';
 import { useServiceStore } from '@/store/services';
 import { useSystemStore } from '@/store/system';
 import { userUISettings } from '@/user-settings';
@@ -96,11 +95,6 @@ function startDialog(component: GlobalDialogName): void {
         label="Controller backups"
         @click="startDialog('SparkBackupDialog')"
       />
-      <ActionItem
-        icon="mdi-tag-remove"
-        label="Remove unused block names"
-        @click="cleanUnusedNames(serviceId)"
-      />
       <ActionItem
         icon="delete"
         label="Remove all blocks"
diff --git a/src/plugins/spark/store/spark-api.ts b/src/plugins/spark/store/spark-api.ts
index 6d75cac3c..787ce0f5f 100644
--- a/src/plugins/spark/store/spark-api.ts
+++ b/src/plugins/spark/store/spark-api.ts
@@ -144,12 +144,6 @@ export const clearBlocks = (serviceId: string): Promise<any> =>
     .post(`/${encodeURIComponent(serviceId)}/blocks/all/delete`)
     .catch(intercept(`Failed to clear blocks on ${serviceId}`));
 
-export const cleanUnusedNames = (serviceId: string): Promise<string[]> =>
-  http
-    .post<BlockIds[]>(`/${encodeURIComponent(serviceId)}/blocks/cleanup`)
-    .then((resp) => resp.data.map((v) => v.id!))
-    .catch(intercept(`Failed to clean unused block names on ${serviceId}`));
-
 export const fetchDiscoveredBlocks = (serviceId: string): Promise<Block[]> =>
   http
     .post<Block[]>(`/${encodeURIComponent(serviceId)}/blocks/discover`)
diff --git a/src/plugins/spark/store/spark-store.ts b/src/plugins/spark/store/spark-store.ts
index 19ca50dfa..055a4517e 100644
--- a/src/plugins/spark/store/spark-store.ts
+++ b/src/plugins/spark/store/spark-store.ts
@@ -244,10 +244,6 @@ export const useSparkStore = defineStore('sparkStore', () => {
     discoveredBlockIds.value[serviceId] = [];
   }
 
-  async function cleanUnusedNames(serviceId: string): Promise<string[]> {
-    return await sparkApi.cleanUnusedNames(serviceId);
-  }
-
   async function fetchBlock(block: Maybe<Block>): Promise<void> {
     if (block) {
       const fetched = await sparkApi.fetchBlock(block);
@@ -525,7 +521,6 @@ export const useSparkStore = defineStore('sparkStore', () => {
     invalidateBlocks,
     saveEnabled,
     clearDiscoveredBlocks,
-    cleanUnusedNames,
     fetchBlock,
     fetchStoredBlock,
     fetchBlocks,
diff --git a/src/plugins/spark/utils/formatting.ts b/src/plugins/spark/utils/formatting.ts
index af6d1f1c9..8b85d5634 100644
--- a/src/plugins/spark/utils/formatting.ts
+++ b/src/plugins/spark/utils/formatting.ts
@@ -12,32 +12,13 @@ import {
   OneWireGpioModuleBlock,
 } from 'brewblox-proto/ts';
 import { Enum } from 'typescript-string-enums';
-import { useSparkStore } from '@/plugins/spark/store';
 import { BlockAddress } from '@/plugins/spark/types';
-import { notify } from '@/utils/notify';
 import { matchesType } from '@/utils/objects';
 import { durationString, prettyLink } from '@/utils/quantity';
 
 export const prettyBlock = (v: BlockAddress | null | undefined): string =>
   v?.id || '<not set>';
 
-export async function cleanUnusedNames(
-  serviceId: string | null,
-): Promise<void> {
-  const sparkStore = useSparkStore();
-  if (!sparkStore.has(serviceId)) {
-    return;
-  }
-  const names = await sparkStore.cleanUnusedNames(serviceId);
-
-  const message =
-    names.length > 0
-      ? `Cleaned block names: <i>${names.join(', ')}</i>.`
-      : 'No unused names found.';
-
-  notify.info({ message, icon: 'mdi-tag-remove' });
-}
-
 export const enumHint = (e: Enum<any>): string =>
   'One of: ' +
   Enum.values(e)

From f0980fbf676a4edef98d44cfa205810ae7a50a6f Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Wed, 26 Jun 2024 18:08:02 +0200
Subject: [PATCH 15/27] show USB and mdns devices in troubleshooter

---
 docker-compose.override.yml                   | 11 ++-
 docker-compose.yml                            |  6 ++
 package.json                                  |  1 +
 src/plugins/spark/service/SparkActions.vue    |  2 +-
 .../spark/service/SparkTroubleshooter.vue     | 82 +++++++++++++++----
 src/plugins/spark/store/spark-api.ts          |  6 ++
 yarn.lock                                     |  8 ++
 7 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index d61ff584a..12e82417b 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -34,7 +34,7 @@ services:
   #       source: ../brewblox-devcon-spark/brewblox_devcon_spark
   #       target: /app/brewblox_devcon_spark
   #   ports:
-  #     - "5678:5678"
+  #     - '5678:5678'
   #   environment:
   #     - ENABLE_DEBUGGER=1
   #   labels:
@@ -75,3 +75,12 @@ services:
   #     - type: bind
   #       source: ../brewblox-auth/entrypoint.sh
   #       target: /app/entrypoint.sh
+
+  # You need to change "enp8s0" to the name of your physical network interface
+  # reflector:
+  #   image: yuxzhu/mdns-reflector:latest
+  #   restart: on-failure:3
+  #   network_mode: host
+  #   labels:
+  #     - traefik.enable=false
+  #   command: mdns-reflector -fn4 enp8s0 br-${COMPOSE_PROJECT_NAME}
diff --git a/docker-compose.yml b/docker-compose.yml
index 007fa9b40..b07b4d4b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,10 @@
 name: brewblox-ui
+
+networks:
+  default:
+    driver_opts:
+      com.docker.network.bridge.name: br-${COMPOSE_PROJECT_NAME}
+
 services:
   eventbus:
     image: ghcr.io/brewblox/mosquitto:develop
diff --git a/package.json b/package.json
index 2a68235fa..feebac19f 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "parse-duration": "^1.1.0",
     "pinia": "^2.1.7",
     "plotly.js": "^2.32.0",
+    "pluralize": "^8.0.0",
     "portal-vue": "^3.0.0",
     "process": "^0.11.10",
     "quasar": "^2.16.2",
diff --git a/src/plugins/spark/service/SparkActions.vue b/src/plugins/spark/service/SparkActions.vue
index faa9ad290..13f17b3a3 100644
--- a/src/plugins/spark/service/SparkActions.vue
+++ b/src/plugins/spark/service/SparkActions.vue
@@ -67,7 +67,7 @@ function startDialog(component: GlobalDialogName): void {
       />
       <ActionItem
         icon="mdi-magnify-plus-outline"
-        label="Discover new OneWire blocks"
+        label="Discover blocks"
         @click="discoverBlocks(serviceId)"
       />
       <ActionItem
diff --git a/src/plugins/spark/service/SparkTroubleshooter.vue b/src/plugins/spark/service/SparkTroubleshooter.vue
index 5e82dbdb0..8a5c2af53 100644
--- a/src/plugins/spark/service/SparkTroubleshooter.vue
+++ b/src/plugins/spark/service/SparkTroubleshooter.vue
@@ -1,8 +1,12 @@
 <script setup lang="ts">
 import { SparkStatusDescription } from 'brewblox-proto/ts';
+import pluralize from 'pluralize';
 import { computed, inject, provide, reactive, ref, watch } from 'vue';
 import { useSparkStore } from '@/plugins/spark/store';
-import { fetchKnownUsbDevices } from '@/plugins/spark/store/spark-api';
+import {
+  fetchKnownMdnsDevices,
+  fetchKnownUsbDevices,
+} from '@/plugins/spark/store/spark-api';
 import { SparkUsbDevices } from '@/plugins/spark/types';
 import { WidgetContext } from '@/store/features';
 import { ContextKey, NowKey } from '@/symbols';
@@ -39,6 +43,8 @@ provide(
 
 const sparkStore = useSparkStore();
 const now = inject(NowKey)!;
+
+const mDNSDevices = ref<string[] | null>(null);
 const usbDevices = ref<SparkUsbDevices | null>(null);
 
 const status = computed<SparkStatusDescription | null>(() =>
@@ -56,15 +62,34 @@ const connectionStep = computed<ConnectionStep>(() => {
   return status.value.connection_status;
 });
 
-const usbSupported = computed<boolean>(() => {
-  if (!status.value) {
-    return true;
+const desiredDeviceId = computed<string | null>(
+  () => status.value?.service.device.device_id ?? null,
+);
+
+const discoveryKindDesc = computed<string>(() => {
+  const kind = status.value?.discovery_kind;
+  switch (kind) {
+    case undefined:
+      return 'Unknown';
+    case 'ADDRESS':
+      return 'Fixed IP address';
+    case 'SIM':
+      return 'Simulator';
+    case 'MDNS':
+      return 'mDNS';
+    case 'ALL':
+      return 'USB, mDNS, and MQTT';
+    default:
+      return kind;
   }
-  // The Spark 4 does not support USB, and has a device ID of 12 (hex MAC address)
-  // If there is no desired device ID, we assume USB may be supported.
-  return status.value.service.device.device_id?.length != 12;
 });
 
+// The Spark 4 does not support USB, and has a device ID of 12 (hex MAC address)
+// If there is no desired device ID, we assume USB may be supported.
+const usbSupported = computed<boolean>(
+  () => desiredDeviceId.value?.length != 12,
+);
+
 function isStepDone(step: ConnectionStep): boolean {
   return stepOrder.indexOf(step) < stepOrder.indexOf(connectionStep.value);
 }
@@ -94,8 +119,13 @@ function serviceReboot(): void {
 watch(
   () => now.value,
   async () => {
-    if (connectionStep.value != 'UNREACHABLE' && usbSupported.value) {
+    if (
+      connectionStep.value != 'UNREACHABLE' &&
+      usbSupported.value &&
+      status.value?.enabled !== false
+    ) {
       usbDevices.value = await fetchKnownUsbDevices(props.serviceId);
+      mDNSDevices.value = await fetchKnownMdnsDevices(props.serviceId);
     }
   },
   { immediate: true },
@@ -163,19 +193,44 @@ watch(
           <template v-if="status">
             <template v-if="status.enabled">
               Your Spark service is online, but not connected to your
-              controller.
+              controller. The service discovers controllers using
+              <b>{{ discoveryKindDesc }} </b>, and the desired device ID is
+              <b>{{ desiredDeviceId || 'any' }}</b>
+              .
+
               <ul>
                 <li>Is your controller turned on?</li>
                 <li>Are there any error messages in your service logs?</li>
-                <li>WiFi: Does your controller display its IP address?</li>
+                <li>Does your controller display its IP address?</li>
+                <template v-if="mDNSDevices == null">
+                  <li>Checking mDNS devices...</li>
+                </template>
+                <template v-else>
+                  <li>
+                    Detected
+                    {{ pluralize('controller', mDNSDevices.length, true) }}
+                    using mDNS
+                    <ul>
+                      <li
+                        v-for="dev in mDNSDevices"
+                        :key="dev"
+                      >
+                        {{ dev }}
+                      </li>
+                    </ul>
+                  </li>
+                </template>
                 <template v-if="usbSupported">
                   <template v-if="usbDevices == null">
-                    USB: Checking USB devices...
+                    <li>Checking USB devices...</li>
                   </template>
                   <template v-else-if="usbDevices.enabled">
                     <li>
-                      USB: Detected {{ usbDevices.devices.length }} USB
-                      device(s)
+                      Detected
+                      {{
+                        pluralize('controller', usbDevices.devices.length, true)
+                      }}
+                      using USB
                       <ul>
                         <li
                           v-for="dev in usbDevices.devices"
@@ -185,7 +240,6 @@ watch(
                         </li>
                       </ul>
                     </li>
-                    <li>USB: Can Docker access USB devices? (Mac hosts)</li>
                   </template>
                   <template v-else>
                     <li>USB: The USB proxy is not enabled in brewblox.yml.</li>
diff --git a/src/plugins/spark/store/spark-api.ts b/src/plugins/spark/store/spark-api.ts
index 787ce0f5f..c304b37a8 100644
--- a/src/plugins/spark/store/spark-api.ts
+++ b/src/plugins/spark/store/spark-api.ts
@@ -287,3 +287,9 @@ export const fetchKnownUsbDevices = (
     .post(`/${encodeURIComponent(serviceId)}/system/usb`, {})
     .then((resp) => resp.data)
     .catch(intercept(`Failed to query USB devices for ${serviceId}`));
+
+export const fetchKnownMdnsDevices = (serviceId: string): Promise<string[]> =>
+  http
+    .post(`/${encodeURIComponent(serviceId)}/system/mdns`, {})
+    .then((resp) => resp.data)
+    .catch(intercept(`Failed to query mDNS devices for ${serviceId}`));
diff --git a/yarn.lock b/yarn.lock
index 82bb41bc0..34fced1e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3124,6 +3124,7 @@ __metadata:
     parse-duration: "npm:^1.1.0"
     pinia: "npm:^2.1.7"
     plotly.js: "npm:^2.32.0"
+    pluralize: "npm:^8.0.0"
     portal-vue: "npm:^3.0.0"
     prettier: "npm:^3.2.5"
     process: "npm:^0.11.10"
@@ -7987,6 +7988,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pluralize@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "pluralize@npm:8.0.0"
+  checksum: 10c0/2044cfc34b2e8c88b73379ea4a36fc577db04f651c2909041b054c981cd863dd5373ebd030123ab058d194ae615d3a97cfdac653991e499d10caf592e8b3dc33
+  languageName: node
+  linkType: hard
+
 "point-in-polygon@npm:^1.1.0":
   version: 1.1.0
   resolution: "point-in-polygon@npm:1.1.0"

From 50118b686e43e2bf0709c2cb34b128327852248c Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Wed, 26 Jun 2024 18:21:03 +0200
Subject: [PATCH 16/27] use bracket access until proto is updated

---
 src/plugins/spark/service/SparkTroubleshooter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/spark/service/SparkTroubleshooter.vue b/src/plugins/spark/service/SparkTroubleshooter.vue
index 8a5c2af53..dab8736a4 100644
--- a/src/plugins/spark/service/SparkTroubleshooter.vue
+++ b/src/plugins/spark/service/SparkTroubleshooter.vue
@@ -67,7 +67,7 @@ const desiredDeviceId = computed<string | null>(
 );
 
 const discoveryKindDesc = computed<string>(() => {
-  const kind = status.value?.discovery_kind;
+  const kind = status.value?.['discovery_kind'];
   switch (kind) {
     case undefined:
       return 'Unknown';

From d4fa6a9b8f7ea8c3a6328c461eb7428f12ed6e36 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Fri, 28 Jun 2024 13:22:36 +0200
Subject: [PATCH 17/27] merge gpio module and analog gpio module

---
 dev/makecert.sh                               |   2 +-
 firmware.ini                                  |  12 +-
 package.json                                  |   2 +-
 .../components/QuickstartChannelField.vue     |   2 +-
 .../components/QuickstartDiscoveryTask.vue    |   6 +-
 src/plugins/quickstart/utils.ts               |  12 +-
 .../GpioModuleWidget.vue}                     |   6 +-
 .../{AnalogGpioModule => GpioModule}/index.ts |  14 +-
 .../OneWireGpioModuleWidget.vue               | 164 ------------------
 .../spark/features/OneWireGpioModule/index.ts |  76 --------
 src/plugins/spark/features/index.ts           |   8 +-
 src/plugins/spark/utils/formatting.ts         |   6 +-
 yarn.lock                                     |   8 +-
 13 files changed, 37 insertions(+), 281 deletions(-)
 rename src/plugins/spark/features/{AnalogGpioModule/AnalogGpioModuleWidget.vue => GpioModule/GpioModuleWidget.vue} (97%)
 rename src/plugins/spark/features/{AnalogGpioModule => GpioModule}/index.ts (85%)
 delete mode 100644 src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
 delete mode 100644 src/plugins/spark/features/OneWireGpioModule/index.ts

diff --git a/dev/makecert.sh b/dev/makecert.sh
index 7bbf86869..eae3b62f7 100644
--- a/dev/makecert.sh
+++ b/dev/makecert.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -euo pipefail
+set -euox pipefail
 pushd "$(git rev-parse --show-toplevel)" >/dev/null
 
 mkdir -p dev/traefik/
diff --git a/firmware.ini b/firmware.ini
index da4129369..d58bbfd1a 100644
--- a/firmware.ini
+++ b/firmware.ini
@@ -1,8 +1,8 @@
 [FIRMWARE]
-firmware_version=7debb0ff
-firmware_date=2024-05-17
-firmware_sha=7debb0ff847e26973987fe974b96443f0de06eb4
-proto_version=085aa575
-proto_date=2024-05-17
-proto_sha=085aa5756728fe8815c434d6d2a61976b642f4b4
+firmware_version=1b1103d4
+firmware_date=2024-06-27
+firmware_sha=1b1103d46643d6b3f26dc3a8ca5754cb6afcd40a
+proto_version=e50c045c
+proto_date=2024-06-27
+proto_sha=e50c045c341e570e1fd141f54979e9e5ce9bd62e
 system_version=3.2.0
diff --git a/package.json b/package.json
index feebac19f..894bd0de0 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.6.8",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
diff --git a/src/plugins/quickstart/components/QuickstartChannelField.vue b/src/plugins/quickstart/components/QuickstartChannelField.vue
index 83d19b16c..eabc9482f 100644
--- a/src/plugins/quickstart/components/QuickstartChannelField.vue
+++ b/src/plugins/quickstart/components/QuickstartChannelField.vue
@@ -73,7 +73,7 @@ const opts = computed<SelectOption<IoChannelAddress>[]>(() => {
       .filter(
         (block): block is IoArrayInterfaceBlock =>
           isCompatible(block.type, BlockIntfType.IoArrayInterface) &&
-          block.type !== BlockType.OneWireGpioModule,
+          block.type !== BlockType.GpioModule,
       )
       .flatMap((block): IoChannelAddress[] =>
         block.data.channels.map((channel: IoChannel) => ({
diff --git a/src/plugins/quickstart/components/QuickstartDiscoveryTask.vue b/src/plugins/quickstart/components/QuickstartDiscoveryTask.vue
index e5fdc29fd..f94fbbff0 100644
--- a/src/plugins/quickstart/components/QuickstartDiscoveryTask.vue
+++ b/src/plugins/quickstart/components/QuickstartDiscoveryTask.vue
@@ -5,7 +5,7 @@ import {
   BlockType,
   DS2408Block,
   DS2413Block,
-  OneWireGpioModuleBlock,
+  GpioModuleBlock,
   TempSensorOneWireBlock,
 } from 'brewblox-proto/ts';
 import { computed, onBeforeMount } from 'vue';
@@ -37,7 +37,7 @@ const discoveredBlocks = computed<Block[]>(
       .filter((block) =>
         isCompatible(block.type, [
           BlockIntfType.OneWireDeviceInterface,
-          BlockType.OneWireGpioModule,
+          BlockType.GpioModule,
         ]),
       )
       .sort(makeObjectSorter('id')) ?? [],
@@ -48,7 +48,7 @@ function about(block: Block): string {
     return prettyQty(block.data.value);
   }
 
-  if (matchesType<OneWireGpioModuleBlock>(BlockType.OneWireGpioModule, block)) {
+  if (matchesType<GpioModuleBlock>(BlockType.GpioModule, block)) {
     return `Position ${block.data.modulePosition}`;
   }
 
diff --git a/src/plugins/quickstart/utils.ts b/src/plugins/quickstart/utils.ts
index de1888493..6ecc38124 100644
--- a/src/plugins/quickstart/utils.ts
+++ b/src/plugins/quickstart/utils.ts
@@ -1,7 +1,7 @@
 import {
   BlockType,
   DigitalActuatorBlock,
-  OneWireGpioModuleBlock,
+  GpioModuleBlock,
   PidBlock,
 } from 'brewblox-proto/ts';
 import cloneDeep from 'lodash/cloneDeep';
@@ -26,14 +26,12 @@ const digitalActuatorFilter = makeTypeFilter<DigitalActuatorBlock>(
   BlockType.DigitalActuator,
 );
 
-const oneWireGpioFilter = makeTypeFilter<OneWireGpioModuleBlock>(
-  BlockType.OneWireGpioModule,
-);
+const GpioFilter = makeTypeFilter<GpioModuleBlock>(BlockType.GpioModule);
 
 export function resetGpioChanges(serviceId: string): GpioChange[] {
   return useSparkStore()
     .blocksByService(serviceId)
-    .filter(oneWireGpioFilter)
+    .filter(GpioFilter)
     .sort((a, b) => a.data.modulePosition - b.data.modulePosition)
     .map((block) => ({
       blockId: block.id,
@@ -69,7 +67,7 @@ export function unlinkedActuators(
 export function changedIoModules(
   serviceId: string,
   changes: GpioChange[],
-): QuickstartPatch<OneWireGpioModuleBlock>[] {
+): QuickstartPatch<GpioModuleBlock>[] {
   return changes.map((change) => {
     const { blockId, channels } = change;
     return { blockId, patch: { channels } };
@@ -210,4 +208,4 @@ export const makeFridgeHeatConfig = (): PidConfig => ({
   kp: inverseTempQty(20),
   ti: bloxQty('2h'),
   td: bloxQty('10m'),
-});
+});
\ No newline at end of file
diff --git a/src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
similarity index 97%
rename from src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue
rename to src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
index 3dc8c4a00..7a52c751c 100644
--- a/src/plugins/spark/features/AnalogGpioModule/AnalogGpioModuleWidget.vue
+++ b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {
-  AnalogGpioModuleBlock,
-  AnalogModuleChannel,
+  GpioModuleBlock,
+  AnalogChannel,
   GpioErrorFlags,
   GpioModuleChannel,
   GpioPins,
@@ -19,7 +19,7 @@ function listedPins(pins: GpioPins): number[] {
 }
 
 const { context } = useContext.setup();
-const { block, patchBlock } = useBlockWidget.setup<AnalogGpioModuleBlock>();
+const { block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
 
 const power = computed<boolean>({
   get: () => block.value.data.useExternalPower,
diff --git a/src/plugins/spark/features/AnalogGpioModule/index.ts b/src/plugins/spark/features/GpioModule/index.ts
similarity index 85%
rename from src/plugins/spark/features/AnalogGpioModule/index.ts
rename to src/plugins/spark/features/GpioModule/index.ts
index bca337081..982adae61 100644
--- a/src/plugins/spark/features/AnalogGpioModule/index.ts
+++ b/src/plugins/spark/features/GpioModule/index.ts
@@ -1,7 +1,7 @@
 import {
-  AnalogGpioModuleBlock,
   BlockType,
   GpioErrorFlags,
+  GpioModuleBlock,
   GpioPins,
 } from 'brewblox-proto/ts';
 import { Plugin } from 'vue';
@@ -10,21 +10,21 @@ import { useBlockSpecStore } from '@/plugins/spark/store';
 import { BlockSpec } from '@/plugins/spark/types';
 import { useFeatureStore, WidgetFeature } from '@/store/features';
 import { cref } from '@/utils/component-ref';
-import widget from './AnalogGpioModuleWidget.vue';
+import widget from './GpioModuleWidget.vue';
 
-const type = BlockType.AnalogGpioModule;
-const title = 'Analog GPIO Module';
+const type = BlockType.GpioModule;
+const title = 'GPIO Module';
 
 const plugin: Plugin = {
   install(app) {
     const specStore = useBlockSpecStore();
     const featureStore = useFeatureStore();
 
-    const blockSpec: BlockSpec<AnalogGpioModuleBlock> = {
+    const blockSpec: BlockSpec<GpioModuleBlock> = {
       type,
       title,
       hasRelations: true,
-      generate: (): AnalogGpioModuleBlock['data'] => ({
+      generate: (): GpioModuleBlock['data'] => ({
         channels: [],
         modulePosition: 0,
         useExternalPower: false,
@@ -45,7 +45,7 @@ const plugin: Plugin = {
         },
         analogChannels: [],
       }),
-      analyze: (block: AnalogGpioModuleBlock) => {
+      analyze: (block: GpioModuleBlock) => {
         const { moduleStatus } = block.data.status;
         switch (moduleStatus) {
           case GpioErrorFlags.NONE:
diff --git a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue b/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
deleted file mode 100644
index 5fda624f6..000000000
--- a/src/plugins/spark/features/OneWireGpioModule/OneWireGpioModuleWidget.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<script setup lang="ts">
-import {
-  GpioErrorFlags,
-  GpioModuleChannel,
-  GpioPins,
-  OneWireGpioModuleBlock,
-} from 'brewblox-proto/ts';
-import { computed } from 'vue';
-import { useContext } from '@/composables';
-import { useBlockWidget } from '@/plugins/spark/composables';
-import { createDialogPromise } from '@/utils/dialog';
-
-/**
- * Converts GpioPins bitmask to list of 1-indexed pin numbers
- */
-function listedPins(pins: GpioPins): number[] {
-  return [...Array(8).keys()].filter((i) => (1 << i) & pins).map((i) => i + 1);
-}
-
-const { context } = useContext.setup();
-const { block, patchBlock } = useBlockWidget.setup<OneWireGpioModuleBlock>();
-
-const power = computed<boolean>({
-  get: () => block.value.data.useExternalPower,
-  set: async (useExternalPower) => {
-    const ok =
-      !useExternalPower ||
-      (await createDialogPromise({
-        component: 'ConfirmDialog',
-        componentProps: {
-          title: 'Switch to external power',
-          message:
-            'If enabled, all channels on this module will use the external power supply.' +
-            ' Are you sure?',
-        },
-      }));
-    if (ok) {
-      patchBlock({ useExternalPower });
-    }
-  },
-});
-
-const channels = computed<GpioModuleChannel[]>({
-  get: () => block.value.data.channels,
-  set: (channels) => patchBlock({ channels }),
-});
-
-const inputPins = computed<GpioPins>(() =>
-  block.value.data.channels
-    .filter((chan) => chan.deviceType.includes('DEV_DETECT'))
-    .reduce(
-      (pins: GpioPins, chan: GpioModuleChannel) => pins | chan.pinsMask,
-      GpioPins.NONE,
-    ),
-);
-
-const errors = computed<string[]>(() => {
-  const values: string[] = [];
-  const { moduleStatus, overCurrent, openLoad } = block.value.data.status;
-  if (overCurrent !== GpioPins.NONE) {
-    values.push(
-      'ERROR: Overcurrent on pin ' + listedPins(overCurrent).toString(),
-    );
-  } else if (moduleStatus & GpioErrorFlags.OVERCURRENT) {
-    values.push('ERROR: Overcurrent');
-  }
-  if (moduleStatus & GpioErrorFlags.OVERVOLTAGE) {
-    values.push('ERROR: Overvoltage');
-  }
-  if (moduleStatus & GpioErrorFlags.UNDERVOLTAGE_LOCKOUT) {
-    values.push('ERROR: Undervoltage');
-  }
-  if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_SHUTDOWN) {
-    values.push('ERROR: Overtemperature');
-  } else if (moduleStatus & GpioErrorFlags.OVERTEMPERATURE_WARNING) {
-    values.push('WARNING: Overtemperature');
-  }
-  if (moduleStatus & GpioErrorFlags.POWER_ON_RESET) {
-    values.push('ERROR: Not yet initialized (power on reset)');
-  }
-  if (moduleStatus & GpioErrorFlags.SPI_ERROR) {
-    values.push('ERROR: SPI error');
-  }
-  if (moduleStatus & GpioErrorFlags.OPEN_LOAD) {
-    const relevantPins = ~inputPins.value & openLoad;
-    if (relevantPins != GpioPins.NONE) {
-      values.push(
-        'WARNING: Open Load on pin ' + listedPins(relevantPins).toString(),
-      );
-    }
-  }
-  return values;
-});
-</script>
-
-<template>
-  <Card>
-    <template #toolbar>
-      <BlockWidgetToolbar has-mode-toggle />
-    </template>
-
-    <CardWarning v-if="errors.length">
-      <template #message>
-        <div
-          v-for="e in errors"
-          :key="`error-${e}`"
-        >
-          {{ e }}
-        </div>
-      </template>
-    </CardWarning>
-
-    <div class="widget-body">
-      <div class="row q-gutter-sm">
-        <LabeledField
-          label="Module position"
-          class="col-grow"
-        >
-          {{ block.data.modulePosition }}
-        </LabeledField>
-      </div>
-
-      <GpioArrayEditor
-        v-model:channels="channels"
-        :error-pins="block.data.status.overCurrent"
-      />
-
-      <template v-if="context.mode === 'Full'">
-        <q-separator inset />
-
-        <div class="column q-gutter-sm">
-          <div>
-            All channels in a module use the same power source. This is either
-            5V, or the external power supply.
-          </div>
-          <div>
-            There are two ways to attach an external power source: connected to
-            the two right-most pins in any GPIO module, or using a Power over
-            Ethernet (PoE) adapter. <br />
-            Any external power supply is a valid source for all modules.
-          </div>
-        </div>
-        <LabeledField label="Module power source">
-          <q-btn-group
-            outline
-            class="fit"
-            @click="power = !power"
-          >
-            <q-btn
-              outline
-              label="5V"
-              :color="power ? '' : 'primary'"
-            />
-            <q-btn
-              outline
-              label="External"
-              :color="power ? 'primary' : ''"
-            />
-          </q-btn-group>
-        </LabeledField>
-      </template>
-    </div>
-  </Card>
-</template>
diff --git a/src/plugins/spark/features/OneWireGpioModule/index.ts b/src/plugins/spark/features/OneWireGpioModule/index.ts
deleted file mode 100644
index 3380107ce..000000000
--- a/src/plugins/spark/features/OneWireGpioModule/index.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import {
-  BlockType,
-  GpioErrorFlags,
-  GpioPins,
-  OneWireGpioModuleBlock,
-} from 'brewblox-proto/ts';
-import { Plugin } from 'vue';
-import { discoveredBlockFeature } from '@/plugins/spark/generic';
-import { useBlockSpecStore } from '@/plugins/spark/store';
-import { BlockSpec } from '@/plugins/spark/types';
-import { useFeatureStore, WidgetFeature } from '@/store/features';
-import { cref } from '@/utils/component-ref';
-import widget from './OneWireGpioModuleWidget.vue';
-
-const type = BlockType.OneWireGpioModule;
-const title = 'OneWire GPIO Module';
-
-const plugin: Plugin = {
-  install(app) {
-    const specStore = useBlockSpecStore();
-    const featureStore = useFeatureStore();
-
-    const blockSpec: BlockSpec<OneWireGpioModuleBlock> = {
-      type,
-      title,
-      hasRelations: true,
-      generate: (): OneWireGpioModuleBlock['data'] => ({
-        channels: [],
-        modulePosition: 0,
-        useExternalPower: false,
-        status: {
-          moduleStatus: GpioErrorFlags.NONE,
-          pullUpDesired: GpioPins.NONE,
-          pullUpStatus: GpioPins.NONE,
-          pullUpWhenActive: GpioPins.NONE,
-          pullUpWhenInactive: GpioPins.NONE,
-          pullDownDesired: GpioPins.NONE,
-          pullDownStatus: GpioPins.NONE,
-          pullDownWhenActive: GpioPins.NONE,
-          pullDownWhenInactive: GpioPins.NONE,
-          overCurrent: GpioPins.NONE,
-          openLoad: GpioPins.NONE,
-          faultsHistory5m: GpioErrorFlags.NONE,
-          faultsHistory60m: GpioErrorFlags.NONE,
-        },
-      }),
-      analyze: (block: OneWireGpioModuleBlock) => {
-        const { moduleStatus } = block.data.status;
-        switch (moduleStatus) {
-          case GpioErrorFlags.NONE:
-          case GpioErrorFlags.OPEN_LOAD:
-            return 'Active';
-          default:
-            return 'Invalid';
-        }
-      },
-    };
-
-    const feature: WidgetFeature = {
-      ...discoveredBlockFeature,
-      id: type,
-      title,
-      role: 'Output',
-      component: cref(app, widget),
-      widgetSize: {
-        cols: 4,
-        rows: 4,
-      },
-    };
-
-    specStore.addBlockSpec(blockSpec);
-    featureStore.addWidgetFeature(feature);
-  },
-};
-
-export default plugin;
diff --git a/src/plugins/spark/features/index.ts b/src/plugins/spark/features/index.ts
index 3867f2b02..cbcb9a3b0 100644
--- a/src/plugins/spark/features/index.ts
+++ b/src/plugins/spark/features/index.ts
@@ -3,7 +3,6 @@ import ActuatorAnalogMock from './ActuatorAnalogMock';
 import ActuatorLogic from './ActuatorLogic';
 import ActuatorOffset from './ActuatorOffset';
 import ActuatorPwm from './ActuatorPwm';
-import AnalogGpioModule from './AnalogGpioModule';
 import Balancer from './Balancer';
 import DeprecatedObject from './DeprecatedObject';
 import DigitalActuator from './DigitalActuator';
@@ -12,11 +11,11 @@ import DisplaySettings from './DisplaySettings';
 import DS2408 from './DS2408';
 import DS2413 from './DS2413';
 import FastPwm from './FastPwm';
+import GpioModule from './GpioModule';
 import InactiveObject from './InactiveObject';
 import MockPins from './MockPins';
 import MotorValve from './MotorValve';
 import Mutex from './Mutex';
-import OneWireGpioModule from './OneWireGpioModule';
 import Pid from './Pid';
 import QuickActions from './QuickActions';
 import QuickValues from './QuickValues';
@@ -39,7 +38,6 @@ const plugins: Plugin[] = [
   ActuatorLogic,
   ActuatorOffset,
   ActuatorPwm,
-  AnalogGpioModule,
   Balancer,
   DigitalActuator,
   DigitalInput,
@@ -53,7 +51,7 @@ const plugins: Plugin[] = [
   Pid,
   MotorValve,
   Mutex,
-  OneWireGpioModule,
+  GpioModule,
   Sequence,
   SetpointProfile,
   SetpointSensorPair,
@@ -71,4 +69,4 @@ const plugins: Plugin[] = [
   Variables,
 ];
 
-export default plugins;
+export default plugins;
\ No newline at end of file
diff --git a/src/plugins/spark/utils/formatting.ts b/src/plugins/spark/utils/formatting.ts
index 8b85d5634..5c89c14cf 100644
--- a/src/plugins/spark/utils/formatting.ts
+++ b/src/plugins/spark/utils/formatting.ts
@@ -9,7 +9,7 @@ import {
   CHANNEL_NAMES_SPARK_3,
   DigitalConstraints,
   DS2408Block,
-  OneWireGpioModuleBlock,
+  GpioModuleBlock,
 } from 'brewblox-proto/ts';
 import { Enum } from 'typescript-string-enums';
 import { BlockAddress } from '@/plugins/spark/types';
@@ -47,7 +47,7 @@ export function channelName(
   if (matchesType<DS2408Block>(BlockType.DS2408, block)) {
     return CHANNEL_NAMES_DS2408[block.data.connectMode][id];
   }
-  if (matchesType<OneWireGpioModuleBlock>(BlockType.OneWireGpioModule, block)) {
+  if (matchesType<GpioModuleBlock>(BlockType.GpioModule, block)) {
     return block.data.channels.find((c) => c.id === id)?.name;
   }
   return undefined;
@@ -148,4 +148,4 @@ export function prettyLimitations(
   }
 
   return output.join(', ');
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 34fced1e1..b4404128c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/8cb1404a290d8b237069a110c5162b2314acd0733ba551c515a07f1dbcffbefa4377a3b60152d04d6b0f737559090283d29fdfbb958509a14ca967c50ae6ad48
+  checksum: 10c0/a54432c9d80bef06e4c4027db9c0ba9425a2bf9fe64d875fcd1a5a9ffa81600f58ae7cba807026847b658dd82d8e973e3924eba84ade4e87c69020caa59f6123
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
     "@vue/test-utils": "npm:^2.4.6"
     autoprefixer: "npm:^10.4.19"
     axios: "npm:^1.6.8"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=4f015c84245de0cc0dbf07c8f23e90e4ba1b1779"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"

From 4ea07d1b96a8b08304a5519777fdd41fc843bab7 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 1 Jul 2024 12:55:13 +0200
Subject: [PATCH 18/27] update analog channels in GPIO module

---
 firmware.ini                                  |  12 +-
 package.json                                  |   2 +-
 .../components/widget/AnalogArrayEditor.vue   | 126 +++++++++++++++---
 src/plugins/spark/const.ts                    |  10 +-
 .../features/GpioModule/GpioModuleWidget.vue  |  40 +++---
 yarn.lock                                     |   8 +-
 6 files changed, 143 insertions(+), 55 deletions(-)

diff --git a/firmware.ini b/firmware.ini
index d58bbfd1a..323fbb65a 100644
--- a/firmware.ini
+++ b/firmware.ini
@@ -1,8 +1,8 @@
 [FIRMWARE]
-firmware_version=1b1103d4
-firmware_date=2024-06-27
-firmware_sha=1b1103d46643d6b3f26dc3a8ca5754cb6afcd40a
-proto_version=e50c045c
-proto_date=2024-06-27
-proto_sha=e50c045c341e570e1fd141f54979e9e5ce9bd62e
+firmware_version=3396d383
+firmware_date=2024-07-01
+firmware_sha=3396d383f8b05a1a096b5f9fc7c2f31efcc07f96
+proto_version=7a7cafa4
+proto_date=2024-07-01
+proto_sha=7a7cafa46705bfe03945a6cd3978b88f37d28102
 system_version=3.2.0
diff --git a/package.json b/package.json
index 894bd0de0..9c8a95c9a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.6.8",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
index 42333a3df..1334d0389 100644
--- a/src/plugins/spark/components/widget/AnalogArrayEditor.vue
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -1,30 +1,126 @@
 <script setup lang="ts">
-import { AnalogModuleChannel } from 'brewblox-proto/ts';
-
+import { AnalogClaimerInterfaceBlock, AnalogModuleChannel, BlockOrIntfType, GpioModuleBlock } from 'brewblox-proto/ts';
+import {
+  ENUM_LABELS_ANALOG_SENSOR_TYPE,
+} from '@/plugins/spark/const';
+import { useSparkStore } from '@/plugins/spark/store';
+import { computed, defineProps } from 'vue';
+import { createBlockDialog } from '@/utils/block-dialog';
+import { Block, AnalogSensorType } from 'brewblox-proto/ts';
+import { createDialog } from '@/utils/dialog';
+import { patchBlock } from '../../store/spark-api';
 interface Props {
   channels: AnalogModuleChannel[];
+  serviceId: string;
+  blockId: string;
+}
+const sparkStore = useSparkStore();
+
+const props = defineProps<Props>();
+
+function existingSensors (channel : number) : Block[] {
+  return sparkStore.blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog).filter(
+    (block) =>
+      block.data.analogDevice.id === props.blockId &&
+      block.data.analogChannel === channel
+  );
+}
+
+function sensorToBlockType(sensorType: AnalogSensorType) : BlockOrIntfType | null{
+  if(sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_2WIRE ||
+    sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_3WIRE ||
+    sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_4WIRE){
+    return BlockOrIntfType.TempSensorAnalog;
+  }
+  return null;
+}
+
+function createSensor(sensorType: AnalogSensorType): void {
+  createDialog({
+    component: 'BlockWizardDialog',
+    componentProps: {
+      serviceId: props.serviceId,
+      compatible: BlockOrIntfType.TempSensorAnalog
+    },
+  });
 }
 
-defineProps<Props>();
 </script>
 
 <template>
-  <div class="column q-gutter-y-sm">
-    <div
-      v-for="channel in channels"
-      :key="`channel-${channel.id}`"
-      class="row q-gutter-sm"
-    >
-      <NumberField
-        v-model="channel.id"
-        label="ID"
-        readonly
-      />
+  <div class="column">
+      <div
+        v-for="channel in channels"
+        :key="`channel-${channel.id}`"
+        class="row q-gutter-xs"
+      >
+      <LabeledField
+          label="Channel"
+          readonly
+          class="col-2"
+        >
+          Analog {{ channel.id }}
+      </LabeledField>
       <LabeledField
         label="Sensor Type"
         readonly
+        class="col-2"
       >
-        {{ channel.sensorType }}
+      {{ ENUM_LABELS_ANALOG_SENSOR_TYPE[channel.sensorType] }}
+      </LabeledField>
+      <QuantityField v-if="channel.resistance !== undefined"
+        v-model="channel.resistance"
+        label="Resistance"
+        readonly
+        class="col-2"
+      />
+      <QuantityField v-if="channel.leadResistance !== undefined"
+        v-model="channel.leadResistance"
+        label="Lead-wire"
+        readonly
+        class="col-2"
+      />
+      <NumberField v-if="channel.bridgeOutput !== undefined"
+        v-model="channel.bridgeOutput"
+        label="Sensor output"
+        readonly
+        class="col-2"
+      />
+      <QuantityField v-if="channel.bridgeResistance !== undefined"
+        v-model="channel.bridgeResistance"
+        label="Sensor resistance"
+        readonly
+        class="col-2"
+      />
+      <LabeledField
+      v-if="existingSensors(channel.id).length > 0"
+      label="Used by"
+      readonly
+      class="col-grow row">
+            <q-btn
+              v-for="userBlock in existingSensors(channel.id)"
+              :key="userBlock.id"
+              :label="userBlock.id"
+              dense
+              no-caps
+              flat
+              class="depth-1"
+              @click="createBlockDialog(userBlock)"
+            />
+      </LabeledField>
+      <LabeledField
+      v-if="sensorToBlockType(channel.sensorType) !== null && existingSensors(channel.id).length == 0"
+      label="Not used"
+      readonly
+      class="col-grow row">
+            <q-btn
+              label="New Sensor"
+              dense
+              no-caps
+              flat
+              class="depth-1"
+              @click="createSensor(channel.sensorType)"
+            />
       </LabeledField>
     </div>
   </div>
diff --git a/src/plugins/spark/const.ts b/src/plugins/spark/const.ts
index f14f957ff..b170af778 100644
--- a/src/plugins/spark/const.ts
+++ b/src/plugins/spark/const.ts
@@ -169,8 +169,8 @@ export const ENUM_LABELS_TEMP_SENSOR_ANALOG_SPEC: EnumLabels<TempSensorAnalogSpe
 export const ENUM_LABELS_ANALOG_SENSOR_TYPE: EnumLabels<AnalogSensorType> = {
   ANALOG_SENSOR_TYPE_NONE: 'None',
   ANALOG_SENSOR_TYPE_STRAIN_GAUGE: 'Strain gauge',
-  ANALOG_SENSOR_TYPE_RTD_2WIRE: 'RTD (two wire)',
-  ANALOG_SENSOR_TYPE_RTD_3WIRE: 'RTD (three wire)',
-  ANALOG_SENSOR_TYPE_RTD_4WIRE: 'RTD (four wire)',
-  ANALOG_SENSOR_TYPE_RTD_3WIRE_LS: 'RTD (three wire LS)',
-};
+  ANALOG_SENSOR_TYPE_RTD_2WIRE: 'RTD (2-wire)',
+  ANALOG_SENSOR_TYPE_RTD_3WIRE: 'RTD (3-wire)',
+  ANALOG_SENSOR_TYPE_RTD_4WIRE: 'RTD (4-wire)',
+  ANALOG_SENSOR_TYPE_RTD_3WIRE_LS: 'RTD (3-wire low side)',
+};
\ No newline at end of file
diff --git a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
index 7a52c751c..0302622e2 100644
--- a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
+++ b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {
   GpioModuleBlock,
-  AnalogChannel,
+  AnalogModuleChannel,
   GpioErrorFlags,
   GpioModuleChannel,
   GpioPins,
@@ -19,7 +19,7 @@ function listedPins(pins: GpioPins): number[] {
 }
 
 const { context } = useContext.setup();
-const { block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
+const { serviceId, block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
 
 const power = computed<boolean>({
   get: () => block.value.data.useExternalPower,
@@ -120,39 +120,31 @@ const errors = computed<string[]>(() => {
       <div class="row q-gutter-sm">
         <LabeledField
           label="Module position"
-          class="col-grow"
+          class="col-3"
         >
           {{ block.data.modulePosition }}
         </LabeledField>
-      </div>
-
-      <GpioArrayEditor
-        v-model:channels="channels"
-        :error-pins="block.data.status.overCurrent"
-      />
-
-      <AnalogArrayEditor v-model:channels="analogChannels" />
-
-      <div class="col-break" />
-
-      <QuantityField
+        <QuantityField
         v-if="block.data.baroPressure != undefined"
         :model-value="block.data.baroPressure"
         label="Barometric pressure"
-        class="col-grow"
+        class="col-3"
         readonly
       />
-
-      <NumberField
-        v-if="block.data.baroTemperature != undefined"
-        :model-value="block.data.baroTemperature"
-        label="Barometric temperature"
-        class="col-grow"
-        readonly
+      </div>
+      <q-separator />
+      <GpioArrayEditor
+        v-model:channels="channels"
+        :error-pins="block.data.status.overCurrent"
       />
 
+      <template v-if="analogChannels.length > 0">
+        <q-separator />
+        <AnalogArrayEditor v-model:channels="analogChannels" :service-id="serviceId" :block-id="block.id"/>
+      </template>
+      <div class="col-break" />
       <template v-if="context.mode === 'Full'">
-        <q-separator inset />
+        <q-separator />
 
         <div class="column q-gutter-sm">
           <div>
diff --git a/yarn.lock b/yarn.lock
index b4404128c..e1eddcce4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/a54432c9d80bef06e4c4027db9c0ba9425a2bf9fe64d875fcd1a5a9ffa81600f58ae7cba807026847b658dd82d8e973e3924eba84ade4e87c69020caa59f6123
+  checksum: 10c0/ef546734ba16317186030a70bc3c57557e4aa3928c8b83845cfcfa517a4eee6a6d237f2e71f01f931c74082ccfb0d20231fec5f0178c2909714e59944db416e7
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
     "@vue/test-utils": "npm:^2.4.6"
     autoprefixer: "npm:^10.4.19"
     axios: "npm:^1.6.8"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=e50c045c341e570e1fd141f54979e9e5ce9bd62e"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"

From d9e4cd52ffdc70779b85a2482b2b8847efbfcf84 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 1 Jul 2024 13:22:37 +0200
Subject: [PATCH 19/27] fix lint errors

---
 src/plugins/quickstart/utils.ts               |   2 +-
 .../components/widget/AnalogArrayEditor.vue   | 137 ++++++++++--------
 src/plugins/spark/const.ts                    |   2 +-
 .../features/GpioModule/GpioModuleWidget.vue  |  23 +--
 src/plugins/spark/features/index.ts           |   2 +-
 src/plugins/spark/utils/formatting.ts         |   2 +-
 6 files changed, 96 insertions(+), 72 deletions(-)

diff --git a/src/plugins/quickstart/utils.ts b/src/plugins/quickstart/utils.ts
index 6ecc38124..5ee4397b4 100644
--- a/src/plugins/quickstart/utils.ts
+++ b/src/plugins/quickstart/utils.ts
@@ -208,4 +208,4 @@ export const makeFridgeHeatConfig = (): PidConfig => ({
   kp: inverseTempQty(20),
   ti: bloxQty('2h'),
   td: bloxQty('10m'),
-});
\ No newline at end of file
+});
diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
index 1334d0389..75d7559a8 100644
--- a/src/plugins/spark/components/widget/AnalogArrayEditor.vue
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -1,14 +1,16 @@
 <script setup lang="ts">
-import { AnalogClaimerInterfaceBlock, AnalogModuleChannel, BlockOrIntfType, GpioModuleBlock } from 'brewblox-proto/ts';
 import {
-  ENUM_LABELS_ANALOG_SENSOR_TYPE,
-} from '@/plugins/spark/const';
+  AnalogModuleChannel,
+  AnalogSensorType,
+  Block,
+  BlockOrIntfType,
+} from 'brewblox-proto/ts';
+import { defineProps } from 'vue';
+import { ENUM_LABELS_ANALOG_SENSOR_TYPE } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
-import { computed, defineProps } from 'vue';
 import { createBlockDialog } from '@/utils/block-dialog';
-import { Block, AnalogSensorType } from 'brewblox-proto/ts';
 import { createDialog } from '@/utils/dialog';
-import { patchBlock } from '../../store/spark-api';
+
 interface Props {
   channels: AnalogModuleChannel[];
   serviceId: string;
@@ -18,109 +20,126 @@ const sparkStore = useSparkStore();
 
 const props = defineProps<Props>();
 
-function existingSensors (channel : number) : Block[] {
-  return sparkStore.blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog).filter(
-    (block) =>
-      block.data.analogDevice.id === props.blockId &&
-      block.data.analogChannel === channel
-  );
+function existingSensors(channel: number): Block[] {
+  return sparkStore
+    .blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog)
+    .filter(
+      (block) =>
+        block.data.analogDevice.id === props.blockId &&
+        block.data.analogChannel === channel,
+    );
 }
 
-function sensorToBlockType(sensorType: AnalogSensorType) : BlockOrIntfType | null{
-  if(sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_2WIRE ||
+function sensorToBlockType(
+  sensorType: AnalogSensorType,
+): BlockOrIntfType | null {
+  if (
+    sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_2WIRE ||
     sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_3WIRE ||
-    sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_4WIRE){
+    sensorType === AnalogSensorType.ANALOG_SENSOR_TYPE_RTD_4WIRE
+  ) {
     return BlockOrIntfType.TempSensorAnalog;
   }
   return null;
 }
 
-function createSensor(sensorType: AnalogSensorType): void {
+function createSensor(sensorType: BlockOrIntfType | null): void {
+  if (sensorType === null) {
+    return;
+  }
   createDialog({
     component: 'BlockWizardDialog',
     componentProps: {
       serviceId: props.serviceId,
-      compatible: BlockOrIntfType.TempSensorAnalog
+      compatible: sensorType,
     },
   });
 }
-
 </script>
 
 <template>
   <div class="column">
-      <div
-        v-for="channel in channels"
-        :key="`channel-${channel.id}`"
-        class="row q-gutter-xs"
-      >
+    <div
+      v-for="channel in channels"
+      :key="`channel-${channel.id}`"
+      class="row q-gutter-xs"
+    >
       <LabeledField
-          label="Channel"
-          readonly
-          class="col-2"
-        >
-          Analog {{ channel.id }}
+        label="Channel"
+        readonly
+        class="col-2"
+      >
+        Analog {{ channel.id }}
       </LabeledField>
       <LabeledField
         label="Sensor Type"
         readonly
         class="col-2"
       >
-      {{ ENUM_LABELS_ANALOG_SENSOR_TYPE[channel.sensorType] }}
+        {{ ENUM_LABELS_ANALOG_SENSOR_TYPE[channel.sensorType] }}
       </LabeledField>
-      <QuantityField v-if="channel.resistance !== undefined"
+      <QuantityField
+        v-if="channel.resistance !== undefined"
         v-model="channel.resistance"
         label="Resistance"
         readonly
         class="col-2"
       />
-      <QuantityField v-if="channel.leadResistance !== undefined"
+      <QuantityField
+        v-if="channel.leadResistance !== undefined"
         v-model="channel.leadResistance"
         label="Lead-wire"
         readonly
         class="col-2"
       />
-      <NumberField v-if="channel.bridgeOutput !== undefined"
+      <NumberField
+        v-if="channel.bridgeOutput !== undefined"
         v-model="channel.bridgeOutput"
         label="Sensor output"
         readonly
         class="col-2"
       />
-      <QuantityField v-if="channel.bridgeResistance !== undefined"
+      <QuantityField
+        v-if="channel.bridgeResistance !== undefined"
         v-model="channel.bridgeResistance"
         label="Sensor resistance"
         readonly
         class="col-2"
       />
       <LabeledField
-      v-if="existingSensors(channel.id).length > 0"
-      label="Used by"
-      readonly
-      class="col-grow row">
-            <q-btn
-              v-for="userBlock in existingSensors(channel.id)"
-              :key="userBlock.id"
-              :label="userBlock.id"
-              dense
-              no-caps
-              flat
-              class="depth-1"
-              @click="createBlockDialog(userBlock)"
-            />
+        v-if="existingSensors(channel.id).length > 0"
+        label="Used by"
+        readonly
+        class="col-grow row"
+      >
+        <q-btn
+          v-for="userBlock in existingSensors(channel.id)"
+          :key="userBlock.id"
+          :label="userBlock.id"
+          dense
+          no-caps
+          flat
+          class="depth-1"
+          @click="createBlockDialog(userBlock)"
+        />
       </LabeledField>
       <LabeledField
-      v-if="sensorToBlockType(channel.sensorType) !== null && existingSensors(channel.id).length == 0"
-      label="Not used"
-      readonly
-      class="col-grow row">
-            <q-btn
-              label="New Sensor"
-              dense
-              no-caps
-              flat
-              class="depth-1"
-              @click="createSensor(channel.sensorType)"
-            />
+        v-if="
+          sensorToBlockType(channel.sensorType) !== null &&
+          existingSensors(channel.id).length == 0
+        "
+        label="Not used"
+        readonly
+        class="col-grow row"
+      >
+        <q-btn
+          label="New Sensor"
+          dense
+          no-caps
+          flat
+          class="depth-1"
+          @click="createSensor(sensorToBlockType(channel.sensorType))"
+        />
       </LabeledField>
     </div>
   </div>
diff --git a/src/plugins/spark/const.ts b/src/plugins/spark/const.ts
index b170af778..fa67de7b9 100644
--- a/src/plugins/spark/const.ts
+++ b/src/plugins/spark/const.ts
@@ -173,4 +173,4 @@ export const ENUM_LABELS_ANALOG_SENSOR_TYPE: EnumLabels<AnalogSensorType> = {
   ANALOG_SENSOR_TYPE_RTD_3WIRE: 'RTD (3-wire)',
   ANALOG_SENSOR_TYPE_RTD_4WIRE: 'RTD (4-wire)',
   ANALOG_SENSOR_TYPE_RTD_3WIRE_LS: 'RTD (3-wire low side)',
-};
\ No newline at end of file
+};
diff --git a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
index 0302622e2..40fce18f5 100644
--- a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
+++ b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import {
-  GpioModuleBlock,
   AnalogModuleChannel,
   GpioErrorFlags,
+  GpioModuleBlock,
   GpioModuleChannel,
   GpioPins,
 } from 'brewblox-proto/ts';
@@ -19,7 +19,8 @@ function listedPins(pins: GpioPins): number[] {
 }
 
 const { context } = useContext.setup();
-const { serviceId, block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
+const { serviceId, block, patchBlock } =
+  useBlockWidget.setup<GpioModuleBlock>();
 
 const power = computed<boolean>({
   get: () => block.value.data.useExternalPower,
@@ -125,12 +126,12 @@ const errors = computed<string[]>(() => {
           {{ block.data.modulePosition }}
         </LabeledField>
         <QuantityField
-        v-if="block.data.baroPressure != undefined"
-        :model-value="block.data.baroPressure"
-        label="Barometric pressure"
-        class="col-3"
-        readonly
-      />
+          v-if="block.data.baroPressure != undefined"
+          :model-value="block.data.baroPressure"
+          label="Barometric pressure"
+          class="col-3"
+          readonly
+        />
       </div>
       <q-separator />
       <GpioArrayEditor
@@ -140,7 +141,11 @@ const errors = computed<string[]>(() => {
 
       <template v-if="analogChannels.length > 0">
         <q-separator />
-        <AnalogArrayEditor v-model:channels="analogChannels" :service-id="serviceId" :block-id="block.id"/>
+        <AnalogArrayEditor
+          v-model:channels="analogChannels"
+          :service-id="serviceId"
+          :block-id="block.id"
+        />
       </template>
       <div class="col-break" />
       <template v-if="context.mode === 'Full'">
diff --git a/src/plugins/spark/features/index.ts b/src/plugins/spark/features/index.ts
index cbcb9a3b0..1fbe26101 100644
--- a/src/plugins/spark/features/index.ts
+++ b/src/plugins/spark/features/index.ts
@@ -69,4 +69,4 @@ const plugins: Plugin[] = [
   Variables,
 ];
 
-export default plugins;
\ No newline at end of file
+export default plugins;
diff --git a/src/plugins/spark/utils/formatting.ts b/src/plugins/spark/utils/formatting.ts
index 5c89c14cf..73937b65a 100644
--- a/src/plugins/spark/utils/formatting.ts
+++ b/src/plugins/spark/utils/formatting.ts
@@ -148,4 +148,4 @@ export function prettyLimitations(
   }
 
   return output.join(', ');
-}
\ No newline at end of file
+}

From 6554f6877e7492dc89557f7caaeef1c4ba022578 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 1 Jul 2024 17:12:09 +0200
Subject: [PATCH 20/27] fix review comments

---
 dev/makecert.sh                               |  2 +-
 .../components/widget/AnalogArrayEditor.vue   | 32 ++++++++++---------
 .../spark/features/GpioModule/index.ts        |  1 -
 src/plugins/spark/features/index.ts           |  4 +--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dev/makecert.sh b/dev/makecert.sh
index eae3b62f7..7bbf86869 100644
--- a/dev/makecert.sh
+++ b/dev/makecert.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -euox pipefail
+set -euo pipefail
 pushd "$(git rev-parse --show-toplevel)" >/dev/null
 
 mkdir -p dev/traefik/
diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
index 75d7559a8..cf52f20b1 100644
--- a/src/plugins/spark/components/widget/AnalogArrayEditor.vue
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -5,30 +5,32 @@ import {
   Block,
   BlockOrIntfType,
 } from 'brewblox-proto/ts';
-import { defineProps } from 'vue';
+import { computed } from 'vue';
 import { ENUM_LABELS_ANALOG_SENSOR_TYPE } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
+import { BlockAddress } from '@/plugins/spark/types';
 import { createBlockDialog } from '@/utils/block-dialog';
 import { createDialog } from '@/utils/dialog';
 
 interface Props {
   channels: AnalogModuleChannel[];
-  serviceId: string;
-  blockId: string;
+  address: BlockAddress;
 }
 const sparkStore = useSparkStore();
 
 const props = defineProps<Props>();
 
-function existingSensors(channel: number): Block[] {
-  return sparkStore
+const existingSensors = computed<{ [channelId: number]: Block[] }>(() => {
+  const sensors = sparkStore
     .blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog)
-    .filter(
-      (block) =>
-        block.data.analogDevice.id === props.blockId &&
-        block.data.analogChannel === channel,
+    .filter((block) => block.data.analogDevice.id === props.address.id);
+  return props.channels.reduce((acc, channel) => {
+    acc[channel.id] = sensors.filter(
+      (block) => block.data.analogChannel === channel.id,
     );
-}
+    return acc;
+  }, {});
+});
 
 function sensorToBlockType(
   sensorType: AnalogSensorType,
@@ -44,13 +46,13 @@ function sensorToBlockType(
 }
 
 function createSensor(sensorType: BlockOrIntfType | null): void {
-  if (sensorType === null) {
+  if (sensorType == null) {
     return;
   }
   createDialog({
     component: 'BlockWizardDialog',
     componentProps: {
-      serviceId: props.serviceId,
+      serviceId: props.address.serviceId,
       compatible: sensorType,
     },
   });
@@ -107,13 +109,13 @@ function createSensor(sensorType: BlockOrIntfType | null): void {
         class="col-2"
       />
       <LabeledField
-        v-if="existingSensors(channel.id).length > 0"
+        v-if="existingSensors[channel.id].length > 0"
         label="Used by"
         readonly
         class="col-grow row"
       >
         <q-btn
-          v-for="userBlock in existingSensors(channel.id)"
+          v-for="userBlock in existingSensors[channel.id]"
           :key="userBlock.id"
           :label="userBlock.id"
           dense
@@ -126,7 +128,7 @@ function createSensor(sensorType: BlockOrIntfType | null): void {
       <LabeledField
         v-if="
           sensorToBlockType(channel.sensorType) !== null &&
-          existingSensors(channel.id).length == 0
+          existingSensors[channel.id].length == 0
         "
         label="Not used"
         readonly
diff --git a/src/plugins/spark/features/GpioModule/index.ts b/src/plugins/spark/features/GpioModule/index.ts
index 982adae61..380918994 100644
--- a/src/plugins/spark/features/GpioModule/index.ts
+++ b/src/plugins/spark/features/GpioModule/index.ts
@@ -67,7 +67,6 @@ const plugin: Plugin = {
         cols: 4,
         rows: 4,
       },
-      experimental: true,
     };
 
     specStore.addBlockSpec(blockSpec);
diff --git a/src/plugins/spark/features/index.ts b/src/plugins/spark/features/index.ts
index 1fbe26101..81d8c959c 100644
--- a/src/plugins/spark/features/index.ts
+++ b/src/plugins/spark/features/index.ts
@@ -46,12 +46,12 @@ const plugins: Plugin[] = [
   DS2413,
   DeprecatedObject,
   FastPwm,
+  GpioModule,
   InactiveObject,
   MockPins,
-  Pid,
   MotorValve,
   Mutex,
-  GpioModule,
+  Pid,
   Sequence,
   SetpointProfile,
   SetpointSensorPair,

From 96ca097c7194597f32fd33e0cdbe8c777139fd16 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Mon, 1 Jul 2024 22:22:34 +0200
Subject: [PATCH 21/27] fix prop use in analog array editor

---
 src/plugins/spark/components/widget/AnalogArrayEditor.vue  | 2 +-
 src/plugins/spark/features/GpioModule/GpioModuleWidget.vue | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
index cf52f20b1..be201bd9c 100644
--- a/src/plugins/spark/components/widget/AnalogArrayEditor.vue
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -22,7 +22,7 @@ const props = defineProps<Props>();
 
 const existingSensors = computed<{ [channelId: number]: Block[] }>(() => {
   const sensors = sparkStore
-    .blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog)
+    .blocksByType(props.address.serviceId, BlockOrIntfType.TempSensorAnalog)
     .filter((block) => block.data.analogDevice.id === props.address.id);
   return props.channels.reduce((acc, channel) => {
     acc[channel.id] = sensors.filter(
diff --git a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
index 40fce18f5..d5de15ad5 100644
--- a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
+++ b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
@@ -9,6 +9,7 @@ import {
 import { computed } from 'vue';
 import { useContext } from '@/composables';
 import { useBlockWidget } from '@/plugins/spark/composables';
+import { asBlockAddress } from '@/plugins/spark/utils/configuration';
 import { createDialogPromise } from '@/utils/dialog';
 
 /**
@@ -19,8 +20,7 @@ function listedPins(pins: GpioPins): number[] {
 }
 
 const { context } = useContext.setup();
-const { serviceId, block, patchBlock } =
-  useBlockWidget.setup<GpioModuleBlock>();
+const { block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
 
 const power = computed<boolean>({
   get: () => block.value.data.useExternalPower,
@@ -143,8 +143,7 @@ const errors = computed<string[]>(() => {
         <q-separator />
         <AnalogArrayEditor
           v-model:channels="analogChannels"
-          :service-id="serviceId"
-          :block-id="block.id"
+          :address="asBlockAddress(block)"
         />
       </template>
       <div class="col-break" />

From 1912d03244ef5fa4119b2874f7af31ddec944bf0 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Mon, 1 Jul 2024 22:24:28 +0200
Subject: [PATCH 22/27] ensure color field model value has a hashtag prefix

---
 .../spark/features/DisplaySettings/DisplaySettingsFull.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/spark/features/DisplaySettings/DisplaySettingsFull.vue b/src/plugins/spark/features/DisplaySettings/DisplaySettingsFull.vue
index afbfde320..41d666ed9 100644
--- a/src/plugins/spark/features/DisplaySettings/DisplaySettingsFull.vue
+++ b/src/plugins/spark/features/DisplaySettings/DisplaySettingsFull.vue
@@ -169,7 +169,7 @@ function updateSlotColor(idx: number, color: string): void {
               @update:model-value="(v) => updateSlotName(idx, v)"
             />
             <ColorField
-              :model-value="slot.color"
+              :model-value="slotColor(slot)"
               title="Color"
               label="Color"
               message="Choose the LCD display background color for this block"

From c0a2f1820a6feddb727a9f97da6b78dc61eaec35 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Fri, 5 Jul 2024 15:25:36 +0200
Subject: [PATCH 23/27] disable mqtt reschedulePings, because it results in no
 pings and dropped connections after 90s

---
 src/eventbus.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/eventbus.ts b/src/eventbus.ts
index b625911a4..f5dd3e156 100644
--- a/src/eventbus.ts
+++ b/src/eventbus.ts
@@ -29,6 +29,7 @@ export class BrewbloxEventbus {
       port: PORT,
       path: '/eventbus',
       rejectUnauthorized: false,
+      reschedulePings: false,
     };
     if (this.client) {
       this.client.end();

From 2b7f9d6eae61b09757533e69640a42619a913d08 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Fri, 5 Jul 2024 16:05:50 +0200
Subject: [PATCH 24/27] automatically switch to OneWireGpioModuleWidget to
 GpioModule

---
 dev/presets/brewblox-ui-store.redis.json       | 15 +++++++++++++++
 src/plugins/spark/features/GpioModule/index.ts | 17 ++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev/presets/brewblox-ui-store.redis.json b/dev/presets/brewblox-ui-store.redis.json
index 46f12554a..1a5971951 100644
--- a/dev/presets/brewblox-ui-store.redis.json
+++ b/dev/presets/brewblox-ui-store.redis.json
@@ -85,6 +85,21 @@
       "blockId": "Sequence"
     }
   },
+  {
+    "namespace": "brewblox-ui-store:dashboard-items",
+    "id": "2-UtLY_8z24JlcbI8oLrF",
+    "title": "Old OneWire",
+    "feature": "OneWireGpioModule",
+    "cols": 4,
+    "order": 20,
+    "pinnedPosition": null,
+    "rows": 4,
+    "dashboard": "dashboard-home",
+    "config": {
+      "serviceId": "sparkey",
+      "blockId": "gpio-1"
+    }
+  },
   {
     "namespace": "brewblox-ui-store:logged-sessions",
     "id": "3d15296d-0abd-4d45-383c-0bec436ae319",
diff --git a/src/plugins/spark/features/GpioModule/index.ts b/src/plugins/spark/features/GpioModule/index.ts
index 380918994..4d000adfb 100644
--- a/src/plugins/spark/features/GpioModule/index.ts
+++ b/src/plugins/spark/features/GpioModule/index.ts
@@ -7,8 +7,9 @@ import {
 import { Plugin } from 'vue';
 import { discoveredBlockFeature } from '@/plugins/spark/generic';
 import { useBlockSpecStore } from '@/plugins/spark/store';
-import { BlockSpec } from '@/plugins/spark/types';
+import { BlockConfig, BlockSpec } from '@/plugins/spark/types';
 import { useFeatureStore, WidgetFeature } from '@/store/features';
+import { Widget } from '@/store/widgets';
 import { cref } from '@/utils/component-ref';
 import widget from './GpioModuleWidget.vue';
 
@@ -69,8 +70,22 @@ const plugin: Plugin = {
       },
     };
 
+    const renamedFeature: WidgetFeature = {
+      ...discoveredBlockFeature,
+      id: 'OneWireGpioModule',
+      title: 'OneWire GPIO Module (renamed)',
+      role: 'Output',
+      component: '',
+      widgetSize: { cols: 0, rows: 0 },
+      upgrade: (widget: Widget<unknown>): Widget<BlockConfig> | null => {
+        return { ...widget, feature: type } as Widget<BlockConfig>;
+      },
+      experimental: true,
+    };
+
     specStore.addBlockSpec(blockSpec);
     featureStore.addWidgetFeature(feature);
+    featureStore.addWidgetFeature(renamedFeature);
   },
 };
 

From 449949542dee9ecd46111292ecaca688df08751f Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 8 Jul 2024 14:26:44 +0200
Subject: [PATCH 25/27] wip derivative filter choice in pid

---
 src/plugins/spark/features/Pid/PidFull.vue    | 45 ++++++++++++++++++-
 .../SetpointSensorPairFull.vue                | 13 +++---
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/plugins/spark/features/Pid/PidFull.vue b/src/plugins/spark/features/Pid/PidFull.vue
index c7f3c363d..a2927dce8 100644
--- a/src/plugins/spark/features/Pid/PidFull.vue
+++ b/src/plugins/spark/features/Pid/PidFull.vue
@@ -15,6 +15,7 @@ import { isBlockClaimed } from '@/plugins/spark/utils/info';
 import { createBlockDialog } from '@/utils/block-dialog';
 import { createDialog } from '@/utils/dialog';
 import { matchesType } from '@/utils/objects';
+import { ENUM_LABELS_FILTER_CHOICE, ENUM_LABELS_DERIVATIVE_FILTER_CHOICE } from '@/plugins/spark/const';
 import {
   bloxQty,
   durationMs,
@@ -27,6 +28,9 @@ import {
 const sparkStore = useSparkStore();
 const { serviceId, block, patchBlock } = useBlockWidget.setup<PidBlock>();
 
+const filterOpts = selectable(ENUM_LABELS_FILTER_CHOICE);
+const derivativeFilterOpts = selectable(ENUM_LABELS_DERIVATIVE_FILTER_CHOICE);
+
 const inputBlock = computed<SetpointSensorPairBlock | null>(() =>
   sparkStore.blockByLink(serviceId, block.value.data.inputId),
 );
@@ -428,7 +432,7 @@ function startEditIValue(): void {
 
     <div class="row items-center justify-center boil q-pa-md q-gutter-y-sm">
       <div class="col-auto">
-        <span>Keep output above </span>
+        <span>Boil mode: keep the output above </span>
         <InlineQuantityField
           v-model="boilMinOutputQty"
           :class="{ 'text-green': boiling }"
@@ -436,6 +440,45 @@ function startEditIValue(): void {
         />
       </div>
 
+      <div class="col-auto">
+        <span>when the setpoint is higher than</span>
+        <InlineQuantityField
+          v-model="boilPoint"
+          :class="{ 'text-green': boiling }"
+          title="Boiling point"
+          message="
+        When the Setpoint is set to this temperature or higher,
+      the output of the PID will stay above the configured miniumum for boiling.
+      "
+        />
+      </div>
+    </div>
+    <q-separator inset />
+    <div class="row items-center justify-center boil q-pa-md q-gutter-y-sm">
+      <div class="col-auto">
+        <span>Derivative filter delay is
+        </span>
+        <SelectField
+        :model-value="block.data.derivativeFilterChoice"
+        :options="filterOpts"
+        :html="true"
+        title="Derivaive filter period"
+        label="Derivaive Filter period"
+        message="
+              <p>
+                A filter averages multiple sensor values to remove noise, spikes and sudden jumps.
+                Changes faster than the filter period will be filtered out.
+              </p>
+              <p>
+                A longer period will give a smoother output at the cost of a delay in response.
+                This delay is equal to the chosen period.
+              </p>
+              "
+        class="col-grow"
+        @update:model-value="(v) => patchBlock({ derivativeFilterChoice: v })"
+      />
+      </div>
+
       <div class="col-auto">
         <span>when the setpoint is higher than</span>
         <InlineQuantityField
diff --git a/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue b/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
index 0df649c90..63b987aad 100644
--- a/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
+++ b/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
@@ -75,13 +75,13 @@ const usedBy = computed<Block[]>(() => {
       <QuantityField
         :model-value="block.data.filterThreshold"
         :html="true"
-        title="Filter bypass threshold"
-        label="Bypass threshold"
+        title="Filter reset threshold"
+        label="Filter reset threshold"
         message="
               <p>
                 The filter can detect when a large step occurs
-                at the input and temporary bypass slow filtering.
-                The threshold for an input change that should trigger this can be set here.
+                at the input. It will then reset itself to the unfiltered value to avoid a delay.
+                The step detection threshold should be large enough to only trigger when you add hot or cold water, not when the heater or cooler turns on.
               </p>
               "
         class="col-grow"
@@ -90,12 +90,11 @@ const usedBy = computed<Block[]>(() => {
         <template #append>
           <q-btn
             flat
-            round
-            icon="mdi-skip-forward"
             class="self-end"
             @click.stop="patchBlock({ resetFilter: true })"
           >
-            <q-tooltip>Bypass filter now</q-tooltip>
+            <q-tooltip>Reset filter now</q-tooltip>
+            Trigger
           </q-btn>
         </template>
       </QuantityField>

From 47e5eaa74f2a21fef02b67fda49d3c7bdc67da34 Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 8 Jul 2024 17:17:36 +0200
Subject: [PATCH 26/27] update PidFull dialog for derivative filter settings

---
 firmware.ini                               | 12 +--
 package.json                               |  2 +-
 src/plugins/spark/const.ts                 | 10 +++
 src/plugins/spark/features/Pid/PidFull.vue | 90 +++++++++++++---------
 yarn.lock                                  |  8 +-
 5 files changed, 75 insertions(+), 47 deletions(-)

diff --git a/firmware.ini b/firmware.ini
index 323fbb65a..a7387cca5 100644
--- a/firmware.ini
+++ b/firmware.ini
@@ -1,8 +1,8 @@
 [FIRMWARE]
-firmware_version=3396d383
-firmware_date=2024-07-01
-firmware_sha=3396d383f8b05a1a096b5f9fc7c2f31efcc07f96
-proto_version=7a7cafa4
-proto_date=2024-07-01
-proto_sha=7a7cafa46705bfe03945a6cd3978b88f37d28102
+firmware_version=e8cdb3b0
+firmware_date=2024-07-08
+firmware_sha=e8cdb3b07d717f5178320702ad814c8b1d51af63
+proto_version=a58d8532
+proto_date=2024-07-07
+proto_sha=a58d8532c9337310966401f24afc2a64ec15701d
 system_version=3.2.0
diff --git a/package.json b/package.json
index 9c8a95c9a..bb0c60beb 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.6.8",
-    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102",
+    "brewblox-proto": "https://github.com/brewblox/brewblox-proto#commit=a58d8532c9337310966401f24afc2a64ec15701d",
     "buffer": "^6.0.3",
     "cm6-theme-basic-dark": "^0.2.0",
     "codemirror": "^6.0.1",
diff --git a/src/plugins/spark/const.ts b/src/plugins/spark/const.ts
index fa67de7b9..a8ced826a 100644
--- a/src/plugins/spark/const.ts
+++ b/src/plugins/spark/const.ts
@@ -52,6 +52,16 @@ export const ENUM_LABELS_FILTER_CHOICE: EnumLabels<FilterChoice> = {
   FILTER_30m: 'Filter 30m',
 };
 
+export const ENUM_LABELS_DERIVATIVE_FILTER_CHOICE: EnumLabels<FilterChoice> = {
+  FILTER_NONE: 'Derived from Td',
+  FILTER_15s: '20s',
+  FILTER_45s: '1m',
+  FILTER_90s: '2.5m',
+  FILTER_3m: '5m',
+  FILTER_10m: '15m',
+  FILTER_30m: '45m',
+};
+
 export const ENUM_LABELS_COMBINE_FUNC: EnumLabels<SensorCombiFunc> = {
   SENSOR_COMBI_FUNC_AVG: 'Average',
   SENSOR_COMBI_FUNC_MIN: 'Minimum',
diff --git a/src/plugins/spark/features/Pid/PidFull.vue b/src/plugins/spark/features/Pid/PidFull.vue
index a2927dce8..6bce9c6cb 100644
--- a/src/plugins/spark/features/Pid/PidFull.vue
+++ b/src/plugins/spark/features/Pid/PidFull.vue
@@ -3,19 +3,24 @@ import {
   ActuatorOffsetBlock,
   Block,
   BlockType,
+  FilterChoice,
   PidBlock,
   Quantity,
   SetpointSensorPairBlock,
 } from 'brewblox-proto/ts';
 import { computed } from 'vue';
 import { useBlockWidget } from '@/plugins/spark/composables';
+import {
+  ENUM_LABELS_DERIVATIVE_FILTER_CHOICE,
+  ENUM_LABELS_FILTER_CHOICE,
+} from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
 import { prettyBlock } from '@/plugins/spark/utils/formatting';
 import { isBlockClaimed } from '@/plugins/spark/utils/info';
 import { createBlockDialog } from '@/utils/block-dialog';
+import { selectable } from '@/utils/collections';
 import { createDialog } from '@/utils/dialog';
 import { matchesType } from '@/utils/objects';
-import { ENUM_LABELS_FILTER_CHOICE, ENUM_LABELS_DERIVATIVE_FILTER_CHOICE } from '@/plugins/spark/const';
 import {
   bloxQty,
   durationMs,
@@ -115,6 +120,31 @@ function startEditIValue(): void {
     },
   }).onOk((v: number) => patchBlock({ integralReset: v || 0.001 }));
 }
+
+function openDerivativeFilterDialog(): void {
+  createDialog({
+    component: 'SelectDialog',
+    componentProps: {
+      modelValue: block.value.data.derivativeFilterChoice,
+      title: 'Derivative filter delay',
+      message: `
+              <p>
+                The derivative is calculated from filtered input to reduce
+                the effect of noise and limited sensor resolution.
+              </p>
+              <p>
+                A longer delay will surpress derivative output from small sensor changes,
+                but can result in the D part of the PID being too late to counteract P.
+              </p>
+              `,
+      html: true,
+      selectOptions: derivativeFilterOpts,
+      selectProps: {
+        label: 'Filter delay',
+      },
+    },
+  }).onOk((v) => patchBlock({ derivativeFilterChoice: v }));
+}
 </script>
 
 <template>
@@ -432,7 +462,7 @@ function startEditIValue(): void {
 
     <div class="row items-center justify-center boil q-pa-md q-gutter-y-sm">
       <div class="col-auto">
-        <span>Boil mode: keep the output above </span>
+        <span>Boil mode keeps the output above </span>
         <InlineQuantityField
           v-model="boilMinOutputQty"
           :class="{ 'text-green': boiling }"
@@ -441,7 +471,7 @@ function startEditIValue(): void {
       </div>
 
       <div class="col-auto">
-        <span>when the setpoint is higher than</span>
+        <span>when the setpoint is above</span>
         <InlineQuantityField
           v-model="boilPoint"
           :class="{ 'text-green': boiling }"
@@ -456,40 +486,28 @@ function startEditIValue(): void {
     <q-separator inset />
     <div class="row items-center justify-center boil q-pa-md q-gutter-y-sm">
       <div class="col-auto">
-        <span>Derivative filter delay is
+        <span>Derivative filter delay is </span>
+        <span
+          class="clickable q-pa-sm q-ma-xs rounded-borders text-bold"
+          style="line-height: 200%"
+          @click="openDerivativeFilterDialog"
+        >
+          {{
+            ENUM_LABELS_DERIVATIVE_FILTER_CHOICE[
+              block.data.derivativeFilterChoice
+            ]
+          }}
         </span>
-        <SelectField
-        :model-value="block.data.derivativeFilterChoice"
-        :options="filterOpts"
-        :html="true"
-        title="Derivaive filter period"
-        label="Derivaive Filter period"
-        message="
-              <p>
-                A filter averages multiple sensor values to remove noise, spikes and sudden jumps.
-                Changes faster than the filter period will be filtered out.
-              </p>
-              <p>
-                A longer period will give a smoother output at the cost of a delay in response.
-                This delay is equal to the chosen period.
-              </p>
-              "
-        class="col-grow"
-        @update:model-value="(v) => patchBlock({ derivativeFilterChoice: v })"
-      />
-      </div>
-
-      <div class="col-auto">
-        <span>when the setpoint is higher than</span>
-        <InlineQuantityField
-          v-model="boilPoint"
-          :class="{ 'text-green': boiling }"
-          title="Boiling point"
-          message="
-        When the Setpoint is set to this temperature or higher,
-      the output of the PID will stay above the configured miniumum for boiling.
-      "
-        />
+        <template
+          v-if="
+            block.data.derivativeFilterChoice === FilterChoice.FILTER_NONE &&
+            block.data.derivativeFilter !== FilterChoice.FILTER_NONE
+          "
+        >
+          ({{
+            ENUM_LABELS_DERIVATIVE_FILTER_CHOICE[block.data.derivativeFilter]
+          }})
+        </template>
       </div>
     </div>
   </div>
diff --git a/yarn.lock b/yarn.lock
index e1eddcce4..2a5b806ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3060,12 +3060,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102":
+"brewblox-proto@https://github.com/brewblox/brewblox-proto#commit=a58d8532c9337310966401f24afc2a64ec15701d":
   version: 1.0.0
-  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102"
+  resolution: "brewblox-proto@https://github.com/brewblox/brewblox-proto.git#commit=a58d8532c9337310966401f24afc2a64ec15701d"
   dependencies:
     typescript-string-enums: "npm:^1.0.0"
-  checksum: 10c0/ef546734ba16317186030a70bc3c57557e4aa3928c8b83845cfcfa517a4eee6a6d237f2e71f01f931c74082ccfb0d20231fec5f0178c2909714e59944db416e7
+  checksum: 10c0/cd0c7414a56de98e41ab2c2c4431ac385b0ca3e5e5955e2e42a051c7f6cc79a8cc79629c416f7e4d295a3ae8abd1a096c4cb11b5e9aceb630b20dbb728dbc9e7
   languageName: node
   linkType: hard
 
@@ -3096,7 +3096,7 @@ __metadata:
     "@vue/test-utils": "npm:^2.4.6"
     autoprefixer: "npm:^10.4.19"
     axios: "npm:^1.6.8"
-    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=7a7cafa46705bfe03945a6cd3978b88f37d28102"
+    brewblox-proto: "https://github.com/brewblox/brewblox-proto#commit=a58d8532c9337310966401f24afc2a64ec15701d"
     buffer: "npm:^6.0.3"
     cm6-theme-basic-dark: "npm:^0.2.0"
     codemirror: "npm:^6.0.1"

From a8bb4b30e6958b78a3a6ccf6b090eadb002d9bec Mon Sep 17 00:00:00 2001
From: Elco Jacobs <elco@brewpi.com>
Date: Mon, 8 Jul 2024 17:23:50 +0200
Subject: [PATCH 27/27] fix lint errors

---
 src/plugins/spark/features/Pid/PidFull.vue                  | 6 +-----
 src/plugins/spark/features/Pid/index.ts                     | 1 +
 .../features/SetpointSensorPair/SetpointSensorPairFull.vue  | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/spark/features/Pid/PidFull.vue b/src/plugins/spark/features/Pid/PidFull.vue
index 6bce9c6cb..6dd0f5c9d 100644
--- a/src/plugins/spark/features/Pid/PidFull.vue
+++ b/src/plugins/spark/features/Pid/PidFull.vue
@@ -10,10 +10,7 @@ import {
 } from 'brewblox-proto/ts';
 import { computed } from 'vue';
 import { useBlockWidget } from '@/plugins/spark/composables';
-import {
-  ENUM_LABELS_DERIVATIVE_FILTER_CHOICE,
-  ENUM_LABELS_FILTER_CHOICE,
-} from '@/plugins/spark/const';
+import { ENUM_LABELS_DERIVATIVE_FILTER_CHOICE } from '@/plugins/spark/const';
 import { useSparkStore } from '@/plugins/spark/store';
 import { prettyBlock } from '@/plugins/spark/utils/formatting';
 import { isBlockClaimed } from '@/plugins/spark/utils/info';
@@ -33,7 +30,6 @@ import {
 const sparkStore = useSparkStore();
 const { serviceId, block, patchBlock } = useBlockWidget.setup<PidBlock>();
 
-const filterOpts = selectable(ENUM_LABELS_FILTER_CHOICE);
 const derivativeFilterOpts = selectable(ENUM_LABELS_DERIVATIVE_FILTER_CHOICE);
 
 const inputBlock = computed<SetpointSensorPairBlock | null>(() =>
diff --git a/src/plugins/spark/features/Pid/index.ts b/src/plugins/spark/features/Pid/index.ts
index 3625e968e..45411a730 100644
--- a/src/plugins/spark/features/Pid/index.ts
+++ b/src/plugins/spark/features/Pid/index.ts
@@ -51,6 +51,7 @@ const plugin: Plugin = {
         integral: 0,
         derivative: 0,
         derivativeFilter: FilterChoice.FILTER_NONE,
+        derivativeFilterChoice: FilterChoice.FILTER_NONE,
         integralReset: 0,
         boilPointAdjust: deltaTempQty(0),
         boilMinOutput: 0,
diff --git a/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue b/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
index 63b987aad..dfeab927c 100644
--- a/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
+++ b/src/plugins/spark/features/SetpointSensorPair/SetpointSensorPairFull.vue
@@ -81,7 +81,8 @@ const usedBy = computed<Block[]>(() => {
               <p>
                 The filter can detect when a large step occurs
                 at the input. It will then reset itself to the unfiltered value to avoid a delay.
-                The step detection threshold should be large enough to only trigger when you add hot or cold water, not when the heater or cooler turns on.
+                The step detection threshold should be large enough to only trigger when you
+                add hot or cold water, not when the heater or cooler turns on.
               </p>
               "
         class="col-grow"