Xbeeを実装、speakをfunctionに、rotate消した、calibrationで回るように、ゴール判定を消した

Dependencies:   ATP3012 mbed a HMC US015_2 getGPS

Files at this revision

API Documentation at this revision

Comitter:
miyajitakenari
Date:
Sun Dec 19 09:30:30 2021 +0000
Parent:
32:38c29f2f405c
Commit message:
3kaime

Changed in this revision

Function.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 38c29f2f405c -r 81cce6df4f14 Function.h
--- a/Function.h	Sat Dec 18 10:55:47 2021 +0000
+++ b/Function.h	Sun Dec 19 09:30:30 2021 +0000
@@ -153,7 +153,7 @@
     char mess[100];  
     float as;          
         if(talk.IsActive(timeout_ms)==true){
-            xbee.printf("Active\n\rflag=");
+            /*xbee.printf("Active\n\rflag=");
             wait(3);
             if(xbee.readable()){
                 xbee.printf("\n\rmessage=");
@@ -166,11 +166,11 @@
                 xbee.printf("advance speed=");
                 xbee.scanf("%f",&as);
             }
-            else{
+            else{*/
                 xbee.printf("preset_message speak\r\n");
                 talk.Synthe("hinannyuudoudesu,,tuitekitekudasai.");
                 as=0.39;
-            }
+            //}
         }
         else{
             xbee.printf("\r\nNot Active\n");
diff -r 38c29f2f405c -r 81cce6df4f14 main.cpp
--- a/main.cpp	Sat Dec 18 10:55:47 2021 +0000
+++ b/main.cpp	Sun Dec 19 09:30:30 2021 +0000
@@ -23,7 +23,7 @@
     
     wait(3);//電源ついてから3v3が安定するまで、秒数は適当、必要かもわからん
     while(flight_pin){}
-        xbee.printf("flight_pin nuketa\n\r");
+        xbee.printf("flight_pin nuketa\n\r"); 
         wait(35);//ピン抜けてから地面につくまで70m/2.8(m/s)=25(s)余裕を見て+10s
         nichrome=1;//  ここ変える
         xbee.printf("nichrome in\n\r");