Diff: agzIDLIST.h

Revision:

12:c42921f874ea

Parent:

10:47633a2fb0e4

Child:

14:52b48a35e01a

diff -r 47633a2fb0e4 -r c42921f874ea agzIDLIST.h
--- a/agzIDLIST.h	Thu May 14 10:00:16 2015 +0000
+++ b/agzIDLIST.h	Thu May 14 10:05:54 2015 +0000
@@ -5,7 +5,7 @@
 ////////////
 
 //BASE 1
-#define BASE1_NUM 5
+#define BASE1_NUM 4
 #define BASE1_32H 0x0013A200
 #define BASE1_32L 0x4099371F
  
@@ -53,12 +53,14 @@
 //BASE 12
 #define BASE5_32H 0x0013A200
 #define BASE5_32L 0x40CACD5B
+
+
 ////////////////
 //robot
 ////////////////
 
 //ROBOT 1
-#define ROBOT_NUM 3
+#define PAN_NUM 3
 #define PAN1_R1_SH 0x0013a200
 #define PAN1_R1_SL 0x40993787
 
@@ -114,6 +116,10 @@
 #define PAN1_R14_SH 0x0013a200
 #define PAN1_R14_SL 0x40993713
 
+//ROBOT 15
+#define PAN1_R15_SH 0x0013a200
+#define PAN1_R15_SL 0x40993717
+
 //MANAGER
 #define MANAGER_NUM 1
 #define MANAGER_32H 0x0013A200
@@ -126,10 +132,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[ROBOT_NUM] = {XBeeAddress64(ROBOT1_32H,ROBOT1_32L), XBeeAddress64(ROBOT2_32H,ROBOT2_32L),
-                                 XBeeAddress64(ROBOT3_32H,ROBOT3_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);
 
-
-
 //AigamoRobots
\ No newline at end of file