We planned to upgrade GitLab and Mattermost to the latest version this Friday morning (early). You may experience some downtime!

Commit 6dfc00e8 authored by Jesse Heckman's avatar Jesse Heckman

update sensehat lsl extension

parent ef245ee6
...@@ -12,6 +12,7 @@ classdef pb_dataobj < handle ...@@ -12,6 +12,7 @@ classdef pb_dataobj < handle
event_data = []; event_data = [];
pupil_labs = []; pupil_labs = [];
optitrack = []; optitrack = [];
sensehat = [];
block_info = []; block_info = [];
end end
......
...@@ -14,6 +14,7 @@ function [ses,str] = pb_runLSL(varargin) ...@@ -14,6 +14,7 @@ function [ses,str] = pb_runLSL(varargin)
gz = pb_keyval('gz', varargin, true); gz = pb_keyval('gz', varargin, true);
pd = pb_keyval('pd', varargin, false); pd = pb_keyval('pd', varargin, false);
ot = pb_keyval('ot', varargin, true); ot = pb_keyval('ot', varargin, true);
sh = pb_keyval('ot', varargin, true);
tmp = {}; tmp = {};
...@@ -21,21 +22,23 @@ function [ses,str] = pb_runLSL(varargin) ...@@ -21,21 +22,23 @@ function [ses,str] = pb_runLSL(varargin)
'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Python Representation - Eye 0''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Python Representation - Eye 0''', ...
'type=''Pupil Capture @ pupil-desktop'' and name=''Gaze Python Representation''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Gaze Python Representation''', ...
'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Primitive Data - Eye 0''', ... 'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Primitive Data - Eye 0''', ...
'type=''OptiTrack Mocap @ DCN-OT01'' and name=''Rigid Bodies'''}; 'type=''OptiTrack Mocap @ DCN-OT01'' and name=''Rigid Bodies''', ...
'type=''SenseHat Mocap @ DCN19'' and name=''Labeled Markers'''};
if de; tmp(end+1) = streams(1); end if de; tmp(end+1) = streams(1); end
if pl; tmp(end+1) = streams(2); end if pl; tmp(end+1) = streams(2); end
if gz; tmp(end+1) = streams(3); end if gz; tmp(end+1) = streams(3); end
if pd; tmp(end+1) = streams(4); end if pd; tmp(end+1) = streams(4); end
if ot; tmp(end+1) = streams(5); end if ot; tmp(end+1) = streams(5); end
if sh; tmp(end+1) = streams(6); end
streams = tmp; streams = tmp;
clear tmp;
ses = lsl_session(); ses = lsl_session();
ls = length(streams); ls = length(streams);
str = lsl_istream.empty(0,ls); str = lsl_istream.empty(0,ls);
clear tmp;
for iStrm = 1:ls for iStrm = 1:ls
% Find, select and make streams for LSL. % Find, select and make streams for LSL.
tmp = strrep(streams(iStrm),'type=''',''); tmp = strrep(streams(iStrm),'type=''','');
...@@ -59,7 +62,8 @@ function [ses,str] = pb_runLSL(varargin) ...@@ -59,7 +62,8 @@ function [ses,str] = pb_runLSL(varargin)
if pl; addlistener(str(c),'DataAvailable', @listener); c = c+1; end if pl; addlistener(str(c),'DataAvailable', @listener); c = c+1; end
if gz; addlistener(str(c),'DataAvailable', @listener); c = c+1; end if gz; addlistener(str(c),'DataAvailable', @listener); c = c+1; end
if pd; addlistener(str(c),'DataAvailable', @listener); c = c+1; end if pd; addlistener(str(c),'DataAvailable', @listener); c = c+1; end
if ot; addlistener(str(c),'DataAvailable', @listener); end if ot; addlistener(str(c),'DataAvailable', @listener); c = c+1; end
if sh; addlistener(str(c),'DataAvailable', @listener); end
end end
function listener(~, event) function listener(~, event)
......
function [A,ind] = pb_rmnan(A)
% PB_RMNAN()
%
% PB_RMNAN() will remove all NaN values from array
%
% See also ...
% PBToolbox (2019): JJH: j.heckman@donders.ru.nl
ind = isnan(A);
A = A(~ind);
end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
% %
% Part of Programmeer Beer Toolbox (PBToolbox) %
% Written by: Jesse J. Heckman (2019) %
% %
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment