diff --git a/atom.xml b/atom.xml index 287d8c5446..5a486e1c6c 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@
This component allows you to integrate any IP camera into Home Assistant. It supports fetching images from a url with optional HTTP authentication.
+The generic
camera platform allows you to integrate any IP camera into Home Assistant. It supports fetching images from a url with optional HTTP authentication.
Home Assistant will serve the images via its server, making it possible to view your IP camera’s while outside of your network.
+Home Assistant will serve the images via its server, making it possible to view your IP camera’s while outside of your network. The endpoint is /api/camera_proxy/camera.[name]?time=[timestamp]
.
As part of the basic support the following features will be provided:
- -To enable this sensor in your installation, add the following to your configuration.yaml
file:
To enable this camery in your installation, add the following to your configuration.yaml
file:
# Example configuration.yaml entry diff --git a/components/camera.mjpeg/index.html b/components/camera.mjpeg/index.html index 5eeca3e4f3..69a29d25af 100644 --- a/components/camera.mjpeg/index.html +++ b/components/camera.mjpeg/index.html @@ -89,9 +89,11 @@
-The
+mjpeg
component allows you to integrate IP cameras which are capable to stream their video with MJPEG into Home Assistant.The
-mjpeg
camera platform allows you to integrate IP cameras which are capable to stream their video with MJPEG into Home Assistant.To enable this sensor in your installation, add the following to your
+configuration.yaml
file:Home Assistant will serve the images via its server, making it possible to view your IP camera’s while outside of your network. The endpoint is
+ +/api/camera_proxy/camera.[name]?time=[timestamp]
.To enable this camera in your installation, add the following to your
configuration.yaml
file:+# Example configuration.yaml entry diff --git a/developers/rest_api/index.html b/developers/rest_api/index.html index e7aafb43f0..e23496e790 100644 --- a/developers/rest_api/index.html +++ b/developers/rest_api/index.html @@ -399,6 +399,18 @@ You can append?api_password=YOUR_PASSWORD
to any url to log in autGET /api/camera_proxy/camera.<entity_id>
+Returns the data (image) from the specified camera entity_id.
+ +Sample
+ +curl
command:++++$ curl -X GET -H "x-ha-access: YOUR_PASSWORD"\ + http://localhost:8123/api/camera_proxy/camera.my_sample_camera?time=1462653861261 -o image.jpg +GET /api/discovery_info
Retrieve about the discovery feature.
@@ -416,23 +428,20 @@ You can append?api_password=YOUR_PASSWORD
to any url to log in autSample
curl
command:---$ curl -X GET -H "x-ha-access: mypass" \ +-$ curl -X GET -H "x-ha-access: YOUR_PASSWORD" \ http://localhost:8123/api/discovery_info -POST /api/states/<entity_id>
-Updates or creates the current state of an entity.
+#### <a class='title-link' name='post-apistatesltentity_id' href='#post-apistatesltentity_id'></a> POST /api/states/<entity_id> +Updates or creates the current state of an entity. -Expects a JSON object that has at least a state attribute:
+Expects a JSON object that has at least a state attribute: --diff --git a/sitemap.xml b/sitemap.xml index 78d5c9d9e8..23bbb9ae0d 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1587,26 +1587,26 @@{ - "state": "below_horizon", - "attributes": { - "next_rising": "07:04:15 29-10-2013", - "next_setting": "18:00:31 29-10-2013" +```json +{ + "state": "below_horizon", + "attributes": { + "next_rising": "07:04:15 29-10-2013", + "next_setting": "18:00:31 29-10-2013" } }https://home-assistant.io/demo/frontend.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00 https://home-assistant.io/demo/index.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00 https://home-assistant.io/static/mdi-demo.html -2016-05-07T21:52:18+00:00 +2016-05-07T22:14:12+00:00