Syncing up all changes - #2
Open
ryklin wants to merge 127 commits into
Open
Conversation
Numerous XY Calibration Improvements - Choose a statistical method for electing the calibration acceptance point - Reset the calibration with a button click - See a location preview of where a calibration point may appear IOTest Panel now displays analog input velocity
Added missing velocity plot functions Updated revision numbers to sync up with GitHub
…ayed in the matlab window Additional messages are displayed at the command window
…uild mex files and tested in Matlab. Works using the MouseTracking task.
Implemented asynchronous calls to get key state Returns 1 if the mouse is down, or 0 if the mouse is up (mouse released is not implemented in this version)
…itional code to call mlvideo('getmousebuttons') so that everything collapses to one centralized location. Not checking in other codes because they are in development.
Added 1 additional decimal of precision to the xycalibrate display label showing current XY voltage.
…nput - repositioned target locations to make them easier to select with an analog voltage
- added a function getmouse_pix to return the pixel locations from xglcursor
- added gettouch vs getmouse gettouch requires that a "depressed" signal be present in order for the cursor to respond getmouse (incomplete) requires a left mouse button click to actuate eyejoytrack as ontarget, but the cursor positions always follows the mouse, unlike the touchscreen pixels per degree is automatically initialized - used for scaling the mouse or touch data by mlvideo
- variable is declared global
- will not accentuate responses yet, some bug in eyejoy track here - reorganized target numbers and cleaned up the conditions file Trialholder uses the 'getmouse' coordinates and pipes it into the eye tracker data stream - does not show the correct data stream during the ITI.
Accentuates selected target Switched from getmouse to gettouchscreen (user must press down to activate cursor) Fixed a bug in eyejoytrack that was introduced in the previous version
Previous version was not distributed.
- easy to test response to one of two targets - good for testing any controller, including the joystick
Added showcursor('on')
Added comments
- trialholder still does NOT contain the needed updates for the showcursor function to work properly with the touchscreen, only with the joystick.
…to the final release.
added refresh of our screens
- missing file path - added an empty runtime directory - improved error message
…ords eye position data.
…e properly when the experiment directory hasn't been set
- All sampling and memory management is handled within the toolbox and no longer in Matlab - Created a mlmouse.m to handle interfacing with the NIMHdaqtoolbox for sampling data, scaling to degrees, etc. - Automatically takes into account the stimulus display number - Old xglgetcursor functions remain in the mlvideo.m file, but are not used anywhere in the code. - Old touchscreen_x, etc. variables have been commented out of the code
…documentation
Updated and tested all sample tasks
- mouse3.m is now using mouse_state = mlmouse('getmousebuttons'); instead of mlvideo
- enabling the mouse using mlhelper is now standardized inside ML when a touchscreen or mouse is mapped and removed from the tasks.
Added a condition to help prevent a 'blit' outside the stimulus display, which can otherwise cause a crash.
Updated all matlab configuration files (*.mat) with my screen resolutions (1920x1200 @ 120 Hz using monitor 2) and proper signal assignment. If users have a different resolution they will need to change it manually.
- gettouch_pix wasn't implemented - getalltouchdata_pix was missing the filter for no touches. The above aren't actually used by ML because we are mostly interested in the corresponding degree values.
… for the very first time - ML relies upon the getpref command to know where to write its data and logger files. First time installations don't have this set, and getpref returns an error when this happens. - Now, we will catch this error by calling set_ml_directories which will create a dialog box allowing users to set their directory preferences right away.
… a crash. Another update to log4m.m Tested on both 32 and 64 Bit matlab 2015
…fix, among others. Contains another logger bug fix that arises when ML tries to check for an updated version Added redistributable files.
…ngdevice.m, which breaks the current release of ML
- changed the color scheme to green/black and accentuated the grid lines - changed the x and ylim to be greater than 10V so that we can easily visualization clipping - reduced the plot duration from 300 to 30 samples in order to see less of a trail - would be nice to have a long plot duration in the yT graph and short plot duration in the XY plot.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merged with Freedman Lab all io changes