Added priming to run function

Author: AlexLM96

examples/Bandit_Task/Bandit_Task.ino

@@ -27,9 +27,6 @@ int trial_counter = 0;                                 // Tracks how many pellet
 int highp_counter = 0;                                  // Tracks how many pokes in a row in high probability poke
 int trialTimeout = 5;                                   //timeout duration after each poke, set to 0 to remove the timeout
 int probs[5] = {10, 30, 50, 70, 90};                
-unsigned long trial_start = 0;
-unsigned long trial_length = 5000;
-bool trial_available = false;
 bool press = false;
 
 void setup() {
@@ -65,19 +62,19 @@ void loop() {
   ////////////////////////////////////////////////////////////////
   force.readPoke();
   if (force.poke) {
-    force.run(true);
-    trial_start = millis();
+    force.run();
+    force.trial_start = millis();
     force.Tone();
-    trial_available = true;
+    force.trial_available = true;
   }
 
-  while (((millis()-trial_start) < force.trial_window) && trial_available == true) {
+  while (((millis()-force.trial_start) < force.trial_window) && force.trial_available) {
     force.ratioLeft = prob_left;
     force.ratioRight = prob_right;
     force.trials_per_block = trial_counter;
     force.FRC = highp_counter;
     force.library_version = trialsToSwitch;
-    force.run(true);
+    force.run();
 
     /////////////////////////////////////////////////////////////
     ////          If mouse presses the left lever             ///
@@ -90,15 +87,14 @@ void loop() {
         highp_counter = 0;
       }
       if (random(100) < prob_left) {
-        force.Tone();
         force.DispenseLeft();
         trial_counter ++;
       }
       else {
         force.Tone(300,600);
       }
       press = true;
-      trial_available = false;
+      force.trial_available = false;
     }
 
     //////////////////////////////////////////////////////////////
@@ -112,31 +108,31 @@ void loop() {
         highp_counter = 0;
       }
       if (random(100) < prob_right) {
-        force.Tone();
         force.DispenseRight();
         trial_counter ++;
       }
       else {
         force.Tone(300,600);
       }
       press = true;
-      trial_available = false;
+      force.trial_available = false;
     }
   }
 
   //////////////////////////////////////////////////////////////
   ////     If there was no press during the time window     ////
   ///////////////////////////////////////////////////////////// 
-  if (trial_available && press == false) {
+  if (force.trial_available && press == false) {
     force.Tone(300,600);
+    force.trial_available = false;
   }
 
   //////////////////////////////////////////////////////////////
   ////   Finish trial and start inter-trial timeout         ////
   ///////////////////////////////////////////////////////////// 
   if (press) {
     press = false;
-    trial_available = false;
+    force.trial_available = false;
     force.Timeout(trialTimeout);
   }
 

src/Force.cpp

@@ -961,7 +961,7 @@ void Force::begin() {
 
 
 ////////////////////////////////////////////////////
-//Run function to updates things on every loop//////
+//t function to updates things on every loop//////
 ////////////////////////////////////////////////////
 void Force::run(bool log_data) {
   SenseLeft();
@@ -1095,8 +1095,8 @@ void Force::graphLegend() {
   tft.print(ratioLeft);
 
   //Print remaining trial window
-  if ((trial_length < trial_window) && (trial_length != 0)) {
-    tft.setCursor(45,30);
+  if (trial_available) {
+    tft.setCursor(60,50);
     tft.setTextColor(ST7735_WHITE);
     tft.print("Trial Available");
     //tft.print((trial_window - trial_length)/1000, 3);
@@ -1375,7 +1375,7 @@ void Force::Click() {
 void Force::DispenseLeft() {
   dispensing = true;
   trialLeft++;
-  Tone();
+  Tone(4000,200);
   float successTime = millis();
   while ((millis() - successTime) < (dispense_delay * 1000)){
     tft.setCursor(85, 44);
@@ -1413,7 +1413,7 @@ void Force::DispenseLeft() {
 void Force::DispenseRight() {
   dispensing = true;
   trialRight++;
-  Tone();
+  Tone(4000,200);
   float successTime = millis();
   while ((millis() - successTime) < (dispense_delay * 1000)){
     tft.setCursor(85, 44);
@@ -1535,7 +1535,7 @@ void Force::prime_dispense() {
 ////    Check last dispense    ////
 //////////////////////////////////
 void Force::check_lastDispense() {
-  if ((millis() - last_dispense) > 60*1000) {
+  if ((millis() - last_dispense) > 300*1000) {
     last_dispense = millis();
     prime_dispense();
   }

src/Force.h

@@ -55,7 +55,7 @@ class Force {
 
     // --- Basic functions --- //
     void begin();
-    void run(bool log_data = false);
+    void run(bool log_data = true);
     void check_buttons();
     void readPoke();