Diff: trial.h

Revision:

3:991c6d5ce19d

Parent:

2:0c241937eabd

Child:

7:6744ec9ccc25

--- a/trial.h	Mon May 14 18:07:57 2018 +0000
+++ b/trial.h	Thu May 17 13:37:43 2018 +0000
@@ -2,6 +2,9 @@
 #define TRIAL_H_
 
 #include "task.h"
+#include "arraylist.h"
+
+typedef int trialtime_t;
 
 namespace TrialFlags {
     // nothing
@@ -32,11 +35,11 @@
     /**
     * the timestamp when the trial started.
     */
-    unsigned long starting;
+    trialtime_t   starting;
     /**
     * the timestamp when the cue started
     */
-    unsigned long cuestarting;
+    trialtime_t   cuestarting;
     /**
     * the total waiting period for the animal during this trial before the cue.
     */
@@ -46,6 +49,9 @@
     */
     uint16_t      delay_dur_ms;
     
+    ArrayList<trialtime_t>  licking_events;
+    ArrayList<trialtime_t>  whisking_events;
+    
     void reset(const Task& task);
     
     void writeToSerial();