[chronojump/michrolab: 50/57] Added accel and propulsive phase calculations

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

commit 7d9f2a3cc063e4c32be6117ffb99fbe08828765b
Author: Xavier Padullés <testing chronojump org>
Date:   Sat May 21 13:25:04 2022 +0200

    Added accel and propulsive phase calculations

 arduino/ForceSensorTFT/ForceSensorTFT.ino | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/arduino/ForceSensorTFT/ForceSensorTFT.ino b/arduino/ForceSensorTFT/ForceSensorTFT.ino
index e105a3170..9c5375b41 100644
--- a/arduino/ForceSensorTFT/ForceSensorTFT.ino
+++ b/arduino/ForceSensorTFT/ForceSensorTFT.ino
@@ -56,8 +56,11 @@ long startPhasePosition = 0;
 long startPhaseTime = 0;
 int minRom = 100;      //Minimum range of movement to consider the start of a new repetition
 long localMax = 0;    //Local maximum in the position. It must be checked if it is a point of phase change
+float lastVelocity = 0;
 float avgVelocity = 0;
 float maxAvgVelocity = 0;
+bool propulsive = true;
+
 int numRepetitions = 0;
 
 int tareAddress = 0;
@@ -1422,6 +1425,11 @@ void getEncoderDynamics()
     long position = encoder.read();
     if (inertialMode) position = - abs(position);
     measured = (float)(position - lastSamplePosition) * 1000 / (sampleDuration);
+    float accel = (measured - lastVelocity) * 1000000 / sampleDuration;
+    if(propulsive && accel <= -9.81){
+      //Serial.println(String(accel) + " End propulsive at time: " + String(lastSampleTime));
+      propulsive = false;
+    }
     //measured = position;
     //if (measured != 0) Serial.println(measured);
     //Before detecting the first repetition we don't know the direction of movement
@@ -1450,15 +1458,18 @@ void getEncoderDynamics()
     } else if (encoderPhase * (position - localMax) < - minRom)
       {
         encoderPhase *= -1;
+        propulsive = true;
         numRepetitions++;
-        avgVelocity = (float)(position - startPhasePosition) * 1000 / (lastSampleTime - startPhaseTime);
-        //Serial.println(avgVelocity);
+        //avgVelocity = (float)(position - startPhasePosition) * 1000 / (lastSampleTime - startPhaseTime);
         if (avgVelocity > maxAvgVelocity) maxAvgVelocity = avgVelocity;
         //Serial.println(String(position) + " - " + String(startPhasePosition) + " = " + String(position - 
localMax) + "\t" + String(encoderPhase));
+        //Serial.println("Change of phase at: " + String(lastSampleTime));
         startPhasePosition = position;
         startPhaseTime = lastSampleTime;
       }
     lastSamplePosition = position;
+    lastVelocity = measured;  
+    //Serial.println(String(measured) + "\t" + String(accel));
   }
 }
 
@@ -1483,6 +1494,7 @@ void startEncoderCapture()
   startPhaseTime = 0;
   avgVelocity = 0;
   maxAvgVelocity = 0;
+  lastVelocity = 0;
   capture();
 }