kappa

Dependencies:   Encoder HIDScope MODSERIAL- mbed-dsp mbed

Fork of PROJECT_incl_regelaar by Aukie Hooglugt

Files at this revision

API Documentation at this revision

Comitter:
Hooglugt
Date:
Tue Nov 04 10:13:43 2014 +0000
Parent:
20:5007ddcd03ef
Child:
22:77d7065cc431
Commit message:
deze manier voor regelen motor2

Changed in this revision

PROJECT_main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/PROJECT_main.cpp	Tue Nov 04 10:09:43 2014 +0000
+++ b/PROJECT_main.cpp	Tue Nov 04 10:13:43 2014 +0000
@@ -548,7 +548,7 @@
                     //setpoint2 += 1*TSAMP;
                     switch (direction) {
                         case 1:
-                            angle = 0.20;
+                            angle = 0.1; //0.15 links
                             break;
                         case 2:
                             angle = 0.13;
@@ -564,13 +564,13 @@
                         count = 0;
                         state=2;
                     }                    
-                   
+                    
                     /*
                     if(setpoint2>angle) {  // batjeset (controle bereik)
                         setpoint2 = angle; //setpoint2 = motor2.getPosition()*omrekenfactor2;
                         count = 0;
                         state=2;
-                    }*/                    
+                    }      */             
                     break;
                 }
                 case 2: {