Diff: main.cpp

Revision:

4:1be0f6c6ceae

Parent:

3:717de74f6ebd

Child:

5:56a5fdd373c9

diff -r 717de74f6ebd -r 1be0f6c6ceae main.cpp
--- a/main.cpp	Mon Apr 01 15:33:48 2013 +0000
+++ b/main.cpp	Wed Apr 03 17:54:53 2013 +0000
@@ -5,12 +5,12 @@
 #include "mbed.h"
 Serial pc(USBTX, USBRX);
 
+#include "Actuators/Arms/Arm.h"
 #include "Actuators/MainMotors/MainMotor.h"
+#include "Others/EmergencyStop/EmergencyStop.h"
 #include "Sensors/Encoders/Encoder.h"
-#include "Actuators/Arms/Arm.h"
-#include "Others/EmergencyStop/EmergencyStop.h"
+#include "Sensors/Colour/Colour.h"
 #include "Sensors/Colour/Led.h"
-#include "Sensors/Colour/Colour.h"
 #include "Sensors/Colour/Phototransistor.h"
 
 
@@ -96,7 +96,6 @@
 
 void phototransistortest(){
     Phototransistor pt(p20); 
-    Serial pc(USBTX, USBRX);
     while(true){
         wait(0.1);
         pc.printf("Phototransistor Analog is: %f \n\r", pt.read());
@@ -132,7 +131,7 @@
     Encoder Eleft(p27, p28), Eright(p30, p29);
     MainMotor mleft(p24,p23), mright(p21,p22);
     Arm sTop(p25), sBottom(p26);
-    Serial pc(USBTX, USBRX);
+    //Serial pc(USBTX, USBRX);
     const float speed = 0.0;
     const float dspeed = 0.0;
     
@@ -177,7 +176,7 @@
 void motorencodetestline(){
     Encoder Eleft(p27, p28), Eright(p30, p29);
     MainMotor mleft(p24,p23), mright(p21,p22);
-    Serial pc(USBTX, USBRX);
+    //Serial pc(USBTX, USBRX);
     const float speed = 0.2;
     const float dspeed = 0.1;