Merge pull request #3 from cpp-lln-lab/master

update origin

Author: marcobarilari

.all-contributorsrc

@@ -26,6 +26,18 @@
         "design",
         "doc"
       ]
+    },
+    {
+      "login": "CerenB",
+      "name": "CerenB",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10451654?v=4",
+      "profile": "https://github.com/CerenB",
+      "contributions": [
+        "code",
+        "design",
+        "doc",
+        "review"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CPP_getResponseDemo.m

@@ -87,10 +87,10 @@
 
 
 % Check what keys were pressed (all of them)
-responseEvents = getResponse('check', cfg, expParameters, 0, 1);
+responseEvents = getResponse('check', cfg, expParameters, 0);
 
 % The following line would only return key presses and not releases
-% responseEvents = getResponse('check', cfg, expParameters, 1 , 1);
+% responseEvents = getResponse('check', cfg, expParameters, 1);
 
 % This can be used to flush the queue: empty all events that are still present in the queue
 getResponse('flush', cfg, expParameters, 1);

README.md

@@ -1,9 +1,7 @@
 # CPP_PTB
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-
-[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
-
+[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 This is List of Crossmodal Perception and Plasticity lab (CPP) PsychToolBox (PTB) toolbox.
@@ -145,22 +143,18 @@ Use that to stop your script and only restart when the space bar is pressed.
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-
 <!-- prettier-ignore-start -->
-
 <!-- markdownlint-disable -->
-
 <table>
   <tr>
     <td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Code">💻</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars3.githubusercontent.com/u/38101692?v=4" width="100px;" alt=""/><br /><sub><b>marcobarilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Code">💻</a> <a href="#design-marcobarilari" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/CerenB"><img src="https://avatars1.githubusercontent.com/u/10451654?v=4" width="100px;" alt=""/><br /><sub><b>CerenB</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Code">💻</a> <a href="#design-CerenB" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=CerenB" title="Documentation">📖</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/pulls?q=is%3Apr+reviewed-by%3ACerenB" title="Reviewed Pull Requests">👀</a></td>
   </tr>
 </table>
 
 <!-- markdownlint-enable -->
-
 <!-- prettier-ignore-end -->
-
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

initPTB.m

@@ -61,11 +61,8 @@
 
 %% Visual
 
-cfg.screen = max(Screen('Screens')); % Main screen
-
-% Open a fullscreen, onscreen window with gray background. Enable 32bpc
-% floating point framebuffer via imaging pipeline on it.
-PsychImaging('PrepareConfiguration');
+% Get the screen numbers and draw to the external screen if avaliable
+cfg.screen = max(Screen('Screens'));
 
 % init PTB with different options in concordance to the Debug Parameters
 if cfg.debug
@@ -76,17 +73,17 @@
     Screen('Preferences', 'SuppressAllWarnings', 2);
 
     if cfg.testingSmallScreen
-        [cfg.win, cfg.winRect] = PsychImaging('OpenWindow', cfg.screen, cfg.backgroundColor,  [0,0, 480, 270]);
+        [cfg.win, cfg.winRect] = Screen('OpenWindow', cfg.screen, cfg.backgroundColor,  [0,0, 480, 270]);
     else
         if cfg.testingTranspScreen
         PsychDebugWindowConfiguration
         end
-        [cfg.win, cfg.winRect] = PsychImaging('OpenWindow', cfg.screen, cfg.backgroundColor);
+        [cfg.win, cfg.winRect] = Screen('OpenWindow', cfg.screen, cfg.backgroundColor);
     end
 
 else
     Screen('Preference','SkipSyncTests', 0);
-    [cfg.win, cfg.winRect] = PsychImaging('OpenWindow', cfg.screen, cfg.backgroundColor);
+    [cfg.win, cfg.winRect] = Screen('OpenWindow', cfg.screen, cfg.backgroundColor);
 
 end