This commit is contained in:
Nick Mowen 2022-12-15 09:34:02 -07:00
parent 895788543b
commit f1c5659d1e
2 changed files with 6 additions and 3 deletions

View File

@ -229,6 +229,6 @@ class Dispatcher:
logger.info(f"Setting ptz command to {command} for {camera_name}") logger.info(f"Setting ptz command to {command} for {camera_name}")
except KeyError as k: except KeyError as k:
logger.error(f"Invalid PTZ command {payload}: {k.with_traceback()}") logger.error(f"Invalid PTZ command {payload}: {k}")
#except Exception as e: #except Exception as e:
# logger.error(f"Error sending {payload} to {camera_name}: {e}") # logger.error(f"Error sending {payload} to {camera_name}: {e}")

View File

@ -52,7 +52,6 @@ class OnvifController:
ptz = onvif.create_ptz_service() ptz = onvif.create_ptz_service()
request = ptz.create_type("GetConfigurationOptions") request = ptz.create_type("GetConfigurationOptions")
request.ConfigurationToken = profile.PTZConfiguration.token request.ConfigurationToken = profile.PTZConfiguration.token
ptz_config = ptz.GetConfigurationOptions(request)
# setup moving request # setup moving request
move_request = ptz.create_type("ContinuousMove") move_request = ptz.create_type("ContinuousMove")
@ -64,6 +63,10 @@ class OnvifController:
for preset in presets: for preset in presets:
self.cams[camera_name]["presets"][preset["Name"]] = preset["token"] self.cams[camera_name]["presets"][preset["Name"]] = preset["token"]
# get list of supported features
ptz_config = ptz.GetConfigurationOptions(request)
logger.error(f"ptz config is {ptz_config}")
self.cams[camera_name]["init"] = True self.cams[camera_name]["init"] = True
def _stop(self, camera_name: str) -> None: def _stop(self, camera_name: str) -> None:
@ -146,7 +149,7 @@ class OnvifController:
onvif.get_service("ptz").ContinuousMove(move_request) onvif.get_service("ptz").ContinuousMove(move_request)
def handle_command( def handle_command(
self, camera_name: str, command: OnvifCommandEnum, param: str self, camera_name: str, command: OnvifCommandEnum, param: str = ""
) -> None: ) -> None:
if camera_name not in self.cams.keys(): if camera_name not in self.cams.keys():
logger.error(f"Onvif is not setup for {camera_name}") logger.error(f"Onvif is not setup for {camera_name}")