Skip to content
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.

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

Update ACTiCameraAgent to HTTPCameraAgent to include other HTTP camera brands #700

Merged
merged 10 commits into from
Aug 19, 2024

Conversation

davidvng
Copy link
Contributor

@davidvng davidvng commented Jul 2, 2024

Description

Renames ACTiCameraAgent to HTTPCameraAgent which can grab screenshots from different camera brands that can accept HTTP requests. Currently includes ACTi and Reolink. Also replaces camera information arguments with a config file to better handle increasing number of cameras.

Motivation and Context

Reolink cameras added to site, which uses HTTP requests like ACTi cameras but requires different URL params.

How Has This Been Tested?

Tested on daq-dev with current site cameras.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Copy link
Member

@BrianJKoopman BrianJKoopman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good. A few suggestions and questions inline below.

EDIT: Also there is a conflict to resolve.

socs/agents/http_camera/sample_config.yaml Outdated Show resolved Hide resolved
docs/agents/http_camera.rst Outdated Show resolved Hide resolved
docs/agents/http_camera.rst Outdated Show resolved Hide resolved
docs/agents/http_camera.rst Outdated Show resolved Hide resolved
socs/agents/http_camera/agent.py Outdated Show resolved Hide resolved
socs/agents/http_camera/agent.py Outdated Show resolved Hide resolved
socs/agents/http_camera/agent.py Show resolved Hide resolved
socs/agents/http_camera/agent.py Outdated Show resolved Hide resolved
@davidvng davidvng requested a review from BrianJKoopman August 19, 2024 19:08
Copy link
Member

@BrianJKoopman BrianJKoopman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the updates!

@BrianJKoopman BrianJKoopman merged commit cf89f1f into main Aug 19, 2024
7 checks passed
@BrianJKoopman BrianJKoopman deleted the http-camera-agent branch August 19, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants