Diff: rig.h

Revision:

11:897ecd5413e0

Parent:

9:e136394bdb39

Child:

12:06ea96546af1

--- a/rig.h	Tue Jun 19 10:11:23 2018 +0000
+++ b/rig.h	Thu Jun 21 17:57:22 2018 +0000
@@ -2,32 +2,38 @@
 #define RIG_H_
 
 #include "mbed.h"
+
+#include "duration.h"
+#include "conditioning.h"
+
 #include "task.h"
 #include "trial.h"
 
+const uint16_t TRIGGER_DUR_MS = 2;
+
 // the task timer
 extern Timer        timer;
 
 // state time out
 extern Timeout      stateTimeout;
 
-// reward time out
-extern Timeout      rewardTimeout;
-
 // trigger time out for TASK output
 extern Timeout      triggerTimeout;
 
+// ticker for audio cue
+extern Ticker       buzzerTicker;
+
 // input
 extern InterruptIn  whiskIn;
 extern InterruptIn  lickIn;
 
 // output
-extern DigitalOut   cueOut;
-extern DigitalOut   enableOut;
-extern DigitalOut   rewardOut;
+extern DigitalOut   audioOut;
+extern Conditioning visualOut;
+extern Duration     rewardOut;
 
-extern DigitalOut   trialStart;
-extern DigitalOut   trialEnd;
+extern Duration     trialStart;
+extern Duration     trialEnd;
 
 extern Task        task;
 extern Trial       trial;