Diff: main.cpp

Revision:

38:b03a5bf9ac7b

Parent:

37:8021b3ce241a

Child:

39:e35a99801ec1

--- a/main.cpp	Wed Jun 15 14:09:49 2016 +0000
+++ b/main.cpp	Wed Jun 15 14:20:32 2016 +0000
@@ -115,7 +115,7 @@
         if (!(i == 2 || i == 3))
         {        
             pc.printf("calib %d\n", i);
-            ms[i]->drive(i == 0 || i == 1 || i == 5 ? -0.3f : 0.3f);
+            ms[i]->drive(i == 0 || i == 1 || i == 5 ? -0.5f : 0.5f);
             while (ss[i].read());
         }
         ms[i]->drive(0.f);
@@ -134,12 +134,12 @@
     ms[4]->rotate(0.5f - 0.125f, 0.5f);
     ms[5]->rotate(-0.5f - 0.125f, 0.5f);
     waitAllRotate();*/
-    ms[0]->rotate(-0.5f - 0.125f, 0.5f);
-    ms[1]->rotate(-0.5f + 0.125f, 0.5f);
-    ms[2]->rotate(0.5f + 0.125f, 0.5f);
-    ms[3]->rotate(0.5f - 0.125f, 0.5f);
-    ms[4]->rotate(0.5f + 0.125f, 0.5f);
-    ms[5]->rotate(-0.5f + 0.125f, 0.5f);
+    ms[0]->rotate(-0.5f - 0.125f, 0.75f);
+    ms[1]->rotate(-0.5f + 0.125f, 0.75f);
+    ms[2]->rotate(0.5f + 0.125f, 0.75f);
+    ms[3]->rotate(0.5f - 0.125f, 0.75f);
+    ms[4]->rotate(0.5f + 0.125f, 0.75f);
+    ms[5]->rotate(-0.5f + 0.125f, 0.75f);
     waitAllRotate();
     
     float volatile speed;
@@ -150,7 +150,7 @@
     while(1)
     {
       
-        speed = 0.925f;
+        speed = 1.5f;
         //speed = 0;
         //int oldactive = active;
         //pc.scanf("%f", &speed);