Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: oculomatic/oculomatic-comedi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sciencecorp/oculomatic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 24 files changed
  • 1 contributor

Commits on Sep 7, 2022

  1. refactor: build with conan and cmake, support openCV cam, break out i… 

    …nterfaces for capture
    @antoniaelsen
    antoniaelsen committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    6bfb40c View commit details
    Browse the repository at this point in the history

  2. refactor: wip: revive tcp and comedi comms

    @antoniaelsen
    antoniaelsen committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    153132c View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. feat: support pylon cameras

    @antoniaelsen
    antoniaelsen committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    a8e464c View commit details
    Browse the repository at this point in the history

  2. chore: clean up

    @antoniaelsen
    antoniaelsen committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    ab346c4 View commit details
    Browse the repository at this point in the history

  3. feat: pylon camera - use software trigger for speed

    @antoniaelsen
    antoniaelsen committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    e5dc56c View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. feat: improve Pylon speed

    @antoniaelsen
    antoniaelsen committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    26b3256 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. feat: support contour detection and blob detection for pupil and cr

    @antoniaelsen
    antoniaelsen committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    3ab9330 View commit details
    Browse the repository at this point in the history
Loading