Diff: main.cpp

Revision:

37:93c7563f2078

Parent:

36:9ca4125e526e

Child:

38:f1c571d22919

--- a/main.cpp	Mon Oct 03 17:43:28 2016 +0200
+++ b/main.cpp	Mon Oct 03 18:14:33 2016 +0200
@@ -34,7 +34,8 @@
 int calPoint = 0;
 bool calStarted = false;
 Timer calTimer;
-float calHeldTime;
+float calHeldTime;]
+bool calFinished = false;
 
 int measuredTs = 0;
 
@@ -184,7 +185,7 @@
         calTimer.start();
         calHeldTime = calTimer.read();
 
-        if( calHeldTime >= 5 && ballOnPlate )
+        if( calHeldTime >= 5 )
         {
           while( test.read() );
 
@@ -193,38 +194,17 @@
           calTimer.reset();
         }
       }
-    }
-  }
-
-  while( calStarted )
-  {
-    while( calPoint < 3 )
-    {
-      //TODO Reaplace test with plate
-      if( test.read() )
-      {
-        calTimer.start();
-        //TODO measure and save screen values;
-
-        while( calTimer.read() < 5 )
-        {
-          calHeldTime = calTimer.read();
-        }
-
-        while(test.read());
-
-        calPoint++;
-        calTimer.stop;
-        calTimer.reset();
-      }
       else
       {
-        calTimer.stop;
+        calTimer.stop();
         calTimer.reset();
       }
     }
-
-    calStarted = false;
-    calPoint = 0;
+    else
+    {
+      calFinished = true;
+      calPoint = 0;
+      calStarted = false;
+    }
   }
 }