Merge branch 'master' into dev

This commit is contained in:
Koen Kanters 2021-11-18 20:14:37 +01:00
commit 6279c83e65
3 changed files with 12 additions and 2 deletions

View File

@ -20,3 +20,8 @@ jobs:
commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }} commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }}
branch: "update_zh" branch: "update_zh"
title: Update zigbee-herdsman to ${{ github.event.client_payload.version }} title: Update zigbee-herdsman to ${{ github.event.client_payload.version }}
- uses: peter-evans/enable-pull-request-automerge@v1
if: steps.cpr.outputs.pull-request-operation == 'created'
with:
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
merge-method: squash

View File

@ -20,3 +20,8 @@ jobs:
commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }}
branch: "update_zhc" branch: "update_zhc"
title: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} title: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }}
- uses: peter-evans/enable-pull-request-automerge@v1
if: steps.cpr.outputs.pull-request-operation == 'created'
with:
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
merge-method: squash

View File

@ -35,7 +35,7 @@
</div> </div>
<h1>Zigbee2MQTT 🌉 🐝</h1> <h1>Zigbee2MQTT 🌉 🐝</h1>
<p> <p>
Allows you to use your Zigbee devices <b>without</b> the vendors bridge or gateway. Allows you to use your Zigbee devices <b>without</b> the vendor's bridge or gateway.
</p> </p>
<p> <p>
It bridges events and allows you to control your Zigbee devices via MQTT. In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. It bridges events and allows you to control your Zigbee devices via MQTT. In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using.
@ -75,7 +75,7 @@ Zigbee2MQTT uses TypeScript (partially for now). Therefore after making changes
## Supported devices ## Supported devices
See [Supported devices](https://www.zigbee2mqtt.io/supported-devices) to check whether your device is supported. There is quite an extensive list, including devices from vendors like Xiaomi, Ikea, Philips, OSRAM and more. See [Supported devices](https://www.zigbee2mqtt.io/supported-devices) to check whether your device is supported. There is quite an extensive list, including devices from vendors like Xiaomi, Ikea, Philips, OSRAM and more.
If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easy, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html). If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easily, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html).
## Support & help ## Support & help
If you need assistance you can check [opened issues](https://github.com/Koenkk/zigbee2mqtt/issues). Feel free to help with Pull Requests when you were able to fix things or add new devices or just share the love on social media. If you need assistance you can check [opened issues](https://github.com/Koenkk/zigbee2mqtt/issues). Feel free to help with Pull Requests when you were able to fix things or add new devices or just share the love on social media.