- Netatmo: Netatmo Presence support (@gieljnssns)
- - Sensor: Amcrest camera sensors (@tchellomello)
+ - Sensor: Amcrest camera sensors (@tchellomello)
- Notify: New Discord notification component (@Deinara)
- Device tracker: Tado device tracker support (@jmvermeulen)
- Sensor: Add Skybeacon BLE temperature/humidity sensor (@anpetrov)
diff --git a/components/ffmpeg/index.html b/components/ffmpeg/index.html
index 41e1f281c7..97dc832ede 100644
--- a/components/ffmpeg/index.html
+++ b/components/ffmpeg/index.html
@@ -117,7 +117,7 @@ You need the ffmpeg binary in your system
$ sudo apt-get -t jessie-backports install ffmpeg
-
+We can use now following in the configuration:
ffmpeg:
ffmpeg_bin: /usr/bin/ffmpeg
diff --git a/developers/websocket_api/index.html b/developers/websocket_api/index.html
index 7f0d48180a..3996485b7d 100644
--- a/developers/websocket_api/index.html
+++ b/developers/websocket_api/index.html
@@ -90,13 +90,15 @@
-
Home Assistant contains a websocket API. This API can be used to stream information from the Home Assistant server to any client that implements websockets. Implementations in different languages:
+
Home Assistant contains a websocket API. This API can be used to stream information from a Home Assistant instance to any client that implements websockets. Implementations in different languages:
-
Server states
+
Connect your websocket implementation to ws://localhost:8123/api/websocket.
+
+
Server states
- Client connects
@@ -116,7 +118,7 @@ b. Server can send results of previous commands.
During the command phase, the client attaches a unique identifier to each message. The server will add this identifier to each message so that the client can link each message to it’s origin.
- Message format
+ Message format
Each API message is a JSON serialized object containing a type key. After the authentication phase messages also must contain an id, an integer that contains the number of interactions.
@@ -142,7 +144,7 @@ b. Server can send results of previous commands.
Authentication phase
+ Authentication phase
When a client connects to the server, the server will test if the client is authenticated. Authentication will not be necessary if no api_password is set or if the user fulfills one of the other criteria for authentication (trusted network, password in url/header).
@@ -188,7 +190,7 @@ b. Server can send results of previous commands.
- Command phase
+ Command phase
During this phase the client can give commands to the server. The server will respond to each command with a result message indicating when the command is done and if it was successful.
@@ -275,7 +277,7 @@ b. Server can send results of previous commands.
- Unsubscribing from events
+ Unsubscribing from events
You can unsubscribe from previously created subscription events. Pass the id of the original subscription command as value to the subscription field.
@@ -298,7 +300,7 @@ b. Server can send results of previous commands.
- Calling a service
+ Calling a service
This will call a service in Home Assistant. Right now there is no return value. The client can listen to state_changed events if it is interested in changed entities as a result of a service call.
@@ -325,7 +327,7 @@ b. Server can send results of previous commands.
- Fetching states
+ Fetching states
This will get a dump of all the current states in Home Assistant.
@@ -347,7 +349,7 @@ b. Server can send results of previous commands.
- Fetching config
+ Fetching config
This will get a dump of the current config in Home Assistant.
@@ -369,7 +371,7 @@ b. Server can send results of previous commands.
- Fetching services
+ Fetching services
This will get a dump of the current services in Home Assistant.
@@ -391,7 +393,7 @@ b. Server can send results of previous commands.
- Fetching panels
+ Fetching panels
This will get a dump of the current registered panels in Home Assistant.
@@ -413,7 +415,7 @@ b. Server can send results of previous commands.
- Error handling
+ Error handling
If an error occurs, the success key in the result message will be set to false. It will contain an error key containing an object with two keys: code and message.
diff --git a/sitemap.xml b/sitemap.xml
index c946ed8ce1..1c0ad95261 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2705,62 +2705,62 @@
https://home-assistant.io/demo/frontend.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/index.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-dev-event.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-dev-info.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-dev-service.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-dev-state.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-dev-template.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-history.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-iframe.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-logbook.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/demo/panels/ha-panel-map.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/googlef4f3693c209fe788.html
-2017-02-02T22:17:48+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html
-2017-02-02T22:17:49+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html
-2017-02-02T22:17:49+00:00
+2017-02-02T22:50:09+00:00
https://home-assistant.io/static/mdi-demo.html
-2017-02-02T22:17:49+00:00
+2017-02-02T22:50:09+00:00