Skip to content

Commit

Permalink
Support Oryx 10GigE camera (#18)
Browse files Browse the repository at this point in the history
This adds support for an Oryx 10GigE (ORX-10GS-51S5M-C) camera.

The underlying implementation is shared with the previously support
Blackfly camera. The advantage of this approach is that there is less
code to maintain and supporting other Spinnaker based cameras could be
little to no work.

The disadvantage of this approach is that the implementation related to
triggers is complicated. Alternatively, we could consider completely
splitting at least part of the implementation and using different parts
of it explicitly based on the camera model.

This also adds tests for the Oryx camera that mirror those for the
Blackfly. A test for `Camera::get_meta` was also added for both cameras.
I also added a ctest setup fixture to ensure that the packet size is set
to 1000B for the Oryx camera.

Closes #3

---------

Co-authored-by: Alan Liddell <[email protected]>
  • Loading branch information
andy-sweet and aliddell authored Sep 26, 2023
1 parent 399544b commit b23de89
Show file tree
Hide file tree
Showing 20 changed files with 1,572 additions and 161 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- self-hosted
- spinnaker
- BFLY-U3-23S6M-C # for tests
- ORX-10GS-51S5M-C # for tests
- windows

permissions:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- self-hosted
- spinnaker
- BFLY-U3-23S6M-C # for tests
- ORX-10GS-51S5M-C # for tests

permissions:
actions: write
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ This is an acquire driver that supports some Teledyne FLIR cameras using the Spi
### Camera

- [Blackfly USB3: BFLY-U3-23S6M-C](https://www.flir.com/products/blackfly-usb3/?model=BFLY-U3-23S6M-C&vertical=machine+vision&segment=iis)
- [Oryx 10GigE: ORX-10GS-51S5M-C](https://www.flir.com/products/oryx-10gige/?model=ORX-10GS-51S5M-C&vertical=machine+vision&segment=iis)
Loading

0 comments on commit b23de89

Please sign in to comment.