Diff: main.cpp

Branch:

Thread-gyogetsuMPU

Revision:

54:bbd1bf12d356

Parent:

51:f391d3a02397

--- a/main.cpp	Fri Apr 21 10:50:05 2017 +0000
+++ b/main.cpp	Wed May 17 13:55:33 2017 +0000
@@ -331,25 +331,12 @@
 //        }
 //        android.printf("%f,%f,%f,",pitch,roll,yaw);
 //        android.printf("%f,%f,\r\n",airSpeed,sonarDist);
-        android.printf("%4.2f,%4.2f,test,\n,",roll,airSpeed);
+        android.printf("%4.2f,%4.2f,%4.2,\n,",roll,airSpeed,cadence_twe.cadence);
         led2 = !led2;
     }
 //    SDprintf();
 }
 
-void WriteDatasF()
-{
-    //pc.printf("airSpeed:%f\n\r",airSpeed);
-}
-
-//float calcKXdeg(float x){
-//    return -310.54*x+156.65;
-//}
-
-//float calcAttackAngle(){
-//    return pitch-calcKXdeg(kx_Z.read());
-//}
-
 void RollAlarm()
 {
     if((roll < -ROLL_L_MAX_DEG ) && (roll > ROLL_L_MAX_DEG-180)) {
@@ -365,21 +352,6 @@
     }
 }
 
-void WriteServo()
-{
-    //kisokuServo.pulsewidth(calcPulse(airSpeed*10));
-//    kisokuServo.pulsewidth(calcPulse(9*airSpeed));
-    if(pitch<0) {
-//        geikakuServo.pulsewidth(calcPulse(0));
-    } else {
-//        geikakuServo.pulsewidth(calcPulse(abs(pitch*90/13.0)));
-    }
-    //////////pc.printf("a:%f",airSpeed);
-    //pc.printf("p:%f\r\n",pitch);
-    //kisokuServo.pulsewidth(calcPulse(0));
-    //geikakuServo.pulsewidth(calcPulse(0));
-}
-
 int main()
 {
 //    Thread cadence_thread(&updateCadence);