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

DISPLAY++ color mode #187

Merged
merged 1 commit into from
Nov 21, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion +neurostim/cic.m
Original file line number Diff line number Diff line change
Expand Up @@ -1794,6 +1794,9 @@ function PsychImaging(c)
% The CRS Display++
PsychImaging('AddTask', 'FinalFormatting', 'DisplayColorCorrection', 'ClampOnly');
PsychImaging('AddTask', 'General', 'EnableBits++Mono++Output');
case 'DISPLAY++COLOR'
PsychImaging('AddTask', 'FinalFormatting', 'DisplayColorCorrection', 'ClampOnly');
PsychImaging('AddTask', 'General', 'EnableBits++Color++Output',2);
case 'SOFTWARE-OVERLAY'
% Magic software overlay... replicates (in software) the
% dual CLUT overlay of the VPixx M16 mode. See below
Expand Down Expand Up @@ -1859,7 +1862,7 @@ function PsychImaging(c)
c.textWindow = c.overlayWindow;
Screen('Preference', 'TextAntiAliasing',0); %Antialiasing on the overlay will result in weird colors
updateOverlay(c);
case 'DISPLAY++'
case {'DISPLAY++', 'DISPLAY++COLOR'}
% nothing to do
case 'SOFTWARE-OVERLAY'
% With this display type you draw your stimuli on the
Expand Down