Diff: main.cpp

Revision:

20:d5f5c60adc43

Parent:

19:bd453bee03f6

Child:

21:594915ba2bf9

--- a/main.cpp	Thu Oct 08 13:35:04 2015 +0000
+++ b/main.cpp	Thu Oct 08 14:44:51 2015 +0000
@@ -4,46 +4,45 @@
 #include "biquadFilter.h" //Filter direct form II
 
 //Define inputs
-//AnalogIn    emgL(A0); //Analog input left arm
+AnalogIn    emgL(A0); //Analog input left arm
 //AnalogIn    emgR(PTB1); //Analog input right arm
 DigitalOut  led1(LED_GREEN);
 MODSERIAL pc(USBTX,USBRX);
-
-//Define constants
-//float emgL_L;
+volatile bool control_go = false;
+Ticker control_tick;
+void ControlGo()
+{
+    control_go = true;
+    led1 = 0;
+}
 
 
-Ticker looptimer;
-volatile bool looptimerflag;
+//Define constants
+float emgL_L;
 
-//const float a1 = 0;
-//const float a2 = 0.17156822136;
-//const float b0 = 0.2928920553;
-//const float b1 = 0.5857841107;
-//const float b2 = 0.2928920554; // Waarde van biquads via groep 1 2014
-//biquadFilter Lowpassfilter (a1, a2, b0, b1, b2);
+const double a1 = 0;
+const double a2 = 0.17156822136;
+const double b0 = 0.2928920553;
+const double b1 = 0.5857841107;
+const double b2 = 0.2928920554; // Waarde van biquads via groep 1 2014
+biquadFilter Lowpassfilter (a1, a2, b0, b1, b2);
 
 HIDScope scope(2); // 1 HIDScope kanaal
 
-void setlooptimerflag (void)
-{
-    looptimerflag = true;
-}
-
 int main()
 {
- pc.baud(9600);
- led1 = 1;
- looptimer.attach(setlooptimerflag, 0.1);
+    control_tick.attach(&ControlGo, 1);
+
+    pc.baud(9600);
+
     while(true) {
-  
-        while (looptimerflag != true) {
-            looptimerflag = false;
-            //emgL_L = Lowpassfilter.step(emgL.read()); //emgL_L Linker bicep met lowpass filter
-            //scope.set(0,emgL.read());
-//            scope.set(1,emgL.read());
-//            scope.send();
-            led1 = !led1;
-        }
+        
+        if(control_go)
+        emgL_L = Lowpassfilter.step(emgL.read()); //emgL_L Linker bicep met lowpass filter
+        scope.set(0,emgL.read());
+        scope.set(1,emgL.read());
+        scope.send();
+        led1 = 1;
+
     }
 }
\ No newline at end of file