Diff: main.cpp

Revision:

14:7603d7f1dbe9

Parent:

10:e923f51f18c4

Child:

17:6b91c3549301

--- a/main.cpp	Mon Sep 21 13:18:29 2015 +0000
+++ b/main.cpp	Mon Sep 21 15:01:38 2015 +0000
@@ -1,5 +1,4 @@
 #include "mbed.h"
-#include "HIDScope.h"
 #include "encoder.h"
 #include "MODSERIAL.h"
 
@@ -9,44 +8,24 @@
 DigitalIn button(PTA4);
 Encoder motor2(D13,D12);
 MODSERIAL pc(USBTX,USBRX);
-//AnalogIn potmeter2(A0); /NIEUW
+double reference = 2000;
+
 int main()
 {
     pc.baud(9600);
     motor2.setPosition(0);
+    double  R = (reference - motor2.getPosition());
+    pc.printf("error R=%d \r\n", R);
+
     while(true) {
-        if (button.read() < 0.5) {   //if button pressed
-            motor2direction = 1;
+        if (R>1) {
+            motor2direction = 1; //CW
             motor2speed = 0.5f;
             pc.printf("positie = %d \r\n", motor2.getPosition());
-        } else {                  // If button is not pressed
-            motor2direction = 0;
-            motor2speed = 0;
+        } else    {
+            motor2direction = 0; //CCW
+            motor2speed = 0.5f;
             pc.printf("positie = %d \r\n", motor2.getPosition());
         }
-
-        while (motor2.getPosition() > 4200) {
-            motor2.setPosition(0);
-            pc.printf("Call foo! The cake is a lie!! \r\n");
-            break;
-        }
     }
-}
-
-
-//#include "mbed.h"
-//#include "MODSERIAL.h"
-//#include "HIDScope.h"
-//#include "encoder.h"
-//
-//MODSERIAL pc(USBTX,USBRX);
-//AnalogIn potmeter2(A0);
-//double Convert_pot_to_speed=0.000001;
-//
-//int main()
-//{
-//    pc.baud(9600);
-//    while (true) {
-//        pc.printf("position: %d \r\n", potmeter2.read());
-//    }
-//}
+}
\ No newline at end of file