Add files via upload

Author: bamatika

src/Force.cpp

@@ -44,16 +44,16 @@ void Force::run() {
 // TaskFunctions 
 /////////////////////////////////////////////////////////////////////////
 void Force::Dispense() {
+  dispensing = true;
   trial++;
- // Tone();
+  Tone();
   float successTime = millis();
   while ((millis() - successTime) < (dispense_delay * 1000)){
     tft.setCursor(85, 44);
     tft.setTextColor(ST7735_WHITE);
     tft.print("Delay:");
     tft.setTextColor(ST7735_WHITE);
     tft.print((-(millis() - successTime - (dispense_delay*1000))/ 1000),1);
-    tft.print("s");
     run();
     tft.fillRect(84, 43, 80, 12, ST7735_BLACK); // remove Delay text when timeout is over
     if (grams > 1 or grams2 >1){ //only clear F1 ans F2 values if levers are being pushed
@@ -71,7 +71,7 @@ void Force::Dispense() {
   digitalWrite(13, LOW); // RED LED
   pressTime = millis();
   pressLength = 0;
-  Timeout(timeout_length);
+  dispensing = false;
 }
 
 void Force::Timeout(int timeout_length) {
@@ -81,9 +81,8 @@ void Force::Timeout(int timeout_length) {
     tft.setTextColor(ST7735_WHITE);
     tft.print("Timeout:");
     tft.print((-(millis() - dispense_time - (timeout_length*1000))/ 1000),1);
-    tft.print("s");
     run();
-    tft.fillRect(84, 43, 80, 12, ST7735_BLACK); 
+    tft.fillRect(84, 43, 80, 12, ST7735_BLACK);
     if ((grams > 1.5) or (grams2 > 1.5)) { //reset timeout if either lever pushed
       Timeout(timeout_length); 
       tft.fillRect(12, 0, 38, 24, ST7735_BLACK); // clear the text after F1 F2 labels
@@ -479,7 +478,13 @@ void Force::graphLegend() {
     DateTime now = rtc.now();
     lickTime = now.unixtime();
   }
-  digitalWrite(A3, LOW);
+
+  if (lick == false) {
+
+    digitalWrite(A3, LOW);
+
+  }
+  
   if (calibrated == false){
     tft.setCursor(85, 56);
     tft.print ("Uncalibrated");
@@ -511,7 +516,7 @@ void Force::CreateDataFile() {
 
 // Write data header to file of uSD.
 void Force::writeHeader() {
-  logfile.println("MM:DD:YYYY hh:mm:ss, Seconds, Device_Number, ProgressiveRatio, Grams_req, Hold_time, Ratio, Dispense_amount, Dispense_delay, Timeout, Trials_per_block, Max_force, Trial, Lever1_Grams, Lever2_Grams, Licks");
+  logfile.println("MM:DD:YYYY hh:mm:ss, Seconds, Device_Number, ProgressiveRatio, Grams_req, Hold_time, Ratio, Dispense_amount, Dispense_delay, Timeout, Trials_per_block, Max_force, Trial, Press, Lever1_Grams, Lever2_Grams, Licks, Dispense, Random_Num, Shock_trial");
 }
 
 // Print data and time followed by pellet count and motorturns to SD card
@@ -571,13 +576,25 @@ void Force::WriteToSD() {
   logfile.print(trial);
   logfile.print(",");
 
+  logfile.print(presses);
+  logfile.print(",");
+  
   logfile.print(grams);
   logfile.print(",");
 
   logfile.print(grams2);
   logfile.print(",");
 
-  logfile.println(lick);
+  logfile.print(lick);
+  logfile.print(",");
+
+  logfile.print(dispensing);
+  logfile.print(",");
+
+  logfile.print(random_number);
+  logfile.print(",");
+  
+  logfile.println(shock);
 
   logfile.flush();
 
@@ -670,7 +687,7 @@ void Force::Sense() {
   pixels.setPixelColor(0, pixels.Color(0, outputValue / 100, outputValue2 / 100)); 
   pixels.show();
 
-  lick = digitalRead(18) == LOW;
+  lick = digitalRead(18) == HIGH;
   Tare();
   check_buttons();
 }