Support automatic adapter discovery

README.md

@@ -33,24 +33,26 @@
  - **Zigbee2MQTT Edge** tracks the `dev` branch of Zigbee2MQTT such that you can install the edge version if there are features or fixes in the Zigbee2MQTT dev branch that are not yet released.
 4. Click on the addon and press **Install** and wait till the addon is installed.
 5. Click on **Configuration**
- - If you are **not** using the Mosquitto broker addon fill in your MQTT details (leave empty when using the Mosquitto broker addon). Format can be found [here](https://www.zigbee2mqtt.io/guide/configuration/mqtt.html#server-connection), but skip the initial `mqtt:` indent. e.g.: <br>
+ - If you are **not** using the Mosquitto broker addon fill in your MQTT details (leave empty when using the Mosquitto broker addon) under the `mqtt` section. Format can be found [here](https://www.zigbee2mqtt.io/guide/configuration/mqtt.html#server-connection), but skip the initial `mqtt:` indent. e.g.: <br>
  ```yaml
  server: mqtt://localhost:1883
  user: my_user
  password: "my_password"
  ```
  Note: If the `password` includes certain special characters (reserved by yaml specification), the enclosing quotes are required. So it is recommended to always quote it when in doubt.
- - Fill in the serial details (e.g. port of your USB coordinator). Format can be found [here](https://www.zigbee2mqtt.io/guide/configuration/adapter-settings.html#adapter-settings), but skip the initial `serial:` indent. e.g.: <br>
- ```yaml
- port: /dev/ttyUSB0
- ```
- - If you don't know the port and you have just one USB device connected to your machine try `/dev/ttyUSB0`. Else use the [Home Assistant CLI](https://www.home-assistant.io/common-tasks/os#home-assistant-via-the-command-line) and execute `ha hardware info` to find out. 
+ - Since Zigbee2MQTT automatically attempts to detect the adapter, you can leave the `serial` section empty for now; we may need it later in step 7.
  - Click **Save**
  - **Tip:** it is possible to refer to variables in the Home Assistant `secrets.yaml` file (not the Zigbee2MQTT one!) by using e.g. `password: '!secret mqtt_pass'`
 1. Start the addon by going to **Info** and click **Start**
 1. Wait till Zigbee2MQTT starts and press **OPEN WEB UI** to verify Zigbee2MQTT started correctly.
  - If it shows `502: Bad Gateway` wait a bit more and refresh the page.
  - If this takes too long (e.g. 2 minutes +) check the **Log** tab to see what went wrong.
+ - In case the addon fails to start with the following error: `USB adapter discovery error (No valid USB adapter found). Specify valid 'adapter' and 'port' in your configuration.`, we need to fill in the `serial` section (which we skipped in step 5). Format can be found [here](https://www.zigbee2mqtt.io/guide/configuration/adapter-settings.html#adapter-settings), but skip the initial `serial:` indent. e.g.: <br>
+ ```yaml
+ port: /dev/ttyUSB0
+ adapter: zstack
+ ```
+ If you don't know the port and you have just one USB device connected to your machine try `/dev/ttyUSB0` or `/dev/ttyAMA0`. Else use the [Home Assistant CLI](https://www.home-assistant.io/common-tasks/os#home-assistant-via-the-command-line) and execute `ha hardware info` to find out. 
 
 For more information see [the documentation](https://github.com/zigbee2mqtt/hassio-zigbee2mqtt/blob/master/zigbee2mqtt/DOCS.md).
 

common/Dockerfile

@@ -4,7 +4,7 @@ FROM $BUILD_FROM as base
 ENV LANG C.UTF-8
 ARG BUILD_VERSION
 
-RUN apk add --no-cache socat tini nodejs
+RUN apk add --no-cache socat tini nodejs eudev
 
 # Dependencies and build
 FROM base as dependencies_and_build

zigbee2mqtt-edge/config.json

@@ -4,6 +4,7 @@
  "slug": "zigbee2mqtt_edge",
  "description": "Development build of the Zigbee2MQTT add-on",
  "uart": true,
+ "udev": true,
  "url": "https://github.com/zigbee2mqtt/hassio-zigbee2mqtt/tree/master/zigbee2mqtt-edge",
  "startup": "application",
  "services": [

zigbee2mqtt/config.json

@@ -4,6 +4,7 @@
  "slug": "zigbee2mqtt",
  "description": "Use your ZigBee devices without the vendor's bridge or gateway",
  "uart": true,
+ "udev": true,
  "url": "https://github.com/zigbee2mqtt/hassio-zigbee2mqtt/tree/master/zigbee2mqtt",
  "startup": "application",
  "services": [