Skip to content

Commit

Permalink
Merge branch 'current' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
fabaff committed Dec 8, 2019
2 parents 21aa73a + 3b39c55 commit b4dde79
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 22 deletions.
Empty file modified source/_docs/ecosystem/appdaemon.markdown
100755 → 100644
Empty file.
Empty file modified source/_docs/ecosystem/appdaemon/api.markdown
100755 → 100644
Empty file.
Empty file modified source/_docs/ecosystem/appdaemon/running.markdown
100755 → 100644
Empty file.
Empty file modified source/_docs/ecosystem/appdaemon/tutorial.markdown
100755 → 100644
Empty file.
Empty file modified source/_docs/ecosystem/appdaemon/windows.markdown
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion source/_docs/ecosystem/backup/backup_dropbox.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: "Instructions on how backup your Home Assistant configuration to Dr
redirect_from: /cookbook/dropboxbackup/
---

Backing up and regularly syncing your Home Assistant configuration to [Dropbox](http://dropbox.com) similar to [Github Backup](/docs/ecosystem/backup/backup_github/)
Backing up and regularly syncing your Home Assistant configuration to [Dropbox](http://dropbox.com) is similar to [Github Backup](/docs/ecosystem/backup/backup_github/)

### Requirements

Expand Down
Empty file modified source/_docs/ecosystem/hadashboard.markdown
100755 → 100644
Empty file.
4 changes: 0 additions & 4 deletions source/_integrations/climate.mqtt.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ ha_iot_class: Local Polling

The `mqtt` climate platform lets you control your MQTT enabled HVAC devices.

The platform currently works in optimistic mode, which means it does not obtain states from MQTT topics, but it sends and remembers control commands.

It uses a sensor under the hood to obtain the current temperature.

## Configuration

To enable this climate platform in your installation, first add the following to your `configuration.yaml` file:
Expand Down
14 changes: 7 additions & 7 deletions source/_integrations/deconz.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "deCONZ"
description: "Instructions on how to setup Conbee/Raspbee devices with deCONZ from Dresden Elektronik within Home Assistant."
description: "Instructions on how to setup ConBee/RaspBee devices with deCONZ from dresden elektronik within Home Assistant."
logo: deconz.jpeg
ha_category:
- Hub
Expand All @@ -16,7 +16,7 @@ ha_qa_scale: platinum
ha_config_flow: true
---

[deCONZ](https://www.dresden-elektronik.de/funktechnik/products/software/pc/deconz/) by [Dresden Elektronik](https://www.dresden-elektronik.de) is a software that communicates with Conbee/Raspbee Zigbee gateways and exposes Zigbee devices that are connected to the gateway.
[deCONZ](https://www.dresden-elektronik.de/funk/software/deconz.html) by [dresden elektronik](https://www.dresden-elektronik.de) is a software that communicates with ConBee/RaspBee Zigbee gateways and exposes Zigbee devices that are connected to the gateway.

[deCONZ REST API](https://dresden-elektronik.github.io/deconz-rest-doc/).

Expand All @@ -32,7 +32,7 @@ There is currently support for the following device types within Home Assistant:

## Recommended way of running deCONZ

If you are running Hass.io, an official add-on for Deconz is available in the add-on store.
If you are running Hass.io, an official add-on for deCONZ is available in the add-on store.
Otherwise, use [community container](https://hub.docker.com/r/marthoc/deconz/) by Marthoc for your deCONZ needs.

### Supported devices
Expand All @@ -43,7 +43,7 @@ See [deCONZ wiki](https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/

Home Assistant will automatically discover deCONZ presence on your network, if `discovery:` is present in your `configuration.yaml` file.

If you don't have the API key, you can generate an API key for deCONZ by using the one-click functionality similar to Philips Hue. Go to **Settings** -> **Gateway** -> **Advanced** -> **Authenticate app** in deCONZ and then use the deCONZ configurator in Home Assistant frontend to create an API key. When you're done setting up deCONZ it will be stored as a config entry.
If you don't have the API key, you can generate an API key for deCONZ by using the one-click functionality similar to Philips Hue. Go to **Settings** **Gateway** **Advanced** **Authenticate app** in the Phoscon App and then use the deCONZ configurator in Home Assistant frontend to create an API key. When you're done setting up deCONZ it will be stored as a config entry.

You can manually add deCONZ by going to the integrations page.

Expand All @@ -61,15 +61,15 @@ logger:
## Troubleshooting
If you are having issues and want to report a problem, always start with making sure that you're on the latest [deCONZ software version](https://github.com/dresden-elektronik/deconz-rest-plugin/releases) and [latest firmware for hardware](https://www.dresden-elektronik.de/rpi/deconz-firmware/?C=M;O=D).
If you are having issues and want to report a problem, always start with making sure that you're on the latest [deCONZ software version](https://github.com/dresden-elektronik/deconz-rest-plugin/releases) and [latest firmware for hardware](http://deconz.dresden-elektronik.de/deconz-firmware/?C=M;O=D).
## Device services
Available services: `configure` and `deconz.device_refresh`.

### Service `deconz.configure`

Set attribute of device in deCONZ using [Rest API](https://dresden-elektronik.github.io/deconz-rest-doc/rest/).
Set attribute of device in deCONZ using [REST-API](https://dresden-elektronik.github.io/deconz-rest-doc/rest/).

| Service data attribute | Optional | Description |
|-----------|----------|-------------|
Expand Down Expand Up @@ -372,7 +372,7 @@ The `entity_id` name will be `climate.device_name`, where `device_name` is defin

Covers are devices like ventilation dampers or smart window covers.

Note that devices in the cover platform identify as lights, so there is a manually curated list that defines which "lights" are covers. You therefore add a cover device as a light device in deCONZ (phoscon app).
Note that devices in the cover platform identify as lights, so there is a manually curated list that defines which "lights" are covers. You therefore add a cover device as a light device in deCONZ (Phoscon App).

The `entity_id` name will be `cover.device_name`, where `device_name` is defined in deCONZ.

Expand Down
2 changes: 1 addition & 1 deletion source/_integrations/input_boolean.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ input_boolean:
### Restore State
This integration will automatically restore the state it had prior to Home Assistant stopping as long as your entity does **not** have a set value for `initial`. To disable this feature, set a valid value for `initial`.
If you set a valid value for `initial` this integration will start with state set to that value. Otherwise, it will restore the state it had prior to Home Assistant stopping.

## Automation Examples

Expand Down
4 changes: 1 addition & 3 deletions source/_integrations/input_datetime.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ automations and templates.

### Restore State

This integration will automatically restore the state it had prior to Home
Assistant stopping as long as your entity does **not** have a set value for
`initial`. To disable this feature, set a valid value for `initial`.
If you set a valid value for `initial` this integration will start with state set to that value. Otherwise, it will restore the state it had prior to Home Assistant stopping.

### Services

Expand Down
2 changes: 1 addition & 1 deletion source/_integrations/input_number.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ input_number:

### Restore State

This integration will automatically restore the state it had prior to Home Assistant stopping as long as your entity does **not** have a set value for `initial`. To disable this feature, set a valid value for `initial`.
If you set a valid value for `initial` this integration will start with state set to that value. Otherwise, it will restore the state it had prior to Home Assistant stopping.

### Scenes

Expand Down
4 changes: 2 additions & 2 deletions source/_integrations/input_select.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Because YAML defines [booleans](https://yaml.org/type/bool.html) as equivalent,
### Restore State
This integration will automatically restore the state it had prior to Home Assistant stopping as long as your entity does **not** have a set value for `initial`. To disable this feature, set a valid value for `initial`.
If you set a valid value for `initial` this integration will start with state set to that value. Otherwise, it will restore the state it had prior to Home Assistant stopping.

### Services

This integrations provide three services to modify the state of the `input_select`.
This integration provides three services to modify the state of the `input_select`.

| Service | Data | Description |
| ------- | ---- | ----------- |
Expand Down
2 changes: 1 addition & 1 deletion source/_integrations/input_text.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ This integration provides a single service to modify the state of the `input_tex

### Restore State

This integration will automatically restore the state it had prior to Home Assistant stopping as long as your entity does **not** have a set value for `initial`. To disable this feature, set a valid value for `initial`.
If you set a valid value for `initial` this integration will start with state set to that value. Otherwise, it will restore the state it had prior to Home Assistant stopping.

### Scenes

Expand Down
6 changes: 6 additions & 0 deletions source/_integrations/snips.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ ha_category:
ha_release: 0.48
---

<div class='note warning'>

The Snips Console no longer available due to acquisition by Sonos. For more details, read the [announcement on the Snips forum](https://forum.snips.ai/t/important-message-regarding-the-snips-console/4145).

</div>

The [Snips Voice Platform](https://www.snips.ai) allows users to add powerful voice assistants to their Raspberry Pi devices without compromising on privacy. It runs 100% on-device, and does not require an internet connection. It features Hotword Detection, Automatic Speech Recognition (ASR), Natural Language Understanding (NLU) and Dialog Management.

The latest documentation can be found here: [Snips Platform Documentation](https://docs.snips.ai/).
Expand Down
4 changes: 2 additions & 2 deletions source/_integrations/vacuum.xiaomi_miio.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,12 @@ To fetch the token follow these instructions depending on your mobile phone plat
```sql
SELECT ZTOKEN FROM ZDEVICE WHERE ZMODEL LIKE "%vacuum%"
```
12. Copy the returned 32-digit hexadecimal string to your clipboard.
12. Copy the returned 96-digit hexadecimal string to your clipboard.
13. Open `Terminal` and execute this command:
```bash
echo '0: <YOUR HEXADECIMAL STRING>' | xxd -r -p | openssl enc -d -aes-128-ecb -nopad -nosalt -K 00000000000000000000000000000000
```
14. Use the resulting string as your token.
14. Use the resulting 32-digit string as your token. (On your mac in front of the terminal session)

### Bluestacks

Expand Down
Empty file modified source/images/supported_brands/bizkaibus.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified source/images/supported_brands/gpslogger.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified source/images/supported_brands/repetier.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified source/images/supported_brands/saj.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b4dde79

Please sign in to comment.