Diff: main.cpp

Revision:

39:3faddfc87351

Parent:

38:7c323abc62fb

Child:

40:917b50b9e863

--- a/main.cpp	Mon Mar 04 08:07:53 2019 +0000
+++ b/main.cpp	Mon Mar 04 17:28:47 2019 +0000
@@ -74,7 +74,7 @@
 
 bool setupFlag = false;
 bool CameraDegFlag = false;
-bool jevoisFlag = true;
+bool jevoisFlag = false;
 bool FocusFlag = false;
 
 int g_CameraDegCounter = 0;    //カメラの回転数をカウント
@@ -152,10 +152,18 @@
     NVIC_EnableIRQ(USART2_IRQn);    
     jevoisFlag = true; 
     g_landingcommand='N';
+    g_fp = fopen( "/sd/Datalog01.txt","a" );
+    fprintf(g_fp, "Time = %d min %d sec : Parachute cut.\r\n",(int)t2.read()/60,(int)t2.read()%60);        
+    fclose(g_fp);
     wait(5); 
-    MoveCansat(2);
+    MoveCansat('1');
+    servoR.pulsewidth_us(Servo_NEUTRAL_R);
+    servoL.pulsewidth_us(Servo_NEUTRAL_L);
     wait(10);
-    pc.printf("start\r\n");  
+    pc.printf("start\r\n"); 
+    g_fp = fopen( "/sd/Datalog01.txt","a" );
+    fprintf(g_fp, "Time = %d min %d sec : Start sarching target .\r\n",(int)t2.read()/60,(int)t2.read()%60);        
+    fclose(g_fp); 
     
     
     servoTurnTable.pulsewidth_us(Turntable_NEUTRAL + Turntable_speed);
@@ -548,6 +556,10 @@
     }
     g_CameraDegCounter = 0;
     
+    g_fp = fopen( "/sd/Datalog01.txt","a" );
+    fprintf(g_fp, "Time = %d min %d sec : Cansat move %fdeg.\r\n",(int)t2.read()/60,(int)t2.read()%60,TargetDeg);        
+    fclose(g_fp);
+    
     NVIC_EnableIRQ(USART6_IRQn);
     NVIC_EnableIRQ(USART2_IRQn);
     return;