Edge release

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",

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:
@@ -44,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:
@@ -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:
@@ -85,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}

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
@@ -34,7 +40,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
@@ -64,6 +70,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

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=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

package.json

@@ -33,81 +33,82 @@
     "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=a58d8532c9337310966401f24afc2a64ec15701d",
     "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",
+    "pluralize": "^8.0.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.12",
+    "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"

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;

src/eventbus.ts

@@ -29,6 +29,7 @@ export class BrewbloxEventbus {
       port: PORT,
       path: '/eventbus',
       rejectUnauthorized: false,
+      reschedulePings: false,
     };
     if (this.client) {
       this.client.end();

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),
     };
   });

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 }}

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

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

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