Diff: main.cpp

Revision:

14:94a02b617085

Parent:

13:75892580d4ff

Child:

15:55b8bfa4d09c

--- a/main.cpp	Thu May 14 13:32:39 2015 +0000
+++ b/main.cpp	Thu May 14 15:13:13 2015 +0000
@@ -10,10 +10,10 @@
 DigitalOut led2(P2_7);
 DigitalOut led3(P2_8);
 AnalogIn hallSensor(P0_26);
-InterruptIn hall1_(P0_5), hall2_(P0_4);
-Hallsensor hall1(P1_26, P1_27);
+//InterruptIn hall1_(P0_5), hall2_(P0_4);
+//Hallsensor hall1(P1_26, P1_27);
 
-Motor motor1(P2_0, P2_1,&hall1);
+//Motor motor1(P2_0, P2_1,&hall1);
 
 
 //Serial RN42(P0_10, P0_11);
@@ -61,6 +61,7 @@
     timer.start();
     timer2.start();
 
+            motor2.setVelocity(0.7);
   //  imu.setFifoReset(true);
    // imu.setDMPEnabled(true);
 
@@ -71,11 +72,11 @@
          //   imu.getFifoBuffer(buffer,  48);
      //       led2 = !led2;
             //debug.printf("%d\r\n",timer2.read_ms());
-            timer2.reset();
-        }
+       //     timer2.reset();
+       // }
 
-    /*    if(timer.read_ms() > 50) {
-            timer.reset();
+      //  if(timer.read_ms() > 50) {
+       //     timer.reset();
 
             //This is the format of the data in the fifo,
             /* ================================================================================================ *
@@ -118,8 +119,7 @@
        //     debug.printf("p: %f r: %f y: %f ",pry.x/PI*180,pry.y/PI*180,pry.z/PI*180);
         //    debug.printf("m1: %d m2: %d \r\n ",motor2.getPulses(),motor2.getPulses());
             //motor1.setVelocity(pry.x/90);
-            motor2.setVelocity(0.7);
 
         }
     
-
+}