BCILAB
BCILAB copied to clipboard
Updated run_writedataset.m to include streamed event markers + pnet.c 64-bit bugfix
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).
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:
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).
You can merge this Pull Request by running
git pull https://github.com/DMRoberts/BCILAB devel
Or view, comment on, or merge it at:
https://github.com/sccn/BCILAB/pull/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
- M code/online_plugins/Generic/run_writedataset.mhttps://github.com/sccn/BCILAB/pull/1/files#diff-0(60)
- M dependencies/tcp_udp_ip/pnet.chttps://github.com/sccn/BCILAB/pull/1/files#diff-1(217)
Patch Links:
- https://github.com/sccn/BCILAB/pull/1.patch
- https://github.com/sccn/BCILAB/pull/1.diff
Reply to this email directly or view it on GitHubhttps://github.com/sccn/BCILAB/pull/1 .