[chronojump/michrolab: 34/57] Fixed values below the graph

[Xavier Padullés <xpadulles src gnome org>]

commit ccb0d16ec4596b17a13d01329f5f4ef160923b0d
Author: Xavier Padullés <testing chronojump org>
Date:   Sat May 14 22:31:01 2022 +0200

    Fixed values below the graph

 arduino/ForceSensorTFT/ForceSensorTFT.ino | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/arduino/ForceSensorTFT/ForceSensorTFT.ino b/arduino/ForceSensorTFT/ForceSensorTFT.ino
index 2bc64838e..4324c74bc 100644
--- a/arduino/ForceSensorTFT/ForceSensorTFT.ino
+++ b/arduino/ForceSensorTFT/ForceSensorTFT.ino
@@ -73,6 +73,7 @@ enum sensorType {
 };
 
 sensorType sensor = none;
+String maxString = "";
 
 ////Wether the sync time must be sent or not
 //bool sendSyncTime = false;
@@ -80,8 +81,6 @@ sensorType sensor = none;
 //wether the tranmission is in binary format or not
 boolean binaryFormat = false;
 
-unsigned long lastTime = 0;
-
 //RFD variables
 float RFD200 = 0.0;   //average RFD during 200 ms
 float RFD100 = 0.0;  //average RFD during 100 ms
@@ -479,7 +478,6 @@ void startLoadCellCapture()
 {
   Serial.println("Starting capture...");
   totalTime = 0;
-  lastTime = micros();
   measuredMax = scale.get_units();
   impulse = 0;
   maxRFD100 = 0;
@@ -503,6 +501,7 @@ void startLoadCellCapture()
   samplesSSD = 0;
   capturing = true;
   sensor = loadCell;
+  maxString = "Fmax:        N";
   plotPeriod = 5;
 }
 
@@ -989,7 +988,6 @@ void showsystemMenu() {
 void start_steadiness()
 {
   totalTime = 0;
-  lastTime = micros();
 
   capturing = true;
   capturingPreSteadiness = true;
@@ -1159,10 +1157,8 @@ void capture()
   //Print summary results
   tft.setTextSize(2);
   tft.setCursor(10, 215);
-  tft.print("Fmax: ");
+  tft.print(maxString);
   printTftFormat(measuredMax, 100, 215, 2, 2);
-  tft.setCursor(148, 215);
-  tft.print(" N");
   tft.setCursor(308, 215);
   tft.print("s");
 
@@ -1291,7 +1287,10 @@ void startEncoderCapture()
 {
   capturing = true;
   sensor = incEncoder;
+  maxString = "Vmax:        m/s";
   plotPeriod = 500;
+  measuredMax = 0;
+  totalTime = 0;
   capture();
 }