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 25:ae5fab0946f2, committed 2015-05-17

Comitter:
s1200058
Date:
Sun May 17 11:38:25 2015 +0000
Parent:
24:698d4e920d33
Commit message:
2015/05/17

Changed in this revision

AigamozuControlPackets.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 
diff -r 698d4e920d33 -r ae5fab0946f2 AigamozuControlPackets.lib
--- a/AigamozuControlPackets.lib	Sun May 17 01:11:52 2015 +0000
+++ b/AigamozuControlPackets.lib	Sun May 17 11:38:25 2015 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/aigamozu/code/AigamozuControlPackets/#3a2d87c10e43
+http://mbed.org/teams/aigamozu/code/AigamozuControlPackets/#8753fbab3f1f

diff -r 698d4e920d33 -r ae5fab0946f2 main.cpp
--- a/main.cpp	Sun May 17 01:11:52 2015 +0000
+++ b/main.cpp	Sun May 17 11:38:25 2015 +0000
@@ -120,9 +120,9 @@
                                         agz.get_agzPointKalman_lati(),agz.get_agzPointKalman_longi(),
                                         agz.get_agzCov_lati(),agz.get_agzCov_longi());             
     }
-    if(SenderIDc >= 'A' && SenderIDc < 'Z'){
+    if(SenderIDc >= 'A' && SenderIDc <= 'Z'){
         send_Address = robot_Address[SenderIDc - 'A'];
-            //Create GPS Infomation Packet
+        //Create GPS Infomation Packet
         agz.createReceiveStatusCommand(MyID,SenderIDc, agz.nowMode,
                                         agz.get_agzPoint_lati(),agz.get_agzPoint_longi(),
                                         agz.get_agzPointKalman_lati(),agz.get_agzPointKalman_longi(),
@@ -369,10 +369,10 @@
             sigma[0][i][j]=sigma[1][i][j];
         }
     }
-            
+    
     if(sigma[0][0][0] < SIGMA_MIN)sigma[0][0][0]=SIGMA_MIN;
     if(sigma[0][1][1] < SIGMA_MIN)sigma[0][1][1]=SIGMA_MIN;
-    
+            
     myGPS->latitudeKH=myGPS->latitudeH;//latitude after filtering
     myGPS->longitudeKH=myGPS->longitudeH;//longitude after filtering
     myGPS->latitudeKL=(long)x[1][0];//latitude after filtering
@@ -382,6 +382,7 @@
 }
 
 
+
 /////////////////////////////////////////
 //
 //Main Processing