Diff: main.cpp

Revision:

9:0a7981d2da8a

Parent:

8:a41b2d8f6e74

Child:

10:e923f51f18c4

--- a/main.cpp	Mon Sep 21 12:34:43 2015 +0000
+++ b/main.cpp	Mon Sep 21 12:46:22 2015 +0000
@@ -1,46 +1,46 @@
+//#include "mbed.h"
+//#include "HIDScope.h"
+//#include "encoder.h"
+//#include "MODSERIAL.h"
+//
+////Motor 2
+//DigitalOut motor2direction(D4); //D4 en D5 zijn motor 2 (op het motorshield)
+//PwmOut motor2speed(D5);
+//DigitalIn button(PTA4);
+//Encoder motor2(D13,D12);
+//MODSERIAL pc(USBTX,USBRX); 
+//AnalogIn potmeter2(A0); /NIEUW
+//
+//int main()
+//{
+//    pc.baud(9600);
+//    motor2.setPosition(0);
+//    while(true) {
+//        if (button.read() < 0.5) {   //if button pressed
+//            motor2direction = 1;
+//            motor2speed = 0.5f;  
+//            pc.printf("positie = %d \r\n", motor2.getPosition());
+//        } else {                    // If button is not pressed
+//            motor2direction = 0;
+//            motor2speed = 0;
+//            pc.printf("positie = %d \r\n", motor2.getPosition());
+//        }
+//    }
+//}
+//
 #include "mbed.h"
+#include "MODSERIAL.h"
 #include "HIDScope.h"
 #include "encoder.h"
-#include "MODSERIAL.h"
 
-//Motor 2
-DigitalOut motor2direction(D4); //D4 en D5 zijn motor 2 (op het motorshield)
-PwmOut motor2speed(D5);
-DigitalIn button(PTA4);
-Encoder motor2(D13,D12);
-MODSERIAL pc(USBTX,USBRX); 
-
+MODSERIAL pc(USBTX,USBRX);
+AnalogIn potmeter2(A0);
+double Convert_pot_to_speed=0.000001;
 
 int main()
 {
     pc.baud(9600);
-    while(true) {
-        if (button.read() < 0.5) {   //if button pressed
-            motor2.setPosition(0);
-            motor2direction = 1;
-            motor2speed = 0.5f;  
-            pc.printf("positie = %d \r\n", motor2.getPosition());
-        } else {                    // If button is not pressed
-            motor2direction = 0;
-            motor2speed = 0;
-            pc.printf("positie = %d \r\n", motor2.getPosition());
-        }
+    while (true) {
+        pc.printf("position: %d \r\n", potmeter2.read());
     }
 }
-//
-//#include "mbed.h"
-//#include "MODSERIAL.h"
-//#include "HIDScope.h"
-//#include "encoder.h"
-//
-//Encoder encoder1(D13,D12);
-//MODSERIAL pc(USBTX,USBRX);
-//
-//int main()
-//{
-//    encoder1.setPosition(0);
-//    pc.baud(9600);
-//    while (true) {
-//        pc.printf("position: %d \r\n", encoder1.getPosition());
-//    }
-//}