USB1 not USB0

infra/compose.yaml

@@ -11,14 +11,26 @@ services:
       - ./mosquitto/data:/mosquitto/data
       - ./mosquitto/log:/mosquitto/log
     healthcheck:
-      test: ["CMD", "mosquitto_pub", "-p", "1883", "-t", "healthcheck", "-m", "ok", "-r", "--quiet"]
+      test:
+        [
+          "CMD",
+          "mosquitto_pub",
+          "-p",
+          "1883",
+          "-t",
+          "healthcheck",
+          "-m",
+          "ok",
+          "-r",
+          "--quiet",
+        ]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
 
   zigbee2mqtt:
-    image: ghcr.io/pine64/zigbee2mqtt:latest-dev   # BLZ fork, NOT koenkk
+    image: ghcr.io/pine64/zigbee2mqtt:latest-dev # BLZ fork, NOT koenkk
     container_name: zigbee2mqtt
     restart: unless-stopped
     depends_on:
@@ -29,7 +41,7 @@ services:
       - ./zigbee2mqtt:/app/data
     devices:
       - source: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0-port0
-        target: /dev/ttyUSB0
+        target: /dev/ttyUSB1
         permissions: rw
     entrypoint: ["/app/data/scripts/entrypoint.sh"]
     command: ["/sbin/tini", "--", "node", "index.js"]
@@ -59,12 +71,12 @@ services:
     ports:
       - "1880:1880"
     volumes:
-      - ./nodered:/data                       # bind: settings.js, flows.json, start.sh, package.json
-      - /data/node_modules                    # anonymous: preserves build-time npm install
+      - ./nodered:/data # bind: settings.js, flows.json, start.sh, package.json
+      - /data/node_modules # anonymous: preserves build-time npm install
     environment:
       TZ: America/Los_Angeles
       DASHBOARD_BASE_HREF: /dashboard/
-    command: ["sh", "/data/start.sh"]	
+    command: ["sh", "/data/start.sh"]
 
   # Listens to ntfy.sh for doorbell events and toggles a smart plug on each alert.
   # Topic: ALERT_klubhaus_topic_test (matches ESP32 firmware DEBUG_MODE suffix)
@@ -109,7 +121,7 @@ services:
       - /run/dbus:size=1M
       - /run/user/0:size=1M
     cap_add:
-      - SYS_ADMIN                          # bluetoothd needs CAP_SYS_ADMIN for HCI
+      - SYS_ADMIN # bluetoothd needs CAP_SYS_ADMIN for HCI
       - NET_ADMIN
 
   # Spotify Connect: phone's Spotify app shows "Klubhaus" as a Connect target.
@@ -143,7 +155,7 @@ services:
       - "6680:6680"
     volumes:
       - ./mopidy/data:/var/lib/mopidy
-      - ./mopidy/music:/music              # drop FLACs in infra/mopidy/music/
+      - ./mopidy/music:/music # drop FLACs in infra/mopidy/music/
     environment:
       TZ: America/Los_Angeles
       QOBUZ_APP_ID: "${QOBUZ_APP_ID:-}"
@@ -170,5 +182,3 @@ services:
 
 volumes:
   librespot_cache:
-
-

infra/zigbee2mqtt/configuration.yaml

@@ -3,7 +3,7 @@ mqtt:
   base_topic: zigbee2mqtt
   server: mqtt://mosquitto:1883
 serial:
-  port: /dev/ttyUSB0
+  port: /dev/ttyUSB1
   adapter: blz
   baudrate: 2000000
   rtscts: false
@@ -42,20 +42,20 @@ frontend:
   port: 8080
 permit_join: false
 groups:
-  '1':
+  "1":
     friendly_name: all_plugs
     devices:
       - Squiggle
       - Sideboard Lamp
       - Bamboo Lights
 devices:
-  '0xffffb40e0604fbd0':
+  "0xffffb40e0604fbd0":
     friendly_name: Squiggle
-  '0xffffb40e06065536':
+  "0xffffb40e06065536":
     friendly_name: Door Button
-  '0xffffb40e0603c9e4':
+  "0xffffb40e0603c9e4":
     friendly_name: Sideboard Lamp
-  '0xffffb40e06050af6':
+  "0xffffb40e06050af6":
     friendly_name: Bamboo Lights
-  '0xffffb40e0603ef11':
+  "0xffffb40e0603ef11":
     friendly_name: DJ Booth