Merge pull request #49 from stephengolub/display-mixin-fixes

Display mixin fixes
This commit is contained in:
Alano Terblanche
2021-08-30 18:45:34 +02:00
committed by GitHub

View File

@@ -24,7 +24,7 @@ class DisplayAPIMixin:
def set_osd(self, bg_color: bool = 0, channel: float = 0, osd_channel_enabled: bool = 0, 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_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 Set OSD
:param bg_color: bool :param bg_color: bool
@@ -47,10 +47,11 @@ class DisplayAPIMixin:
"enable": osd_channel_enabled, "name": osd_channel_name, "enable": osd_channel_enabled, "name": osd_channel_name,
"pos": osd_channel_pos "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] 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 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 return False