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

Parse packets based on channel caps instead of channel number #105

Merged
merged 2 commits into from
Apr 25, 2019

Conversation

cboulay
Copy link
Collaborator

@cboulay cboulay commented Apr 25, 2019

Fixes #103
Fixes #104

  • As much as possible, parse packets based on the channel capabilities instead of the channel number.
  • Fixes a bug where digital in and serial in events were not being interpreted
  • Fixes a bug where digital and serial data couldn't be above 6
  • Fixes a bug where events (spikes, digital, and serial) were skipped if they came in packets between the calls to InitTrialData and GetTrialData. Note that user memory allocation occurs between these calls so this is a non-trivial amount of time.
  • Updates Python wrapper with above changes.
  • Python wrapper also updated to not reset the clock by default, even if the buffer is reset. I only did this where event data were involved. It might be true for continuous data too but I won't be able to test continuous data for a while.

@cboulay
Copy link
Collaborator Author

cboulay commented Apr 25, 2019

After this gets merged I'll tag a release and add some binaries. Until then, here's the py3.6 win64 wheel.

cerebus-0.0.3-cp36-cp36m-win_amd64.zip

Copy link
Collaborator

@dashesy dashesy left a comment

Choose a reason for hiding this comment

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

Thanks! there are just some minor formatting

.gitignore Outdated Show resolved Hide resolved
cbhwlib/InstNetwork.cpp Outdated Show resolved Hide resolved
cbhwlib/InstNetwork.cpp Outdated Show resolved Hide resolved
cbhwlib/InstNetwork.cpp Outdated Show resolved Hide resolved
cbhwlib/InstNetwork.h Outdated Show resolved Hide resolved
cbhwlib/cbhwlib.cpp Outdated Show resolved Hide resolved
cbhwlib/cbhwlib.cpp Outdated Show resolved Hide resolved
cbmex/SdkApp.h Show resolved Hide resolved
cbmex/cbsdk.cpp Outdated Show resolved Hide resolved
cbmex/cbsdk.cpp Outdated Show resolved Hide resolved
@cboulay
Copy link
Collaborator Author

cboulay commented Apr 25, 2019

All modifications made except for the lack of constant for 128. I'd rather not define a constant for a single-use, especially if there's a reasonable plan to get rid of it in the not too distant future.

@dashesy dashesy merged commit 19302e6 into master Apr 25, 2019
@cboulay cboulay deleted the parse_by_caps branch November 5, 2019 15:39
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.

How to not drop samples? cbmex 'trialdata' returns 'digin' times but NOT values
2 participants