Use digitalInterrupt code. Upgrade arduino.

Author: dilawar

src/config.h

@@ -7,7 +7,7 @@
 
 #include "protocol.h"
 
-#define         SESSION_NUM         3
+#define         SESSION_NUM         1
 #define         ANIMAL_NAME         "k3"
 
 /*-----------------------------------------------------------------------------

src/main.ino

@@ -317,10 +317,10 @@ void setup()
     digitalWrite(ROTARY_ENC_B, HIGH); //turn pullup resistor on
 
     //call updateEncoder() when any high/low changed seen
-    //attachInterrupt( digitalPinToInterrupt(2), ISR_ON_PIN2, RISING);
-    attachInterrupt( (2), ISR_ON_PIN2, RISING);
-    //attachInterrupt( digitalPinToInterrupt(3), ISR_ON_PIN3, RISING);
-    attachInterrupt( (3), ISR_ON_PIN3, RISING);
+    attachInterrupt( digitalPinToInterrupt(2), ISR_ON_PIN2, RISING);
+    // attachInterrupt( (2), ISR_ON_PIN2, RISING);
+    attachInterrupt( digitalPinToInterrupt(3), ISR_ON_PIN3, RISING);
+    // attachInterrupt( (3), ISR_ON_PIN3, RISING);
 
 
     // fixme: move after wait_for_start

src/protocol.h

@@ -1,16 +1,16 @@
-// These variables are generated by cmake + /home/dilawars/Work/BhallaLab/MouseBehaviour/Protocols/protocol_to_config.py
-#define PROTO_NumTrialsInABlock      60
-#define PROTO_PreStimDuration_LOW      6000
-#define PROTO_USValue      "PUFF"
+// These variables are generated by cmake + /home/dilawars/Work/GITHUB/BhallaLab/MouseBehaviour/Protocols/protocol_to_config.py
+#define PROTO_CODE      "All1"
+#define PROTO_SessionType      0
+#define PROTO_Description      "No stim"
+#define PROTO_PreStimDuration_LOW      8000
+#define PROTO_PreStimDuration_HIGH      8000
 #define PROTO_CSDuration      50
-#define PROTO_NextProbeTrial_HIGH      10
-#define PROTO_TraceDuration      450
-#define PROTO_Comments      "Ananth"
+#define PROTO_CSValue      "NONE"
+#define PROTO_TraceDuration      250
+#define PROTO_USDuration      50
+#define PROTO_USValue      "NONE"
 #define PROTO_PostStimDuration      8000
-#define PROTO_PreStimDuration_HIGH      8000
-#define PROTO_CSValue      "LIGHT"
-#define PROTO_Description      "light + 450 trace + puff1"
-#define PROTO_CODE      "An2"
-#define PROTO_SessionType      10
 #define PROTO_NextProbeTrial_LOW      6
-#define PROTO_USDuration      50
+#define PROTO_NextProbeTrial_HIGH      10
+#define PROTO_NumTrialsInABlock      60
+#define PROTO_Comments      "All"