Skip to content

Commit

Permalink
Merge pull request #19 from marcobarilari/master
Browse files Browse the repository at this point in the history
Update submod and change main script name for more clarity
  • Loading branch information
marcobarilari authored May 21, 2023
2 parents a5732f8 + 850b498 commit ad4a6ae
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/CPP_BIDS
Submodule CPP_BIDS updated 111 files
2 changes: 1 addition & 1 deletion lib/CPP_PTB
Submodule CPP_PTB updated 86 files
+5 −0 .github/release-drafter.yml
+2 −1 .github/workflows/check_md_links.yml
+0 −42 .github/workflows/miss_hit.yml
+8 −3 .github/workflows/run_tests.yml
+41 −8 .gitignore
+0 −37 .zenodo.json
+56 −0 CITATION.cff
+18 −0 Makefile
+13 −59 README.md
+174 −0 cpp_ptb.m
+0 −3 docs/Makefile
+ docs/cpp_ptb-manual.pdf
+5 −0 docs/create_manual.sh
+1 −1 docs/source/conf.py
+12 −6 docs/source/function_description.rst
+3 −0 docs/source/set_up.rst
+1 −0 lib/miss_hit.cfg
+216 −0 lib/utils/unfold.m
+3 −1 miss_hit.cfg
+1 −1 requirements.txt
+64 −0 scripts/ptbSoundDeviceTest.m
+1 −0 src/aperture/apertureTexture.m
+1 −0 src/aperture/eccenLogSpeed.m
+1 −0 src/aperture/getApertureName.m
+1 −0 src/aperture/saveApertures.m
+1 −0 src/aperture/smoothOval.m
+1 −0 src/aperture/smoothRect.m
+57 −0 src/defaults/checkCppPtbCfg.m
+117 −0 src/defaults/cppPtbDefaults.m
+8 −6 src/defaults/setDefaultFields.m
+1 −0 src/dot/computeCartCoord.m
+1 −0 src/dot/computeRadialMotionDirection.m
+1 −0 src/dot/decomposeMotion.m
+1 −0 src/dot/dotMotionSimulation.m
+5 −0 src/dot/dotTexture.m
+1 −0 src/dot/generateNewDotPositions.m
+1 −0 src/dot/initDots.m
+27 −0 src/dot/postInitDots.m
+1 −0 src/dot/reseedDots.m
+1 −0 src/dot/seedDots.m
+1 −0 src/dot/setDotDirection.m
+1 −0 src/dot/updateDots.m
+1 −0 src/drawFieldOfVIew.m
+1 −0 src/errors/errorAbort.m
+1 −0 src/errors/errorAbortGetReponse.m
+1 −0 src/errors/errorDistanceToScreen.m
+1 −0 src/errors/errorRestrictedKeysGetReponse.m
+1 −0 src/eyeTracker.m
+1 −0 src/fixation/drawFixation.m
+1 −0 src/fixation/initFixation.m
+1 −0 src/getExperimentEnd.m
+1 −0 src/getExperimentStart.m
+25 −29 src/initPTB.m
+1 −0 src/isOctave.m
+1 −0 src/keyboard/checkAbort.m
+1 −0 src/keyboard/checkAbortGetResponse.m
+1 −0 src/keyboard/collectAndSaveResponses.m
+1 −0 src/keyboard/getResponse.m
+1 −0 src/keyboard/pressSpaceForMe.m
+1 −0 src/keyboard/testKeyboards.m
+2 −0 src/miss_hit.cfg
+1 −0 src/randomization/repeatShuffleConditions.m
+1 −0 src/randomization/setTargetPositionInSequence.m
+1 −0 src/randomization/shuffle.m
+1 −0 src/screen/farewellScreen.m
+1 −0 src/screen/standByScreen.m
+1 −0 src/templates/templateFunction.m
+1 −0 src/templates/templateFunctionExample.m
+1 −0 src/utils/checkPtbVersion.m
+7 −3 src/utils/cleanUp.m
+1 −0 src/utils/computeFOV.m
+1 −0 src/utils/degToPix.m
+1 −0 src/utils/pixToDeg.m
+4 −1 src/utils/printCreditsCppPtb.m
+1 −0 src/utils/printScreen.m
+0 −101 src/utils/setDefaultsPTB.m
+1 −0 src/utils/setUpRand.m
+1 −0 src/video/createFramesTextureStructure.m
+1 −0 src/video/playVideoFrames.m
+3 −9 src/waitFor.m
+1 −0 src/waitForTrigger.m
+7 −2 tests/miss_hit.cfg
+123 −0 tests/test_checkCppPtbCfg.m
+3 −3 tests/test_setDefaultFields.m
+0 −112 tests/test_setDefaultsPTB.m
+1 −1 version.txt

0 comments on commit ad4a6ae

Please sign in to comment.