Diff: main.cpp

Revision:

1:8119211eae14

Parent:

0:200635fa1b08

Child:

2:45da48fab346

--- a/main.cpp	Fri Mar 29 11:35:34 2013 +0000
+++ b/main.cpp	Fri Mar 29 16:28:56 2013 +0000
@@ -3,9 +3,9 @@
 
 #include "mbed.h"
 
-#include "Actuators/MainMotor/MainMotor.h"
-#include "Sensors/Encoder/Encoder.h"
-#include "Actuators/Servo/Servo.h"
+#include "Actuators/MainMotors/MainMotor.h"
+#include "Sensors/Encoders/Encoder.h"
+#include "Actuators/Arms/Arm.h"
 
 PwmOut Led(LED1);
 
@@ -14,19 +14,34 @@
 void motorencodetest();
 void motorencodetestline();
 void motorsandservostest();
+void armtest();
 
 int main() {
     //motortest();
     //encodertest();
     //motorencodetest();
-    motorencodetestline();
+    //motorencodetestline();
     //motorsandservostest();
+    armtest();
 }
 
+void armtest(){
+    Arm white(p26), black(p25, false,0.0005, 180);
+    while(1){
+        white(0);
+        black(0);
+        wait(1);
+        white(1);
+        black(1);
+        wait(1);
+    }
+}
+
+
 void motorsandservostest(){
     Encoder Eleft(p27, p28), Eright(p30, p29);
     MainMotor mleft(p24,p23), mright(p21,p22);
-    Servo sTop(p25), sBottom(p26);
+    Arm sTop(p25), sBottom(p26);
     Serial pc(USBTX, USBRX);
     const float speed = 0.0;
     const float dspeed = 0.0;