Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Data/**
Calibration Files/**
10 changes: 10 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[submodule "Protocols/Matching"]
path = Protocols/Matching
url = https://github.com/tsgouvea/BpodProtocols_Matching.git
[submodule "Protocols/FI_2AFC"]
path = Protocols/FI_2AFC
url = https://github.com/tsgouvea/BpodProtocols_FI_2AFC.git
[submodule "Protocols/Olf2AFC"]
path = Protocols/Olf2AFC
url = https://github.com/tsgouvea/BpodProtocols_Olf2AFC.git
branch = junya
Binary file modified Calibration Files/LiquidCalibration.mat
Binary file not shown.
15 changes: 14 additions & 1 deletion Functions/Internal Functions/FindArduinoPorts.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,20 @@
end
ArduinoPorts = ArduinoPorts(1:nPorts);
elseif ismac

[trash, RawSerialPortList] = system('ls /dev/tty.usbmodem*');
string = strtrim(RawSerialPortList);
PortStringPositions = strfind(string, '/dev/tty.usbmodem');
nPorts = length(PortStringPositions);
CandidatePorts = cell(1,nPorts);
nGoodPorts = 0;
for x = 1:nPorts
if PortStringPositions(x)+20 <= length(string)
CandidatePort = strtrim(string(PortStringPositions(x):PortStringPositions(x)+20));
nGoodPorts = nGoodPorts + 1;
CandidatePorts{nGoodPorts} = CandidatePort;
end
end
ArduinoPorts = CandidatePorts(1:nGoodPorts);
else
[trash, RawSerialPortList] = system('ls /dev/ttyACM*');
string = strtrim(RawSerialPortList);
Expand Down
1 change: 1 addition & 0 deletions Protocols/FI_2AFC
Submodule FI_2AFC added at 220128
150 changes: 0 additions & 150 deletions Protocols/Light2AFC/Light2AFC.m

This file was deleted.

1 change: 1 addition & 0 deletions Protocols/Matching
Submodule Matching added at fa7219
1 change: 1 addition & 0 deletions Protocols/Olf2AFC
Submodule Olf2AFC added at bd9b2e
146 changes: 0 additions & 146 deletions Protocols/Operant/Operant.m

This file was deleted.

Loading