Skip to content

Add overlay options wrapper to rpi_camera #34461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 11 commits into from
Apr 30, 2020
Merged

Add overlay options wrapper to rpi_camera #34461

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fafb206
add overlay options wrapper to rpi_camera
alxrdn Apr 20, 2020
e0e0a55
Merge remote-tracking branch 'upstream/dev' into dev
alxrdn Apr 24, 2020
2bf8d35
Refactor to set config yaml section under the top level integration d…
alxrdn Apr 25, 2020
d0bac02
Remove return values that are not checked
alxrdn Apr 25, 2020
b301d4a
Remove superfluous debug log messages
alxrdn Apr 25, 2020
89c1067
Merge branch 'dev' of github.com:alxrdn/home-assistant-core into dev
alxrdn Apr 25, 2020
e5691ed
Return if not set up via discovery
alxrdn Apr 25, 2020
ec29981
Add convenience reference to hass.data[DOMAIN]
alxrdn Apr 25, 2020
3f3ef3e
Black formatting
alxrdn Apr 25, 2020
dd539eb
Isort
alxrdn Apr 26, 2020
33e2564
Exclude all rpi_camera modules
alxrdn Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions homeassistant/components/rpi_camera/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
CONF_IMAGE_WIDTH = "image_width"
CONF_TIMELAPSE = "timelapse"
CONF_VERTICAL_FLIP = "vertical_flip"
CONF_OVERLAY_METADATA = "overlay_metadata"
CONF_OVERLAY_TIMESTAMP = "overlay_timestamp"

DEFAULT_HORIZONTAL_FLIP = 0
DEFAULT_IMAGE_HEIGHT = 480
Expand Down Expand Up @@ -49,6 +51,10 @@
vol.Optional(CONF_VERTICAL_FLIP, default=DEFAULT_VERTICAL_FLIP): vol.All(
vol.Coerce(int), vol.Range(min=0, max=1)
),
vol.Optional(CONF_OVERLAY_METADATA): vol.All(
vol.Coerce(int), vol.Range(min=4, max=2056)
),
vol.Optional(CONF_OVERLAY_TIMESTAMP): cv.string,
}
)

Expand Down Expand Up @@ -76,6 +82,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
CONF_HORIZONTAL_FLIP: config.get(CONF_HORIZONTAL_FLIP),
CONF_VERTICAL_FLIP: config.get(CONF_VERTICAL_FLIP),
CONF_FILE_PATH: config.get(CONF_FILE_PATH),
CONF_OVERLAY_METADATA: config.get(CONF_OVERLAY_METADATA),
CONF_OVERLAY_TIMESTAMP: config.get(CONF_OVERLAY_TIMESTAMP),
}

hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, kill_raspistill)
Expand Down Expand Up @@ -142,6 +150,16 @@ def __init__(self, device_info):
if device_info[CONF_VERTICAL_FLIP]:
cmd_args.append("-vf")

if device_info[CONF_OVERLAY_METADATA]:
cmd_args.append("-a")
cmd_args.append(str(device_info[CONF_OVERLAY_METADATA]))

if device_info[CONF_OVERLAY_TIMESTAMP]:
cmd_args.append("-a")
cmd_args.append("4")
cmd_args.append("-a")
cmd_args.append(str(device_info[CONF_OVERLAY_TIMESTAMP]))

subprocess.Popen(cmd_args, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)

def camera_image(self):
Expand Down