[chronojump/michrolab] Fixed wrong avgVelocity of encoder repetitions
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/michrolab] Fixed wrong avgVelocity of encoder repetitions
- Date: Tue, 30 Aug 2022 06:29:17 +0000 (UTC)
commit bb4e3fc78a42689761b6b8b593dd6d8fcc60c9a8
Author: Xavier Padullés <testing chronojump org>
Date: Mon Aug 29 17:49:56 2022 +0200
Fixed wrong avgVelocity of encoder repetitions
arduino/michrolab/michrolab.ino | 37 +++----------------------------------
1 file changed, 3 insertions(+), 34 deletions(-)
---
diff --git a/arduino/michrolab/michrolab.ino b/arduino/michrolab/michrolab.ino
index a9f883feb..16aecfcaa 100644
--- a/arduino/michrolab/michrolab.ino
+++ b/arduino/michrolab/michrolab.ino
@@ -1323,16 +1323,11 @@ void getEncoderDynamics()
avgVelocity = (float)(position - startPhasePosition) * 1000 / (lastMeasuredTime - startPhaseTime);
bars[numRepetitions % 10] = abs(avgVelocity);
redrawBars = true;
-
-// for(int i = 0; i<10; i++)
-// {
-// Serial.print(bars[ (numRepetitions%10 - i + 10) % 10]);
-// Serial.print("\t");
-// }
-// Serial.println();
+
+ //printBarsValues();
numRepetitions++;
- if (avgVelocity > maxAvgVelocity)
+ if (avgVelocity > maxAvgVelocity) maxAvgVelocity = avgVelocity;
// Serial.println(String(position) + " - " + String(startPhasePosition) + " = " +
String(position - localMax) + "\t" + String(encoderPhase));
// Serial.println("Change of phase at: " + String(lastMeasuredTime));
// Serial.print(String(1000 * (float)(position - startPhasePosition) / (lastMeasuredTime -
startPhaseTime)) + " m/s\t" );
@@ -1893,32 +1888,6 @@ void saveSimpleJump(float lastPhaseTime)
dataFile.close();
}
-//void saveDropJump(float lastPhaseTime)
-//{
-// Serial.println(waitingFirstPhase);
-// fullFileName = "/" + dirName + "/" + fileName + ".txt";
-// dataFile = SD.open(fullFileName.c_str(), FILE_WRITE);
-// if (waitingFirstPhase)
-// {
-// //Starts the previous jump
-// if ( !rcaState)
-// {
-// Serial.print("Previous jump started");
-// }
-//
-// //Starts de first landing
-// else if (rcaState)
-// {
-// Serial.println("Previous jump ended");
-// }
-// //Starting or ending the second jump
-// } else if (!waitingFirstPhase)
-// {
-// Serial.println("Second jump");
-// dataFile.print( ";" + String(lastPhaseTime, 6) );
-// }
-//}
-
void fakeFunction()
{
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]