Diff: agz_common.cpp

Revision:

1:9339d5b59c6d

Parent:

0:54e62ef6d287

diff -r 54e62ef6d287 -r 9339d5b59c6d agz_common.cpp
--- a/agz_common.cpp	Wed Jun 18 13:48:18 2014 +0000
+++ b/agz_common.cpp	Wed Apr 08 13:08:27 2015 +0000
@@ -9,16 +9,19 @@
 * Base and JOY-STICK is same.
 */
 
-XBeeAddress64 Agz_XBee_Remote_Address[AGZ_NUM_ROBOTS] = {XBeeAddress64(0x0013A200, 0x409EAEF3)//R1
-                                                        ,XBeeAddress64(0x0013A200, 0x40993719)//R2
-                                                        ,XBeeAddress64(0x0013A200, 0x409EAEEB)//R3
-                                                        ,XBeeAddress64(0x0013A200, 0x409EAF0E)};//R4
-                                                        /*
-                                                        {XBeeAddress64(0x0013A200, 0x409EAF01)
-                                                        ,XBeeAddress64(0x0013A200, 0x409EAF01)
-                                                        ,XBeeAddress64(0x0013A200, 0x409EAF01)
-                                                        ,XBeeAddress64(0x0013A200, 0x409EAF01)};
-*/
+XBeeAddress64 Agz_XBee_Remote_Address[AGZ_NUM_ROBOTS] = {XBeeAddress64(0x0013A200, 0x409EAEF3)//XBeeAddress64(0x0013A200, 0x409EAEF0)//R1
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF09)//R2
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAEE6)//R3
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF0C)//R4
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF0A)//R5
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAEEA)};//R6
+
+XBeeAddress64 Agz_XBee_BASE_Address[AGZ_NUM_BASE]     = {XBeeAddress64(0x0013A200, 0x409EAF0E)//XBeeAddress64(0x0013A200, 0x409EAEF0)//R1
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF09)//R2
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAEE6)//R3
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF0C)//R4
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAF0A)//R5
+                                                        ,XBeeAddress64(0x0013A200, 0x409EAEEA)};//R6
 
 
 /*----------------------------------------------
@@ -34,22 +37,22 @@
 }
 
 void AGZ_ROBOT::set_LatitudeH(uint8_t *data){
-    for(int i = 0;i < 3;i++)
+    for(int i = 0;i < 4;i++)
         LatitudeH.value_ch[i] = data[i];
 }
 
 void AGZ_ROBOT::set_LatitudeL(uint8_t *data){
-    for(int i = 0;i < 6;i++)
+    for(int i = 0;i < 4;i++)
         LatitudeL.value_ch[i] = data[i];
 }
 
 void AGZ_ROBOT::set_LongitudeH(uint8_t *data){
-    for(int i = 0;i < 3;i++)
+    for(int i = 0;i < 4;i++)
         LongitudeH.value_ch[i] = data[i];
 }
 
 void AGZ_ROBOT::set_LongitudeL(uint8_t *data){
-    for(int i = 0;i < 6;i++)
+    for(int i = 0;i < 4;i++)
         LongitudeL.value_ch[i] = data[i];
 }