Improved dispense functions

Author: AlexLM96

examples/Bandit_Task/Bandit_Task.ino

@@ -20,8 +20,8 @@
 String ver = "Force";                                  //unique identifier text
 Force force(ver);                                       //start FORCE object
 
-int prob_left = 70;                                     // Probability of pellet on the high-reward poke                                               
-int prob_right = 30;                                    // Probability of pellet on the low-reward poke
+int prob_left = 100;                                     // Probability of pellet on the high-reward poke                                               
+int prob_right = 100;                                    // Probability of pellet on the low-reward poke
 int trialsToSwitch = 20;                                // # of trials before probabilities on the pokes switch
 int trial_counter = 0;                                 // Tracks how many pellets have been obtained in this set of probabilities
 int highp_counter = 0;                                  // Tracks how many pokes in a row in high probability poke
@@ -62,7 +62,7 @@ void loop() {
 
     force.ver = prob_left;
     force.FRC = prob_right;
-    force.dispense_delay = highp_counter;
+    //force.dispense_delay = highp_counter;
     force.dispense_amount = trial_counter;
   }
 
@@ -94,7 +94,7 @@ void loop() {
       else {
         highp_counter = 0;
       }
-      force.dispense_delay = highp_counter;
+      //force.dispense_delay = highp_counter;
       force.loglite_Left();
 
       if (random(100) < prob_left) {
@@ -121,7 +121,7 @@ void loop() {
       else {
         highp_counter = 0;
       }
-      force.dispense_delay = highp_counter;
+      //force.dispense_delay = highp_counter;
       force.loglite_Right();
 
       if (random(100) < prob_right) {

src/Force.cpp

@@ -1456,10 +1456,11 @@ void Force::DispenseLeft() {
   }
   //digitalWrite(A2,HIGH); //A2 will be "reward dispensed" pin
   //digitalWrite(13,HIGH); // RED LED
-  for (int i=0; i < 30; i++) {
+  for (int i=0; i < 20; i++) {
     digitalWrite(PUMP1, HIGH);
-    delayMicroseconds(100);
+    delayMicroseconds(600);
     digitalWrite(PUMP1, LOW);
+    delayMicroseconds(200);
   }
   DateTime now = rtc.now();
   dispenseTime = now.unixtime();
@@ -1492,10 +1493,11 @@ void Force::DispenseRight() {
       tft.fillRect(12, 0, 38, 24, ST7735_BLACK); // clear the text after label
     }
   }
-  for (int i=0; i < 30; i++) {
+  for (int i=0; i < 20; i++) {
     digitalWrite(PUMP2, HIGH);
-    delayMicroseconds(100);
+    delayMicroseconds(600);
     digitalWrite(PUMP2, LOW);
+    delayMicroseconds(200);
   }
   DateTime now = rtc.now();
   dispenseTime = now.unixtime();
@@ -1582,12 +1584,17 @@ void Force::SenseRight() {
 /////////////////////////////
 
 void Force::prime_dispense() {
-  for (int i=0; i < 100; i++) {
+  for (int i=0; i < 20; i++) {
     digitalWrite(PUMP1, HIGH);
-    digitalWrite(PUMP2, HIGH);
-    delayMicroseconds(100);
+    delayMicroseconds(600);
     digitalWrite(PUMP1, LOW);
+    delayMicroseconds(200);
+  }
+  for (int i=0; i < 20; i++) {
+    digitalWrite(PUMP2, HIGH);
+    delayMicroseconds(600);
     digitalWrite(PUMP2, LOW);
+    delayMicroseconds(200);
   }
 }