{"push_id":661488529,"size":259,"distinct_size":1,"ref":"refs/heads/master","head":"c19b8687ac8d8e3385f44bb699c0bd5a9de4b865","before":"5e2de3ac9224e7c52fac4faf386759ee9edd7ab8","commits":[{"sha":"da210002896ef374af793e8110bc307cd92f420c","author":{"email":"3732ee2f420e1d5a90dc352be6ee97732cfbf467@nzbri.org","name":"Michael MacAskill"},"message":"BF: read csv files containing quoted commas\n\nCurrently, conditions files cannot contain fields with commas, even when those fields are contained in quotes, which is a common CSV convention.\r\nTo fix this, the TrialHandler now imports conditions files using the pandas csv_reader rather than numpy's recfromcsv\r\nNB this works for Coder BUT Builder's loop dialog still fails to deal with csv files which contain quoted commas. That GUI aspect needs to be updated in a similar fashion but I'm not sure how.\r\ni.e. at this stage, data.py can deal with these csv files, but Builder users can't select them.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/da210002896ef374af793e8110bc307cd92f420c"},{"sha":"cae7da703f3c368bcce0ee41b28fb1ea10b1df7f","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"NF: Add PST SRBox support\n\nThis commit also includes changes from Sol:\nSource: https://github.com/isolver/psychopy/commit/b1b71406ade314d5d75ed141e57cfa66889a113f#diff-0","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/cae7da703f3c368bcce0ee41b28fb1ea10b1df7f"},{"sha":"b147a3366a655ac60d6dc9facc70ace6c2465623","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Update new event type\n\nIs new name OK?\n\nLet me know about whether the new event really needs prev_byte and current_byte fields or not.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/b147a3366a655ac60d6dc9facc70ace6c2465623"},{"sha":"a3290d5da987cb8cb6a6191f11cfc0002e834a01","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Add new event type constants","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/a3290d5da987cb8cb6a6191f11cfc0002e834a01"},{"sha":"9273b9c1679f88aaf45b07cfb7671d1efcbd3c6d","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Add PSTBOX_BUTTON event table creation","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/9273b9c1679f88aaf45b07cfb7671d1efcbd3c6d"},{"sha":"6cb49df32fc94e35c16a389a1ab1482c7fbadc75","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Update comments.\n\nChange new event class name in PSTBox.EVENT_CLASS_NAMES","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/6cb49df32fc94e35c16a389a1ab1482c7fbadc75"},{"sha":"f112668b9b900c8bfb36cd0d0d77b7b0cff0d109","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"RF: Rename 'PstBox' to 'Pstbox'\n\nWith the old naming scheme, PstBox, convertCamelToSnake would create event constant names like PST_BOX_BUTTON; but this would be inconsistent with\nthe PSTBOX device name in constants.py. Moving to PST_BOX/Pst_Box would also seem rather awkward, so Pstbox is probably the best choice for now.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/f112668b9b900c8bfb36cd0d0d77b7b0cff0d109"},{"sha":"b0898dc1cdc0aefc4c2ebe7192d8e99f10d70b2b","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"RF: We use msgpack-numpy now\n\nNo need to convert NumPy arrays to lists anymore.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/b0898dc1cdc0aefc4c2ebe7192d8e99f10d70b2b"},{"sha":"6ccfcf6d9672e82f6c3c5710f48712f291b45776","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"RF: Separate settings files for parent and child devices","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/6ccfcf6d9672e82f6c3c5710f48712f291b45776"},{"sha":"feebd67e18e3d8440805b0a75270de08e119cb3b","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"Clean up","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/feebd67e18e3d8440805b0a75270de08e119cb3b"},{"sha":"76e9096cf331f6933fee64828ac5e21ad7a9372e","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Merge pull request #28 from hoechenberger/pstbox-subclass\n\nPST Serial Response Box Support","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/76e9096cf331f6933fee64828ac5e21ad7a9372e"},{"sha":"50dcd447fd96a5394b8ff7dedb60868d6b876f16","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Merge branch 'master' of git://github.com/psychopy/psychopy","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/50dcd447fd96a5394b8ff7dedb60868d6b876f16"},{"sha":"8d18937e54d719b6deb28a94e397660ccbf305e1","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"Update to use ioHub's serial.Pstbox\n\nThis updates the demo to use ioHub's new serial.Pstbox device instead of the previous generic serial.Serial interface. It demonstrates how to acquire response times for button presses and how to operate the lamps.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/8d18937e54d719b6deb28a94e397660ccbf305e1"},{"sha":"a286aef0ab1d56ddb4aa9fa4a3004ac99c07d287","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"ENH: Updated MovieStim2 and timing demo\n\nUpdated the visual.MovieStim2 class:\n------------------------------------------\n\n1) Removed COLOR_BGR2RGB conversion that was being done for every frame.\n2) Updated drawing code to reflect that pixel data is stored in system\nmemory in BGR format.\n3) Only use 'glTexImage2D' the first time the texture is uploaded, then\nuse glTexSubImage2D for all other frame updates. On some drivers, is\nsuppose to run faster than always using glTexImage2D.\n\nChanges 1 - 3 reduced the time to call draw() for a video frame from ~6\nmsec on my pc to ~3msec. Changes 1-2 seem to have biggest impact.\n\nAdded 'MovieStim2TimingTest.py to demos.coder.stimuli folder. Saves\ncomputer HW & SW details, as well as timing data for each frame\ndisplayed during video playback.\n\nHope is that this is the starting point for a test script that will help\ndetermine the source of the variability in performance being reported by\nusers for MovieStim2. Should also help identify any video playback logic\nissues in terms of frame display scheduling.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/a286aef0ab1d56ddb4aa9fa4a3004ac99c07d287"},{"sha":"ce5f02ffd22977abcb1539a4966c6b47ebcaf4f6","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"Merge pull request #29 from hoechenberger/patch-1\n\nRF/ENH: Update to use ioHub's serial.Pstbox","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/ce5f02ffd22977abcb1539a4966c6b47ebcaf4f6"},{"sha":"10ac50e315269fcec94802b45da394ba53071114","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"BF: >1 iohub device in same dir\n\nWas causing datastore issue.\n\nAlso updated:\n\n* pstbox button event class\n* event handler for pstbox device (issues if connected to serial port\nthat is to something other than the pstbox, so you get uexpected rx\ndata).\n* pstbox.py demo.\n+ Added 30 sec timeout ends demo if no pst button events.\n+ On Windows OS, keeps window from 'freezing' while waiting for button\npress by having windows msg queue pumped.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/10ac50e315269fcec94802b45da394ba53071114"},{"sha":"bd7789b5ee5952275045435b31488a26e188e7b5","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"put com port back to com5","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/bd7789b5ee5952275045435b31488a26e188e7b5"},{"sha":"2791964bac22edfbd14958624a73fbbae9aa87bd","author":{"email":"fbb93bb966c801b3a72230e8f3b752b62ef22929@isolver-software.com","name":"Sol Simpson"},"message":"BF: changed default video name to jwpIntro.mov","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/2791964bac22edfbd14958624a73fbbae9aa87bd"},{"sha":"797d64283d8e8b4b481db6ed0d86a036cbdc7cfb","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"RF: Auto-report events by default\n\nThe PST box's only purpose is to collect (relatively rare) button\npresses. It should thus be set to auto-report any events to ioHub by\ndefault.\n\nThis commit also allows the serial.Serial device to be set to auto-report\nevents on creation.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/797d64283d8e8b4b481db6ed0d86a036cbdc7cfb"},{"sha":"d632fc3ef1d5df9df801a1ce4aa30a81c7022243","author":{"email":"f568225df4f7122d8a7202cc92aa2f1b375b83b4@gmail.com","name":"Richard Höchenberger"},"message":"RF: Several minor clean-ups\n\nMostly cosmetic fixes.","distinct":false,"url":"https://api.github.com/repos/philippwiesemann/psychopy/commits/d632fc3ef1d5df9df801a1ce4aa30a81c7022243"}]}