Iris van Leeuwen / Mbed 2 deprecated Lampje_EMG_Gr6

2 losse EMG signalen van de biceps en deltoid

Dependencies:   HIDScope MODSERIAL mbed-dsp mbed Encoder

Fork of Lampje_EMG_Gr6 by Jesse Kaiser

Files at this revision

API Documentation at this revision

Revision 37:f72a3902482f, committed 2014-11-05

Comitter:
irisl
Date:
Wed Nov 05 23:19:58 2014 +0000
Parent:
36:2166eaca545e
Commit message:
forward slashes weggehaald in motorfuncties

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 2166eaca545e -r f72a3902482f main.cpp
--- a/main.cpp	Wed Nov 05 16:10:07 2014 +0000
+++ b/main.cpp	Wed Nov 05 23:19:58 2014 +0000
@@ -343,14 +343,14 @@
 {
     speed2_rad = -6.0; //positief is CCW, negatief CW (boven aanzicht)
     setpoint2 = -(120*2.0*PI/360);
-    /*setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
+    setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
     if(setpoint2 > (100*2.0*PI/360)) { //setpoint in graden
         setpoint2 = (100.0*2.0*PI/360);
     }
     if(setpoint2 < -(100.0*2.0*PI/360)) {
         setpoint2 = -(100.0*2.0*PI/360);
     }
-*/
+
     prev_setpoint2 = setpoint2;
     if(setpoint2 <= -((100.0*2.0*PI/360)-0.1)) {
         staat2 = 1;
@@ -362,14 +362,14 @@
 {
     speed2_rad = -6.0; //positief is CCW, negatief CW (boven aanzicht)
     setpoint2 = -(120*2.0*PI/360);
-    /*setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
+    setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
     if(setpoint2 > (100*2.0*PI/360)) { //setpoint in graden
         setpoint2 = (100.0*2.0*PI/360);
     }
     if(setpoint2 < -(100.0*2.0*PI/360)) {
         setpoint2 = -(100.0*2.0*PI/360);
     }
-*/
+
     prev_setpoint2 = setpoint2;
     if(setpoint2 <= -((100.0*2.0*PI/360)-0.1)) {
         staat2 = 1;