Skip to content

Commit 2eddf22

Browse files
author
Dilawar Singh
committed
imaging camera shutter delayed for 60ms for each trial.
1 parent b62c33f commit 2eddf22

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "protocol.h"
99

10-
#define SESSION_NUM 1
10+
#define SESSION_NUM 3
1111
#define ANIMAL_NAME "k3"
1212

1313
/*-----------------------------------------------------------------------------

src/main.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ void do_trial( size_t trial_num, bool isprobe = false )
380380
// From Ananth. He suggested that 60ms delay is required for every protocol. This is
381381
// apprently shutter delay for the camera and only required for trial number
382382
// 1.
383-
if (trial_num == 1)
383+
if (trial_num > 0)
384384
delay(60); // Shutter delay; Only for the first trial
385385

386386
stamp_ = millis( );

src/protocol.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// These variables are generated by cmake + /home/itadmin/Work/MouseBehaviour/Protocols/protocol_to_config.py
2-
#define PROTO_CSValue "NONE"
3-
#define PROTO_SessionType 0
4-
#define PROTO_PreStimDuration_LOW 8000
5-
#define PROTO_USDuration 50
6-
#define PROTO_NextProbeTrial_HIGH 10
7-
#define PROTO_PostStimDuration 8000
8-
#define PROTO_TraceDuration 250
9-
#define PROTO_NextProbeTrial_LOW 6
10-
#define PROTO_PreStimDuration_HIGH 8000
1+
// These variables are generated by cmake + /home/dilawars/Work/BhallaLab/MouseBehaviour/Protocols/protocol_to_config.py
112
#define PROTO_NumTrialsInABlock 60
3+
#define PROTO_USValue "PUFF"
4+
#define PROTO_PreStimDuration_HIGH 8000
5+
#define PROTO_PreStimDuration_LOW 6000
6+
#define PROTO_SessionType 10
7+
#define PROTO_CSValue "LIGHT"
128
#define PROTO_CSDuration 50
13-
#define PROTO_Description "No stim"
14-
#define PROTO_CODE "All1"
15-
#define PROTO_USValue "NONE"
16-
#define PROTO_Comments "All"
9+
#define PROTO_NextProbeTrial_HIGH 10
10+
#define PROTO_NextProbeTrial_LOW 6
11+
#define PROTO_PostStimDuration 8000
12+
#define PROTO_CODE "An2"
13+
#define PROTO_Comments "Ananth"
14+
#define PROTO_Description "light + 450 trace + puff1"
15+
#define PROTO_TraceDuration 450
16+
#define PROTO_USDuration 50

0 commit comments

Comments
 (0)