Revision 18:ed2afe6953de, committed 2014-10-29

Comitter:

irisl

Date:

Wed Oct 29 08:51:44 2014 +0000

Parent:

17:dbbe4e126203

Child:

19:1bd2fc3bce1e

Commit message:

Presets werken. Aanspannen biceps--> rood knipperen --> groen knipperen en meten nieuwe preset --> preset uitvoeren

Changed in this revision

--- a/main.cpp	Tue Oct 28 15:08:35 2014 +0000
+++ b/main.cpp	Wed Oct 29 08:51:44 2014 +0000
@@ -42,8 +42,8 @@
     static float number=0;
     total = total + filtered_biceps;
     number = number + 1;
-    if ( number == 250) {
-        *average = total/250;
+    if ( number == 500) {
+        *average = total/500;
         total = 0;
         number = 0;
     }
@@ -55,8 +55,8 @@
     static float number=0;
     total = total + filtered_input;
     number = number + 1;
-    if ( number == 250) {
-        *average_output = total/250;
+    if ( number == 500) {
+        *average_output = total/500;
         total = 0;
         number = 0;
     }
@@ -142,18 +142,21 @@
 }
 
 void BlinkGreen()
-{   ledticker.attach(&greenblink,.5);
-  /*  myled1 = 1;
-    myled2 = 1;
-    myled3 = 1;
-    wait(0.1);
-    myled1 = 0;
-    myled2 = 1;
-    myled3 = 1;
-    wait(0.1);*/
+{
+    myled1= 1;
+    myled3 =1;
+    ledticker.attach(&greenblink,.5);
+    /*  myled1 = 1;
+      myled2 = 1;
+      myled3 = 1;
+      wait(0.1);
+      myled1 = 0;
+      myled2 = 1;
+      myled3 = 1;
+      wait(0.1);*/
 }
 
-void stopblinkred()
+void stopblinkgreen()
 {
     ledticker.detach();
 }
@@ -229,38 +232,42 @@
         /*Everything is handled by the interrupt routine now!*/
 
         while(1) {
-            pc.printf("Span de biceps aan om het instellen te starten");
+            pc.printf("Span de biceps aan om het instellen te starten.\n");
             do {
                 ShineRed();
             } while(filtered_average_bi < 0.05 && filtered_average_del <0.05); // In rust, geen meting
             if (filtered_average_bi > 0.05) {
-                BlinkRed(15);
-                while (1){
-                    BlinkGreen();
-                if (filtered_average_bi > 0.05 && filtered_average_del < 0.05) {
-                    stopblinkred();
-                    ShineRed();
-                    wait (4);
-                    break;
+                BlinkRed(10);
+                BlinkGreen();
+                while (1) {
+                    pc.printf("In de loop.\n");
+                    if (filtered_average_bi > 0.05 && filtered_average_del < 0.05) {
+                        stopblinkgreen();
+                        pc.printf("Shinered.\n");
+                        ShineRed();
+                        wait (4);
+                        break;
+                    }
+                    if (filtered_average_bi < 0.05 && filtered_average_del > 0.05) {
+                        stopblinkgreen();
+                        pc.printf("ShineBlue.\n");
+                        ShineBlue();
+                        wait(4);
+                        break;
+                    } else if (filtered_average_bi > 0.05 && filtered_average_del > 0.05)
+
+                    {
+                        stopblinkgreen();
+                        pc.printf("ShineGreen.\n");
+                        ShineGreen();
+                        wait (4);
+                        break;
+                    }
                 }
-                if (filtered_average_bi < 0.05 && filtered_average_del > 0.05) {
-                    stopblinkred();
-                    ShineBlue();
-                    wait(4);
-                    break;
-                } else if (filtered_average_bi > 0.05 && filtered_average_del > 0.05)
-
-                {
-                    stopblinkred();
-                    ShineGreen();
-                    wait (4);
-                    break;
-                }
-}
 
             }
         }
+
     }
+
 }
-
-