Skip to content

Commit

Permalink
Bump version to 1.16.2 (#14)
Browse files Browse the repository at this point in the history
* Bump version to 1.16.2

* Fix type in schema
  • Loading branch information
rstein authored Dec 3, 2020
1 parent 40d5d62 commit 38efe5f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
2 changes: 2 additions & 0 deletions common/rootfs/etc/cont-init.d/zigbee2mqtt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ fi
CONFIG_PATH=/data/options.json
bashio::log.info "Adjusting Zigbee2mqtt core yaml config with add-on quirks ..."
cat "$CONFIG_PATH" | jq 'del(.data_path, .zigbee_shepherd_devices, .socat)' \
| jq 'if .devices then .devices = (.devices | split(",")|map(gsub("\\s+";"";"g"))) else . end' \
| jq 'if .groups then .groups = (.groups | split(",")|map(gsub("\\s+";"";"g"))) else . end' \
| jq 'if .advanced.ext_pan_id_string then .advanced.ext_pan_id = (.advanced.ext_pan_id_string | (split(",")|map(tonumber))) | del(.advanced.ext_pan_id_string) else . end' \
| jq 'if .advanced.network_key_string then .advanced.network_key = (.advanced.network_key_string | (split(",")|map(tonumber))) | del(.advanced.network_key_string) else . end' \
| jq 'if .device_options_string then .device_options = (.device_options_string|fromjson) | del(.device_options_string) else . end' \
Expand Down
4 changes: 3 additions & 1 deletion zigbee2mqtt-edge/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"keepalive": "int?",
"version": "int?",
"reject_unauthorized": "bool?",
"include_device_information": "bool?"
"include_device_information": "bool?",
"force_disable_retain": "bool?"
},
"serial": {
"port": "str",
Expand Down Expand Up @@ -154,6 +155,7 @@
"new_api": "bool?"
},
"frontend": {
"host": "str?",
"port": "int?"
},
"socat": {
Expand Down
9 changes: 9 additions & 0 deletions zigbee2mqtt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 1.16.2
- Updated Zigbee2mqtt to version [`1.16.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.16.2)
- New configuration options
- `mqtt`
- `force_disable_retain`
- `frontend`
- `host`
- `devices` and `groups` options now accept a comma-separated string of files

## 1.16.1-1
- Allow add-on to start with other mqtt servers not just built in

Expand Down
3 changes: 2 additions & 1 deletion zigbee2mqtt/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ When set, the add-on will scan your `data_path` for a `devices.js` file, and wil
- Depending on your configuration, the MQTT server config may need to include the port, typically `1883` or `8883` for SSL communications. For example, `mqtt://core-mosquitto:1883` for Home Assistant's Mosquitto add-on.
- To find out which serial ports you have exposed go to **Supervisor → System → Host system → ⋮ → Hardware**
- Please see this add-on's [documentation on GitHub](https://github.com/zigbee2mqtt/hassio-zigbee2mqtt/blob/dev/zigbee2mqtt/DOCS.md#socat) for further add-on-specific information (using Socat, how to add support for new devices etc.).
- The 'devices' and 'groups' configuration options accept arrays of files since Zigbee2MQTT v1.16.2. In order to maintain backwards compatibility of configurations, the same functionality is achieved in this addon by the use of comma-separated strings.

# Additional Configuration Options
- `network_key_string`
Expand Down Expand Up @@ -98,4 +99,4 @@ You can configure the socat module within the socat section using the following
- `options` extra options added to the socat command line (optional)
- `log` true/false if to log the socat stdout/stderr to data_path/socat.log (default: false)

**NOTE:** You'll have to change both the `master` and the `slave` options according to your needs. The defaults values will make sure that socat listens on port `8485` and redirects its output to `/dev/ttyZ2M`. The zigbee2mqtt's serial port setting is NOT automatically set and has to be changed accordingly.
**NOTE:** You'll have to change both the `master` and the `slave` options according to your needs. The defaults values will make sure that socat listens on port `8485` and redirects its output to `/dev/ttyZ2M`. The zigbee2mqtt's serial port setting is NOT automatically set and has to be changed accordingly.
6 changes: 4 additions & 2 deletions zigbee2mqtt/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Zigbee2mqtt",
"version": "1.16.1-1",
"version": "1.16.2",
"slug": "zigbee2mqtt",
"description": "Zigbee2mqtt add-on",
"auto_uart": true,
Expand Down Expand Up @@ -91,7 +91,8 @@
"keepalive": "int?",
"version": "int?",
"reject_unauthorized": "bool?",
"include_device_information": "bool?"
"include_device_information": "bool?",
"force_disable_retain": "bool?"
},
"serial": {
"port": "str",
Expand Down Expand Up @@ -154,6 +155,7 @@
"new_api": "bool?"
},
"frontend": {
"host": "str?",
"port": "int?"
},
"socat": {
Expand Down

0 comments on commit 38efe5f

Please sign in to comment.