From 372c387cfd2112be97ee31a99aa486c8cdff5288 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Sep 2016 10:08:03 +0200 Subject: [PATCH] Minimizing of the configuration sample --- source/_components/camera.ffmpeg.markdown | 2 -- source/_components/camera.foscam.markdown | 4 +--- source/_components/camera.generic.markdown | 12 +++--------- source/_components/camera.local_file.markdown | 7 +++---- source/_components/camera.markdown | 2 +- source/_components/camera.mjpeg.markdown | 8 ++------ source/_components/camera.netatmo.markdown | 15 ++++++++++----- source/_components/camera.rpi_camera.markdown | 11 +---------- source/_components/camera.uvc.markdown | 7 +++---- 9 files changed, 24 insertions(+), 44 deletions(-) diff --git a/source/_components/camera.ffmpeg.markdown b/source/_components/camera.ffmpeg.markdown index 8fceafe95c3c..9f08c17fa6f4 100644 --- a/source/_components/camera.ffmpeg.markdown +++ b/source/_components/camera.ffmpeg.markdown @@ -22,8 +22,6 @@ To enable your FFmpeg feed in your installation, add the following to your `conf camera: - platform: ffmpeg input: FFMPEG_SUPPORTED_INPUT - name: FFmpeg - extra_arguments: -q:v 2 ``` Configuration variables: diff --git a/source/_components/camera.foscam.markdown b/source/_components/camera.foscam.markdown index 40e8924069bf..9d24f5e8441c 100644 --- a/source/_components/camera.foscam.markdown +++ b/source/_components/camera.foscam.markdown @@ -21,8 +21,6 @@ To enable your Foscam IP camera in your installation, add the following to your camera: platform: foscam ip: IP_ADDRESS - name: Door Camera - port: 88 username: USERNAME password: PASSWORD ``` @@ -31,9 +29,9 @@ Configuration variables: - **ip** (*Required*): The IP address your camera. - **port** (*Optional*): The port that the camera is running on. The default is 88. -- **name** (*Optional*): This parameter allows you to override the name of your camera. - **username** (*Required*): The username for accessing your camera. - **password** (*Required*): The password for accessing your camera. +- **name** (*Optional*): This parameter allows you to override the name of your camera.

There seems to be some issues within Foscam with lengthy passwords and passwords containing certain symbols. Be sure to check your camera's documentation. diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown index 14fcac68762b..14b57b1428b6 100644 --- a/source/_components/camera.generic.markdown +++ b/source/_components/camera.generic.markdown @@ -23,18 +23,13 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry camera: - platform: generic - still_image_url: http://194.218.96.92/jpg/image.jpg - name: my sample camera - username: USERNAME - password: PASSWORD - authentication: basic - limit_refetch_to_url_change: true + - platform: generic + still_image_url: http://194.218.96.92/jpg/image.jpg ``` Configuration variables: -- **still_image_url** (*Required*): The URL your camera serves the image on, eg. http://192.168.1.21:2112/. Can be a [template]. +- **still_image_url** (*Required*): The URL your camera serves the image on, eg. http://192.168.1.21:2112/. Can be a [template](/topics/templating/). - **name** (*Optional*): This parameter allows you to override the name of your camera. - **username** (*Optional*): The username for accessing your camera. - **password** (*Optional*): The password for accessing your camera. @@ -48,4 +43,3 @@ Configuration variables:

-[template]: /topics/templating/ diff --git a/source/_components/camera.local_file.markdown b/source/_components/camera.local_file.markdown index 4fc2cb7cdcb7..6dade4b4c596 100644 --- a/source/_components/camera.local_file.markdown +++ b/source/_components/camera.local_file.markdown @@ -22,15 +22,14 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry camera: - platform: local_file - name: Local File - file_path: /tmp/image.jpg + - platform: local_file + file_path: /tmp/image.jpg ``` Configuration variables: - - **name** (*Optional*): Name of the camera - **file_path** (*Required*): File to serve as the camera. + - **name** (*Optional*): Name of the camera

The given `file_path` must be an existing file because the camera platform setup make a readable check on it. diff --git a/source/_components/camera.markdown b/source/_components/camera.markdown index e56503400c10..88840ff2112b 100644 --- a/source/_components/camera.markdown +++ b/source/_components/camera.markdown @@ -10,5 +10,5 @@ footer: true --- -The camera component allows you to use IP cameras with Home Assistant. +The camera component allows you to use IP cameras with Home Assistant. With a little additional work you could use [USB cameras](/blog/2016/06/23/usb-webcams-and-home-assistant/) as well. diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown index da77c05a2165..642d3278ae9b 100644 --- a/source/_components/camera.mjpeg.markdown +++ b/source/_components/camera.mjpeg.markdown @@ -22,12 +22,8 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry camera: - platform: mjpeg - mjpeg_url: http://192.168.1.92/mjpeg - name: my sample camera - username: USERNAME - password: PASSWORD - authentication: basic + - platform: mjpeg + mjpeg_url: http://192.168.1.92/mjpeg ``` Configuration variables: diff --git a/source/_components/camera.netatmo.markdown b/source/_components/camera.netatmo.markdown index 662159d6a369..35edddaa25f4 100644 --- a/source/_components/camera.netatmo.markdown +++ b/source/_components/camera.netatmo.markdown @@ -21,10 +21,6 @@ To enable the Netatmo camera, you first have to set up [netatmo](/components/net # Example configuration.yaml entry camera: platform: netatmo - home: home_name - cameras: - - camera_name1 - - camera_name2 ``` Configuration variables: @@ -33,5 +29,14 @@ Configuration variables: - **cameras** array (*Optional*): Cameras to use. Multiple enties allowed. - **camera_name**: Name of the camera to display. -If **home** and **cameras** is not provided, all cameras will be displayed. +If **home** and **cameras** are not provided, all cameras will be displayed. For more control over your cameras check the configuration sample below. +```yaml +# Example configuration.yaml entry +camera: + platform: netatmo + home: home_name + cameras: + - camera_name1 + - camera_name2 +``` diff --git a/source/_components/camera.rpi_camera.markdown b/source/_components/camera.rpi_camera.markdown index 56aacbc07757..7189dfd3d8a4 100644 --- a/source/_components/camera.rpi_camera.markdown +++ b/source/_components/camera.rpi_camera.markdown @@ -21,16 +21,7 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry camera: - platform: rpi_camera - name: Raspberry Pi Camera - image_width: 640 - image_height: 480 - image_quality: 7 - image_rotation: 0 - timelapse: 1000 - horizontal_flip: 0 - vertical_flip: 0 - file_path: /tmp/image.jpg + - platform: rpi_camera ``` Configuration variables: diff --git a/source/_components/camera.uvc.markdown b/source/_components/camera.uvc.markdown index d49d631f9b20..3001ccff9300 100644 --- a/source/_components/camera.uvc.markdown +++ b/source/_components/camera.uvc.markdown @@ -20,10 +20,9 @@ To enable a UVC camera in your installation, add the following to your `configur ```yaml # Example configuration.yaml entry camera: - platform: uvc - nvr: IP_ADDRESS - port: PORT - key: APIKEY + - platform: uvc + nvr: IP_ADDRESS + key: API_KEY ``` Configuration variables: