aigamozu / Mbed 2 deprecated Aigamozu_Robot_ver3_3

2015/05/17

Dependencies:   ADXL345 AigamozuControlPackets HMC5843 ITG3200 MBed_Adafruit-GPS-Library XBee agzIDLIST mbed

Fork of Aigamozu_Robot_ver3_2 by aigamozu

Files at this revision

API Documentation at this revision

Revision 21:76e7f36df4a9, committed 2015-05-16

Comitter:
s1200058
Date:
Sat May 16 17:26:57 2015 +0000
Parent:
20:eee8ac8d1788
Child:
22:af860680417b
Commit message:
2015/05/16

Changed in this revision

agzIDLIST.lib 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 
--- a/agzIDLIST.lib	Sat May 16 14:08:27 2015 +0000
+++ b/agzIDLIST.lib	Sat May 16 17:26:57 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/aigamozu/code/agzIDLIST/#b17fb2bbe0db
+http://mbed.org/teams/aigamozu/code/agzIDLIST/#059b11d3e5d5

--- a/main.cpp	Sat May 16 14:08:27 2015 +0000
+++ b/main.cpp	Sat May 16 17:26:57 2015 +0000
@@ -5,6 +5,7 @@
 //  Program name: Aigamozu ROBOT
 //  Author: Mineta Kizuku
 //  
+// 
 //
 /**********************************************/
 
@@ -17,7 +18,7 @@
 //カルマンフィルタの共分散の値を0.0001以下にならないようにした
 //共分散の値を10進数に変換するようにした
 //
-//2015/05/13
+//2015/05/13 Yokokawa
 //何回目のGPSでとられたGPSか確認するようにしました。
 //
 //2015/05/15
@@ -41,7 +42,7 @@
 //Base    ID: 'a' ~ 'a'
 //manager ID: '0'(数字のゼロ)
 //
-const char MyID = 'B';
+const char MyID = 'D';
 //************ID Number*****************
 
 /////////////////////////////////////////
@@ -108,10 +109,10 @@
 /////////////////////////////////////////
 void Send_Status(char SenderIDc){
     XBeeAddress64 send_Address;
-    if(SenderIDc == '0'){
+    if(SenderIDc == 'Z'){
         send_Address = manager_Address;
     }
-    if(SenderIDc >= 'A' && SenderIDc <= 'Z'){
+    if(SenderIDc >= 'A' && SenderIDc < 'Z'){
         send_Address = robot_Address[SenderIDc - 'A'];
     }
     if(SenderIDc >= 'a' && SenderIDc <= 'z'){
@@ -425,7 +426,7 @@
                 uint8_t *buf = zbRx.getFrameData();//フレームデータを格納する
                 uint8_t *buf1 = &buf[11];//データの部分のみを格納する
                 SenderIDc = buf1[5];//送信元のIDを取得する
-                char Command_type =agz.checkCommnadType(buf);//コマンドタイプを取得する
+                char Command_type = agz.checkCommnadType(buf);//コマンドタイプを取得する
                  
                 //Check Command Type 
                 switch(Command_type){
@@ -435,7 +436,8 @@
                         break;
                     }
                     case STATUS_REQUEST:{
-                        Send_Status(SenderIDc);                     
+                        Send_Status(SenderIDc); 
+                        printf("%c\n", SenderIDc);                  
                         break;          
                     }
                     case CHANGE_MODE:{