Diff: main.cpp

Revision:

5:56a5fdd373c9

Parent:

4:1be0f6c6ceae

Child:

6:995b3679155f

Child:

8:69bdf20cb525

diff -r 1be0f6c6ceae -r 56a5fdd373c9 main.cpp
--- a/main.cpp	Wed Apr 03 17:54:53 2013 +0000
+++ b/main.cpp	Thu Apr 04 14:44:14 2013 +0000
@@ -7,7 +7,6 @@
 
 #include "Actuators/Arms/Arm.h"
 #include "Actuators/MainMotors/MainMotor.h"
-#include "Others/EmergencyStop/EmergencyStop.h"
 #include "Sensors/Encoders/Encoder.h"
 #include "Sensors/Colour/Colour.h"
 #include "Sensors/Colour/Led.h"
@@ -28,16 +27,13 @@
 void colourtest();
 
 int main() {
-/*  Setup EmergencyStop button for actuators.
-    Derive all actuators from the pure virtual actuator class!
-*/  EmergencyStop EStop(p8); 
     
 /*****************
  *   Test Code   *
  *****************/
     //motortest();
     //encodertest();
-    //motorencodetest();
+    motorencodetest();
     //motorencodetestline();
     //motorsandservostest();
     //armtest();
@@ -45,7 +41,7 @@
     //ledtest();
     //phototransistortest();
     //ledphototransistortest();
-    colourtest(); // Red SnR too low
+    //colourtest(); // Red SnR too low
 }
 
 void colourtest(){