Skip to content

Commit

Permalink
more refactoring and doc updates
Browse files Browse the repository at this point in the history
  • Loading branch information
iandol committed Feb 8, 2022
1 parent b1a91da commit 1d6ae26
Show file tree
Hide file tree
Showing 32 changed files with 2,097 additions and 968 deletions.
703 changes: 472 additions & 231 deletions .doxyfile

Large diffs are not rendered by default.

Binary file modified CoreProtocols/AreaSummation.mat
Binary file not shown.
Binary file modified CoreProtocols/DotColour.mat
Binary file not shown.
Binary file modified CoreProtocols/DotDirection.mat
Binary file not shown.
Binary file modified CoreProtocols/Isoluminant_Colours.mat
Binary file not shown.
544 changes: 369 additions & 175 deletions CoreProtocols/Isoluminant_Colours_StateInfo.m

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions CoreProtocols/RFLocaliserStateInfo.m
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
%RFLOCALISER state configuration file, this gets loaded by opticka via
% runExperiment class.
% RFLOCALISER state configuration file, this gets loaded by opticka via
% runExperiment class. This protocol allows you to elicit visual responses
% while a subject maintains fixation.
%
% This protocol uses mouse and keyboard control of many different classes
% of stimuli. You can change which stimulus and what variables are during
% the task, while the subject maintains fixation.
% This protocol uses mouse and keyboard control of 10 different classes of
% stimuli. You can change which stimulus and what variables are during the
% task, while the subject maintains fixation. See Help > Keyboard Map for
% the keys; basically < and > change stimuli, ← and → change the variable,
% and ↑ and ↓ change the variable value (see stims.controlTable below for
% the actual values). You can also change the fixation time etc.
%
% The following class objects (easily named handle copies) are already
% loaded and available to use. Each class has methods useful for running the task:
% The following class objects (easily named handle copies) are already
% loaded and available to use. Each class has methods useful for running
% the task:
%
% me = runExperiment object
% s = screenManager
Expand Down
120 changes: 0 additions & 120 deletions METHODS.md

This file was deleted.

Binary file removed Opticka Keyboard Mapping.odt
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Opticka is an object-oriented framework with optional GUI for the [Psychophysics

## Sample hardware setup

The diagram below shows an sample Opticka configuration setup; note that the eyetracker, display and electrophysiology systems can be swapped for other hardware ([see the list below](#Hardware-currently-supported)):
The diagram below shows a sample Opticka configuration setup. Note that the eyetracker, display, synchronisation and electrophysiology systems can be swapped for other hardware ([see the list below](#Hardware-currently-supported)). While I prefer using a Display++ or a DataPixx/ViewPixx to ensure temporal fidelity, you can use a LabJack or arduino for synchronisation (where a photodiode becomes more important):

![Example hardware setup to run Opticka](https://github.com/iandol/opticka/raw/gh-pages/images/Opticka-Setup.png)

Expand Down Expand Up @@ -48,7 +48,7 @@ runDemo(sM);
There is also auto-generated class documentation here: [Opticka Class Docs](http://iandol.github.io/OptickaDocs/inherits.html), that details the major classes and their methods and properties. This is generated from the comments in the code, which as always could be improved…

## Basic Install Instructions
See [**Detailed instructions**](INSTALL.md) for full install details…
See [**Detailed instructions**](help/INSTALL.md) for full install details…

Opticka prefers the latest Psychophysics Toolbox (V3.0.17+) and at least Matlab 2017a (it uses object-oriented property validation introduced in that version). It has been tested on 64bit Ubuntu 20.04 & macOS 12.x with **MATLAB 2021b** (newer versions are generally faster). You can simply download the [GitHub ZIP File](https://github.com/iandol/opticka/archive/refs/heads/master.zip), unzip and CD to the folder and run `addOptickaToPath.m`. Or to keep easily up-to-date if you have git installed, clone this Github repo, CD to the folder then run `addOptickaToPath.m`.

Expand Down
File renamed without changes.
Loading

0 comments on commit 1d6ae26

Please sign in to comment.