Diff: main.cpp

Revision:

3:70f9de0ba6e0

Parent:

2:566f1af9d37d

Child:

4:ba04bae0f6fc

--- a/main.cpp	Fri Oct 17 17:34:17 2014 +0000
+++ b/main.cpp	Fri Oct 17 17:49:44 2014 +0000
@@ -16,7 +16,7 @@
 //Define objects
 AnalogIn    emg0(PTB0); //Biceps
 AnalogIn    emg1(PTB1); //Triceps
-HIDScope scope(5);
+HIDScope scope(4);
  
 arm_biquad_casd_df1_inst_f32 notch;
 //constants for 50Hz notch
@@ -74,11 +74,18 @@
     
     //send to PC
     scope.set(0,emg0_value_f32);
-    scope.set(1,filtered_emg0_eindsignaal_abs);
-    scope.set(3,emg1_value_f32);
-    scope.set(4,filtered_emg1_eindsignaal_abs);
+    scope.set(1,filtered_emg0_notch); 
+    scope.set(2,filtered_emg0_notch_highpass);
+    scope.set(3,filtered_emg0_notch_highpass_lowpass);
+    scope.set(4,filtered_emg0_eindsignaal_abs);
     scope.send();
 }
+    //scope.set(0,emg0_value_f32);
+    //scope.set(1,filtered_emg0_eindsignaal_abs);
+    //scope.set(3,emg1_value_f32);
+    //scope.set(4,filtered_emg1_eindsignaal_abs);
+    //scope.send();
+//}
  
 int main()
 {