Updated run_writedataset.m to include streamed event markers + pnet.c 64-bit bugfix#1
Updated run_writedataset.m to include streamed event markers + pnet.c 64-bit bugfix#1DMRoberts wants to merge 5 commits intosccn:develfrom
Conversation
…in a previous version of onl_newstream.m.
… by Mario Kleiner and distributed in Psychtoolbox.
|
Hi Dan, thanks -- will merge! Best, PS: I think it would be a tad better to use onl_peek to get the most recent On Tue, Feb 18, 2014 at 7:41 PM, DMRoberts notifications@github.com wrote:
|
Two issues fixed:
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).
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).