From b80b29f01342fad9d4b8a06e3d2daaa0133825c8 Mon Sep 17 00:00:00 2001 From: Stephen Golub Date: Tue, 24 Aug 2021 10:52:51 -0500 Subject: [PATCH 1/2] Add ability to toggle watermark on or off --- reolinkapi/mixins/display.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reolinkapi/mixins/display.py b/reolinkapi/mixins/display.py index 5c4c48c..ded8636 100644 --- a/reolinkapi/mixins/display.py +++ b/reolinkapi/mixins/display.py @@ -24,7 +24,7 @@ class DisplayAPIMixin: def set_osd(self, bg_color: bool = 0, channel: float = 0, osd_channel_enabled: bool = 0, osd_channel_name: str = "", osd_channel_pos: str = "Lower Right", osd_time_enabled: bool = 0, - osd_time_pos: str = "Lower Right") -> bool: + osd_time_pos: str = "Lower Right", osd_watermark_enabled: bool = 0) -> bool: """ Set OSD :param bg_color: bool @@ -47,7 +47,8 @@ class DisplayAPIMixin: "enable": osd_channel_enabled, "name": osd_channel_name, "pos": osd_channel_pos }, - "osdTime": {"enable": osd_time_enabled, "pos": osd_time_pos} + "osdTime": {"enable": osd_time_enabled, "pos": osd_time_pos}, + "watermark": osd_watermark_enabled, }}}] r_data = self._execute_command('SetOsd', body)[0] if r_data["value"]["rspCode"] == 200: From 04d5d4a7ae4dbe68be15b73be008119d8130d03b Mon Sep 17 00:00:00 2001 From: Stephen Golub Date: Tue, 24 Aug 2021 10:53:06 -0500 Subject: [PATCH 2/2] Fix error response handling for display --- reolinkapi/mixins/display.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reolinkapi/mixins/display.py b/reolinkapi/mixins/display.py index ded8636..c44c04b 100644 --- a/reolinkapi/mixins/display.py +++ b/reolinkapi/mixins/display.py @@ -51,7 +51,7 @@ class DisplayAPIMixin: "watermark": osd_watermark_enabled, }}}] r_data = self._execute_command('SetOsd', body)[0] - if r_data["value"]["rspCode"] == 200: + if 'value' in r_data and r_data["value"]["rspCode"] == 200: return True - print("Could not set OSD. Camera responded with status:", r_data["value"]) + print("Could not set OSD. Camera responded with status:", r_data["error"]) return False