Diff: agzIDLIST.h

Revision:

13:3d74358d3b1b

Parent:

11:f97178c08e4c

Child:

15:0f026cfcf1bd

--- a/agzIDLIST.h	Thu May 14 10:04:08 2015 +0000
+++ b/agzIDLIST.h	Thu May 14 10:16:47 2015 +0000
@@ -5,7 +5,7 @@
 ////////////
 
 //BASE 1
-#define BASE1_NUM 4
+#define BASE_NUM 4
 #define BASE1_32H 0x0013A200
 #define BASE1_32L 0x4099371F
  
@@ -26,33 +26,32 @@
 #define BASE5_32L 0x40993705
 
 //BASE 6
-#define BASE1_NUM 5
-#define BASE1_32H 0x0013A200
-#define BASE1_32L 0x40993784
+#define BASE6_32H 0x0013A200
+#define BASE6_32L 0x40993784
  
 //BASE 7
-#define BASE2_32H 0x0013A200
-#define BASE2_32L 0x40993757
+#define BASE7_32H 0x0013A200
+#define BASE7_32L 0x40993757
  
 //BASE 8
-#define BASE3_32H 0x0013A200
-#define BASE3_32L 0x40993700
+#define BASE8_32H 0x0013A200
+#define BASE8_32L 0x40993700
  
 //BASE 9
-#define BASE4_32H 0x0013A200
-#define BASE4_32L 0x40CACD51
+#define BASE9_32H 0x0013A200
+#define BASE9_32L 0x40CACD51
  
 //BASE 10
-#define BASE5_32H 0x0013A200
-#define BASE5_32L 0x40CACCD8
+#define BASE10_32H 0x0013A200
+#define BASE10_32L 0x40CACCD8
 
 //BASE 11
-#define BASE4_32H 0x0013A200
-#define BASE4_32L 0x40CACD61
+#define BASE11_32H 0x0013A200
+#define BASE11_32L 0x40CACD61
  
 //BASE 12
-#define BASE5_32H 0x0013A200
-#define BASE5_32L 0x40CACD5B
+#define BASE12_32H 0x0013A200
+#define BASE12_32L 0x40CACD5B
 
 
 ////////////////
@@ -132,9 +131,8 @@
 /////////////////////////////////////////
 XBeeAddress64 base_Address[BASE_NUM] = {XBeeAddress64(BASE1_32H,BASE1_32L), XBeeAddress64(BASE2_32H,BASE2_32L), 
                                  XBeeAddress64(BASE3_32H,BASE3_32L), XBeeAddress64(BASE4_32H,BASE4_32L),};
-XBeeAddress64 robot_Address[PAN_NUM] = {XBeeAddress64(PAN1_32H,PAN1_32L), XBeeAddress64(PAN2_32H,PAN2_32L),
-                                 XBeeAddress64(PAN3_32H,PAN3_32L)};
-XBeeAddress64 manager_Address[MANAGER_NUM] = XBeeAddress64(MANAGER_32H, MANAGER_32L);
-
+XBeeAddress64 robot_Address[PAN_NUM] = {XBeeAddress64(PAN1_R1_SH,PAN1_R1_SL), XBeeAddress64(PAN1_R2_SH,PAN1_R2_SL),
+                                 XBeeAddress64(PAN1_R3_SH,PAN1_R3_SL)};
+XBeeAddress64 manager_Address = XBeeAddress64(MANAGER_32H, MANAGER_32L);
 
 //AigamoRobots
\ No newline at end of file