[chronojump] Force sensor time changed to absolute
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Force sensor time changed to absolute
- Date: Fri, 11 Aug 2017 10:37:36 +0000 (UTC)
commit 8dd1475a021ac6f48f21c4b58683d278ab3328a0
Author: Xavier Padullés <x padulles gmail com>
Date: Fri Aug 11 12:36:25 2017 +0200
Force sensor time changed to absolute
arduino/ForceSensor/ForceSensor.ino | 9 ++-
arduino/ForceSensor/tare_calibration.ino | 96 ------------------------------
2 files changed, 6 insertions(+), 99 deletions(-)
---
diff --git a/arduino/ForceSensor/ForceSensor.ino b/arduino/ForceSensor/ForceSensor.ino
index 460660e..019e52f 100644
--- a/arduino/ForceSensor/ForceSensor.ino
+++ b/arduino/ForceSensor/ForceSensor.ino
@@ -56,6 +56,8 @@ boolean capturing = false;
unsigned long lastTime = 0;
unsigned long currentTime = 0;
+unsigned long elapsedTime = 0;
+unsigned long totalTime = 0;
void setup() {
Serial.begin(115200);
@@ -68,7 +70,6 @@ void setup() {
void loop() {
- unsigned long elapsedTime = 0;
if (capturing)
{
currentTime = micros();
@@ -81,8 +82,8 @@ void loop() {
{
elapsedTime = (4294967295 - lastTime) + currentTime; //Time from the last measure to the overflow
event plus the currentTime
}
-
- Serial.print(elapsedTime);
+ totalTime += elapsedTime;
+ Serial.print(totalTime);
Serial.print(";");
Serial.println(scale.get_units(), 1); //scale.get_units() returns a float
}
@@ -129,6 +130,8 @@ void serialEvent()
void start_capture()
{
Serial.println("Starting capture...");
+ totalTime = 0;
+ lastTime = micros();
capturing = true;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]