From 7842842ff24f31fdb7755df3c57ab18519fbd0c1 Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:35:04 +0300 Subject: [PATCH] remove uneeded changes --- .gitignore | 1 - data/configuration.yaml | 25 +++++++++++++++---------- package-lock.json | 8 ++++---- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index b52c217ad..3cfd813f5 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,3 @@ data/* # commit-user-lookup.json scripts/commit-user-lookup.json -data/configuration.yaml diff --git a/data/configuration.yaml b/data/configuration.yaml index 9b1a4f131..3ed7c1ce0 100644 --- a/data/configuration.yaml +++ b/data/configuration.yaml @@ -1,15 +1,20 @@ +# Home Assistant integration (MQTT discovery) homeassistant: false + +# allow new devices to join permit_join: true -frontend: true + +# MQTT settings mqtt: + # MQTT base topic for zigbee2mqtt MQTT messages base_topic: zigbee2mqtt - server: mqtt://localhost + # MQTT server URL + server: 'mqtt://localhost' + # MQTT server authentication, uncomment if required: + # user: my_user + # password: my_password + +# Serial settings serial: - port: COM7 - adapter: deconz - adapter_delay: 200 -advanced: - log_level: debug -devices: - '0x00124b00271f9834': - friendly_name: '0x00124b00271f9834' \ No newline at end of file + # Location of CC2531 USB sniffer + port: /dev/ttyACM0 diff --git a/package-lock.json b/package-lock.json index f8e273a01..2805cd5fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "zigbee2mqtt", - "version": "1.40.1-dev", + "version": "1.40.1", "license": "GPL-3.0", "dependencies": { "ajv": "^8.17.1", @@ -5691,9 +5691,9 @@ "license": "MIT" }, "node_modules/follow-redirects": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", - "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual",