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 34:7e0bf3e9f135, committed 2014-11-04

Comitter:
irisl
Date:
Tue Nov 04 08:39:49 2014 +0000
Parent:
33:381bc6635528
Child:
35:72d6cd2b2162
Commit message:
waarde aangepast

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Mon Nov 03 22:10:00 2014 +0000
+++ b/main.cpp	Tue Nov 04 08:39:49 2014 +0000
@@ -323,17 +323,17 @@
 void arm_hoog () //LET OP, PAS VARIABELE NOG AAN DIT IS VOOR TESTEN
 {
     speed2_rad = -6.0; //positief is CCW, negatief CW (boven aanzicht)
-    setpoint2 = -(150*2.0*PI/360);
-    /*setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
-    if(setpoint2 > (160*2.0*PI/360)) { //setpoint in graden
-        setpoint2 = (160.0*2.0*PI/360);
+    //setpoint2 = -(120*2.0*PI/360);
+    setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
+    if(setpoint2 > (140*2.0*PI/360)) { //setpoint in graden
+        setpoint2 = (120.0*2.0*PI/360);
     }
-    if(setpoint2 < -(250.0*2.0*PI/360)) {
-        setpoint2 = -(250.0*2.0*PI/360);
+    if(setpoint2 < -(140.0*2.0*PI/360)) {
+        setpoint2 = -(140.0*2.0*PI/360);
     }
-    */
+    
     prev_setpoint2 = setpoint2;
-    if(setpoint2 <= -((150.0*2.0*PI/360)-0.1)) {
+    if(setpoint2 <= -((140.0*2.0*PI/360)-0.1)) {
         staat2 = 1;
     }
 }
@@ -343,14 +343,14 @@
 {
     speed2_rad = -4.0;
     setpoint2 = prev_setpoint2 + TSAMP * speed2_rad;
-    if(setpoint2 > (155.0*2.0*PI/360)) {
+    if(setpoint2 > (140.0*2.0*PI/360)) {
         setpoint2 = (155.0*2.0*PI/360);
     }
-    if(setpoint2 < -(155.0*2.0*PI/360)) {
-        setpoint2 = -(155.0*2.0*PI/360);
+    if(setpoint2 < -(140.0*2.0*PI/360)) {
+        setpoint2 = -(140.0*2.0*PI/360);
     }
     prev_setpoint2 = setpoint2;
-    if(setpoint2 <= -((155.0*2.0*PI/360)-0.1)) {
+    if(setpoint2 <= -((140.0*2.0*PI/360)-0.1)) {
         staat2 = 1;
     }
 }
@@ -363,11 +363,11 @@
     if(setpoint2 > (155*2.0*PI/360)) {
         setpoint2 = (155*2.0*PI/360);
     }
-    if(setpoint2 < -(155.0*2.0*PI/360)) {
-        setpoint2 = -(155.0*2.0*PI/360);
+    if(setpoint2 < -(140.0*2.0*PI/360)) {
+        setpoint2 = -(140.0*2.0*PI/360);
     }
     prev_setpoint2 = setpoint2;
-    if(setpoint2 <= ((155.0*2.0*PI/360)-0.1)) {
+    if(setpoint2 <= ((140.0*2.0*PI/360)-0.1)) {
         staat2 = 1;
     }
 }