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

Updated run_writedataset.m to include streamed event markers + pnet.c 64-bit bugfix #1

Open
wants to merge 5 commits into
base: devel
Choose a base branch
from

Conversation

DMRoberts
Copy link

Two issues fixed:

  1. The version of pnet.c included in the TCP/IP toolbox as a dependency to MATLAB was a bit out of date, and can crash 64-bit MATLAB (on Windows and OSX, at least). I've replaced it with a version updated by Mario Kleiner of Psychtoolbox to function on 32/64-bit MATLAB (and originally distributed with Psychtoolbox itself).

  2. The function run_writedataset.m had not been updated for the newly enabled functionally of event markers within the real-time stream. I've updated it so that the event markers streamed through the system are now included in the produced EEGLAB .set file. This is useful for debugging hardware plug-ins, because the datafiles produced by the native EEG recording software can be more easily compared to the datafiles produced by the BCILAB stream. I also fixed a bug in run_writedataset.m due to what seems was a renamed stream field in onl_newstream not having been renamed in run_writedataset (timestamps_ptr to tmax).

@sccn
Copy link
Collaborator

sccn commented Feb 20, 2014

Hi Dan,

thanks -- will merge!

Best,
Christian

PS: I think it would be a tad better to use onl_peek to get the most recent
chunk rather than doing it by hand (particularly now that the stream data
structure is more complicated). Ideally nothing except onl_* functions
should depend on any internal details of a stream buffer.

On Tue, Feb 18, 2014 at 7:41 PM, DMRoberts [email protected] wrote:

Two issues fixed:

  1. The version of pnet.c included in the TCP/IP toolbox as a dependency to
    MATLAB was a bit out of date, and can crash 64-bit MATLAB (on Windows and
    OSX, at least). I've replaced it with a version updated by Mario Kleiner of
    Psychtoolbox to function on 32/64-bit MATLAB (and originally distributed
    with Psychtoolbox itself).

  2. The function run_writedataset.m had not been updated for the newly
    enabled functionally of event markers within the real-time stream. I've
    updated it so that the event markers streamed through the system are now
    included in the produced EEGLAB .set file. This is useful for debugging
    hardware plug-ins, because the datafiles produced by the native EEG
    recording software can be more easily compared to the datafiles produced by
    the BCILAB stream. I also fixed a bug in run_writedataset.m due to what
    seems was a renamed stream field in onl_newstream not having been renamed

in run_writedataset (timestamps_ptr to tmax).

You can merge this Pull Request by running

git pull https://github.com/DMRoberts/BCILAB devel

Or view, comment on, or merge it at:

#1
Commit Summary

  • Changed 'timestamps_ptr' to 'tmax', as this stream field was renamed
    in a previous version of onl_newstream.m.
  • Updated pnet.c to version compatible with 64-bit systems, as
    modified by Mario Kleiner and distributed in Psychtoolbox.
  • Updated run_writedataset.m to include streamed event markers in the
    saved dataset.

File Changes

Patch Links:

Reply to this email directly or view it on GitHubhttps://github.com//pull/1
.

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