Diff: main.cpp

Revision:

30:dc68b509f930

Parent:

29:3efe34986347

Child:

31:adfa5a816488

--- a/main.cpp	Mon Sep 25 11:04:53 2017 +0000
+++ b/main.cpp	Thu Oct 05 18:02:40 2017 +0000
@@ -100,7 +100,7 @@
         if (taster2) 
         {
             pc.printf("\n\rOffset und Driftberechnung wird durchgefuehrt, halte die Drohne still");
-                printf("\n\rpitch, yaw, roll, newAngle_pitch, newAngle_´roll, newRate_pitch, newRate_yaw, newRate_roll, n2\n\r"); 
+                printf("\n\rpitch, yaw, roll, newAngle_pitch, newAngle_roll, gyro_pitch, gyro_yaw, gyro_roll, n2\n\r"); 
             while(1) 
             {             
                 
@@ -144,7 +144,7 @@
                     
                     if (i == 500)
                     {
-                        printf(" %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %f3.2 \t\t %d\n\r", pitch, yaw, roll, newAngle_pitch, newAngle_´roll, newRate_pitch, newRate_yaw, newRate_roll, n2); 
+                        printf(" %3.2f \t %3.2f \t %3.2f \t %3.2f \t\t %3.2f \t\t %3.2f \t\t %3.2f \t\t %3.2f \t\t %d\n\r", pitch, yaw, roll, newAngle_pitch, newAngle_roll, gyro_pitch, gyro_yaw, gyro_roll, n2); 
                         i = 0;
                     }
                     if (timer2.read_ms() >= 5000)
@@ -160,7 +160,7 @@
                             timer2.reset();
                     }
                     Motorsteurung(&Motor1, &Motor2, &Motor3, &Motor4, &taster2, &taster3, &taster4, &n1, &n2, &n3, &n4);
-                    if (n1>1400)
+                    if (n1>1501)
                     {
                         n1=n2=n3=n4=700;
                         Motor1.pulsewidth_us(n1);
@@ -173,4 +173,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file