Diff: states.h

Revision:

21:e51733fc1c36

Parent:

20:4c06d3041337

Child:

28:797536a42b9f

--- a/states.h	Mon Jul 02 09:04:45 2018 +0000
+++ b/states.h	Mon Jul 02 11:51:16 2018 +0000
@@ -3,12 +3,6 @@
 
 #include "mbed.h"
 
-/**
-*   internally gates the machine to accept licking.
-*   used in Report/Associate modes.
-*/
-void gateReward();
-
 struct Delay {
     static void setup();
     static void teardown();
@@ -30,18 +24,8 @@
 };
 
 /**
-*   used for the Pair mode during the visual cue presentation.
-*   jumps to either WithResp or NoResp, depending on whether or not
-*   the animal licked during this period.
-*/
-struct Paired {
-    static void setup();
-    static void gate();
-    static void teardown();
-};
-
-/**
-*   used except for the Pair mode to present reward-related conditioning cue(s).
+*   used to present reward-related conditioning cue(s) (visual, auditory).
+*   necessary whisk/lick/stimulus-related callbacks are also used.
 */
 struct Cued {
     static void setup();
@@ -49,6 +33,11 @@
     static void teardown();
 };
 
+/**
+*   if the animal licked during Cued period, the automaton transits to this state.
+*   if it is in the Pair mode, or if the conditioning cue is already there,
+*   a reward delivery is also performed here.
+*/
 struct WithResp {
     static void setup();
     static void teardown();