USB1 not USB0

This commit is contained in:
2026-08-01 11:21:14 -07:00
parent 97c30acfdd
commit 9e85a6d538
2 changed files with 27 additions and 17 deletions
+19 -9
View File
@@ -11,14 +11,26 @@ services:
- ./mosquitto/data:/mosquitto/data - ./mosquitto/data:/mosquitto/data
- ./mosquitto/log:/mosquitto/log - ./mosquitto/log:/mosquitto/log
healthcheck: 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 interval: 30s
timeout: 5s timeout: 5s
retries: 3 retries: 3
start_period: 30s start_period: 30s
zigbee2mqtt: 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 container_name: zigbee2mqtt
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
@@ -29,7 +41,7 @@ services:
- ./zigbee2mqtt:/app/data - ./zigbee2mqtt:/app/data
devices: devices:
- source: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0-port0 - source: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0-port0
target: /dev/ttyUSB0 target: /dev/ttyUSB1
permissions: rw permissions: rw
entrypoint: ["/app/data/scripts/entrypoint.sh"] entrypoint: ["/app/data/scripts/entrypoint.sh"]
command: ["/sbin/tini", "--", "node", "index.js"] command: ["/sbin/tini", "--", "node", "index.js"]
@@ -59,8 +71,8 @@ services:
ports: ports:
- "1880:1880" - "1880:1880"
volumes: volumes:
- ./nodered:/data # bind: settings.js, flows.json, start.sh, package.json - ./nodered:/data # bind: settings.js, flows.json, start.sh, package.json
- /data/node_modules # anonymous: preserves build-time npm install - /data/node_modules # anonymous: preserves build-time npm install
environment: environment:
TZ: America/Los_Angeles TZ: America/Los_Angeles
DASHBOARD_BASE_HREF: /dashboard/ DASHBOARD_BASE_HREF: /dashboard/
@@ -109,7 +121,7 @@ services:
- /run/dbus:size=1M - /run/dbus:size=1M
- /run/user/0:size=1M - /run/user/0:size=1M
cap_add: cap_add:
- SYS_ADMIN # bluetoothd needs CAP_SYS_ADMIN for HCI - SYS_ADMIN # bluetoothd needs CAP_SYS_ADMIN for HCI
- NET_ADMIN - NET_ADMIN
# Spotify Connect: phone's Spotify app shows "Klubhaus" as a Connect target. # Spotify Connect: phone's Spotify app shows "Klubhaus" as a Connect target.
@@ -143,7 +155,7 @@ services:
- "6680:6680" - "6680:6680"
volumes: volumes:
- ./mopidy/data:/var/lib/mopidy - ./mopidy/data:/var/lib/mopidy
- ./mopidy/music:/music # drop FLACs in infra/mopidy/music/ - ./mopidy/music:/music # drop FLACs in infra/mopidy/music/
environment: environment:
TZ: America/Los_Angeles TZ: America/Los_Angeles
QOBUZ_APP_ID: "${QOBUZ_APP_ID:-}" QOBUZ_APP_ID: "${QOBUZ_APP_ID:-}"
@@ -170,5 +182,3 @@ services:
volumes: volumes:
librespot_cache: librespot_cache:
+7 -7
View File
@@ -3,7 +3,7 @@ mqtt:
base_topic: zigbee2mqtt base_topic: zigbee2mqtt
server: mqtt://mosquitto:1883 server: mqtt://mosquitto:1883
serial: serial:
port: /dev/ttyUSB0 port: /dev/ttyUSB1
adapter: blz adapter: blz
baudrate: 2000000 baudrate: 2000000
rtscts: false rtscts: false
@@ -42,20 +42,20 @@ frontend:
port: 8080 port: 8080
permit_join: false permit_join: false
groups: groups:
'1': "1":
friendly_name: all_plugs friendly_name: all_plugs
devices: devices:
- Squiggle - Squiggle
- Sideboard Lamp - Sideboard Lamp
- Bamboo Lights - Bamboo Lights
devices: devices:
'0xffffb40e0604fbd0': "0xffffb40e0604fbd0":
friendly_name: Squiggle friendly_name: Squiggle
'0xffffb40e06065536': "0xffffb40e06065536":
friendly_name: Door Button friendly_name: Door Button
'0xffffb40e0603c9e4': "0xffffb40e0603c9e4":
friendly_name: Sideboard Lamp friendly_name: Sideboard Lamp
'0xffffb40e06050af6': "0xffffb40e06050af6":
friendly_name: Bamboo Lights friendly_name: Bamboo Lights
'0xffffb40e0603ef11': "0xffffb40e0603ef11":
friendly_name: DJ Booth friendly_name: DJ Booth