From f2e7342654addd63e7e4d154b4068b93f265140e Mon Sep 17 00:00:00 2001 From: alxrdn Date: Mon, 20 Apr 2020 15:56:33 +0200 Subject: [PATCH 1/4] document new wrapper for overlay options to rpi_camera --- source/_integrations/rpi_camera.markdown | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/_integrations/rpi_camera.markdown b/source/_integrations/rpi_camera.markdown index 9a690faa5640..59a55e045ae9 100644 --- a/source/_integrations/rpi_camera.markdown +++ b/source/_integrations/rpi_camera.markdown @@ -20,6 +20,9 @@ camera: - platform: rpi_camera ``` +The whole set of configuration variables is documented here [`Raspberry Pi Camera Module - Raspberry Pi Documentation`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md). +They are not all wrapped by this `rpi_camera` platform. + {% configuration %} image_width: description: Set the image width. @@ -61,6 +64,16 @@ timelapse: required: false type: integer default: 1000 +overlay_metadata: + description: Adds some text and/or metadata onto the picture ; as defined in [`--annotate, -a Enable/set annotate flags or text`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md). + required: false + type: integer + default: none +overlay_timestamp: + description: Helper to add date/time onto the picture. Format as used by [`strftime`](http://man7.org/linux/man-pages/man3/strftime.3.html). + required: false + type: string + default: none file_path: description: Save the picture in a custom file path. required: false From 37c6aa2d96ac59445ca363e11f15719c0f9b2a32 Mon Sep 17 00:00:00 2001 From: alxrdn Date: Sat, 25 Apr 2020 18:34:44 +0200 Subject: [PATCH 2/4] Move yaml configuration to rpi_camera key --- source/_integrations/rpi_camera.markdown | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/_integrations/rpi_camera.markdown b/source/_integrations/rpi_camera.markdown index 59a55e045ae9..8e1c1bde6608 100644 --- a/source/_integrations/rpi_camera.markdown +++ b/source/_integrations/rpi_camera.markdown @@ -16,8 +16,11 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry -camera: - - platform: rpi_camera +rpi_camera: + image_width: 1296 + image_height: 972 + image_quality: 75 + overlay_timestamp: "%d%b%y %T" ``` The whole set of configuration variables is documented here [`Raspberry Pi Camera Module - Raspberry Pi Documentation`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md). From a55bdfcb011b162ccd4b80389b9a100394f13cb8 Mon Sep 17 00:00:00 2001 From: alxrdn Date: Fri, 1 May 2020 17:22:47 +0200 Subject: [PATCH 3/4] Remove optional parameters from yaml config example --- source/_integrations/rpi_camera.markdown | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/_integrations/rpi_camera.markdown b/source/_integrations/rpi_camera.markdown index 8e1c1bde6608..c5b5458a95e6 100644 --- a/source/_integrations/rpi_camera.markdown +++ b/source/_integrations/rpi_camera.markdown @@ -17,10 +17,6 @@ To enable this camera in your installation, add the following to your `configura ```yaml # Example configuration.yaml entry rpi_camera: - image_width: 1296 - image_height: 972 - image_quality: 75 - overlay_timestamp: "%d%b%y %T" ``` The whole set of configuration variables is documented here [`Raspberry Pi Camera Module - Raspberry Pi Documentation`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md). From 59a093f6f6721714102c4a99ba96b776da492fcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 May 2020 10:38:13 +0200 Subject: [PATCH 4/4] Minor changes --- source/_integrations/rpi_camera.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/_integrations/rpi_camera.markdown b/source/_integrations/rpi_camera.markdown index c5b5458a95e6..292a603ab40c 100644 --- a/source/_integrations/rpi_camera.markdown +++ b/source/_integrations/rpi_camera.markdown @@ -8,7 +8,7 @@ ha_release: 0.17 ha_domain: rpi_camera --- -The `rpi_camera` platform allows you to integrate the Raspberry Pi camera into Home Assistant. This integration uses the application [`raspistill`](https://www.raspberrypi.org/documentation/usage/camera/raspicam/raspistill.md) to store the image from camera. +The `rpi_camera` integration allows you to integrate the Raspberry Pi camera into Home Assistant. This integration uses the application [`raspistill`](https://www.raspberrypi.org/documentation/usage/camera/raspicam/raspistill.md) to store the image from camera. ## Configuration @@ -64,7 +64,7 @@ timelapse: type: integer default: 1000 overlay_metadata: - description: Adds some text and/or metadata onto the picture ; as defined in [`--annotate, -a Enable/set annotate flags or text`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md). + description: Adds some text and/or metadata onto the picture. Check the [`--annotate`](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md) section. required: false type: integer default: none