cansat_B 2019 / Mbed 2 deprecated CanSatB2019_main_1214_essence_8_3

Dependencies:   mbed

Files at this revision

API Documentation at this revision

Comitter:
seijakunouenimutou
Date:
Sat Dec 14 22:42:49 2019 +0000
Parent:
23:a04e970f1326
Commit message:
g

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Sat Dec 14 21:03:00 2019 +0000
+++ b/main.cpp	Sat Dec 14 22:42:49 2019 +0000
@@ -227,17 +227,22 @@
                 while (camera.isProcessing()) {
                  camera.processPicture();
 
-                 printf("take pictuer!");
+                 printf("take picture!");
+
+                 /*xbee.printf("xbee connected!!\r\n");
 
+                 bs = new base64();
+                 bs->Encode(filename,"/local/data.txt");*/
+               
+                 printf("time = %f\n", timer.read());
+                 
                  xbee.printf("xbee connected!!\r\n");
 
                  bs = new base64();
                  bs->Encode(filename,"/local/data.txt");
-               
-                 printf("time = %f\n", timer.read());
 
                
-                  if((fp=fopen("/local/d.txt","r"))!=NULL){
+                  if((fp=fopen("/local/data.txt","r"))!=NULL){
                    pc.printf("ok\r\n");
                    while((c=fgetc(fp))!=EOF){
                      xbee.printf("%c",c);
@@ -258,7 +263,7 @@
               if (received_data == 82 || received_data == 114){  //Rまたはr
 
                 xbee.printf("_________________________________________________________________________________________________________________________________\r\n");
-                if((fp=fopen("/local/d.txt","r"))!=NULL) {
+                if((fp=fopen("/local/data.txt","r"))!=NULL) {
                   while ((c=fgetc(fp))!=EOF){
 
                    xbee.printf("%c",c);                    //再送