Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/DaqDoku'
Browse files Browse the repository at this point in the history
  • Loading branch information
joschaschmiedt committed Dec 10, 2019
2 parents 5f025bb + 4997d43 commit fd41312
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 3 deletions.
Binary file modified arcade/DaqServer/NidaqServer.exe
Binary file not shown.
Binary file modified arcade/DaqServer/NidaqServer.pdf
Binary file not shown.
Binary file modified arcade/StimServer/StimServer.exe
Binary file not shown.
7 changes: 4 additions & 3 deletions arcade/StimServer/classes/Stimuli/Wedge.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
%
% PROPERTIES
% -----------
% gamma : opening angle of wedge (degree, >0, <=90)
%
% gamma : wedge's center angle (>0° <90°)
%
%
% USAGE
% -----
% w = Wedge();
Expand Down Expand Up @@ -38,4 +39,4 @@ function delete(obj)
end


end
end
Binary file modified arcade/StimServer/documentation/StimServer.pdf
Binary file not shown.

0 comments on commit fd41312

Please sign in to comment.