Diff: agzIDLIST.h

Revision:

18:2aefa61df88d

Parent:

15:0f026cfcf1bd

Child:

21:0aeb06ba8990

--- a/agzIDLIST.h	Thu May 14 12:06:47 2015 +0000
+++ b/agzIDLIST.h	Fri May 15 08:22:20 2015 +0000
@@ -5,7 +5,7 @@
 ////////////
 
 //BASE 1
-#define BASE_NUM 4
+#define BASE_NUM 12
 #define BASE1_32H 0x0013A200
 #define BASE1_32L 0x4099371F
  
@@ -59,65 +59,65 @@
 ////////////////
 
 //ROBOT 1
-#define PAN_NUM 3
-#define PAN1_R1_SH 0x0013a200
-#define PAN1_R1_SL 0x40993787
+#define PAN_NUM 15
+#define PAN1_SH 0x0013a200
+#define PAN1_SL 0x40993787
 
 //ROBOT 2
-#define PAN1_R2_SH 0x0013a200
-#define PAN1_R2_SL 0x4099371a
+#define PAN2_SH 0x0013a200
+#define PAN2_SL 0x4099371a
 
 //ROBOT 3
-#define PAN1_R3_SH 0x0013a200
-#define PAN1_R3_SL 0x409936ff
+#define PAN3_SH 0x0013a200
+#define PAN3_SL 0x409936ff
 
 //ROBOT 4
-#define PAN1_R4_SH 0x0013a200
-#define PAN1_R4_SL 0x40993704
+#define PAN4_SH 0x0013a200
+#define PAN4_SL 0x40993704
 
 //ROBOT 5
-#define PAN1_R5_SH 0x0013a200
-#define PAN1_R5_SL 0x409eaef7
+#define PAN5_SH 0x0013a200
+#define PAN5_SL 0x409eaef7
 
 //ROBOT 6
-#define PAN1_R6_SH 0x0013a200
-#define PAN1_R6_SL 0x40993703
+#define PAN6_SH 0x0013a200
+#define PAN6_SL 0x40993703
 
 //ROBOT 7
-#define PAN1_R7_SH 0x0013a200
-#define PAN1_R7_SL 0x40993701
+#define PAN7_SH 0x0013a200
+#define PAN7_SL 0x40993701
 
 //ROBOT 8
-#define PAN1_R8_SH 0x0013a200
-#define PAN1_R8_SL 0x40993716
+#define PAN8_SH 0x0013a200
+#define PAN8_SL 0x40993716
 
 //ROBOT 9 
-#define PAN1_R9_SH 0x0013a200
-#define PAN1_R9_SL 0x40993715
+#define PAN9_SH 0x0013a200
+#define PAN9_SL 0x40993715
 
 //ROBOT 10
-#define PAN1_R10_SH 0x0013a200
-#define PAN1_R10_SL 0x40993708
+#define PAN10_SH 0x0013a200
+#define PAN10_SL 0x40993708
 
 //ROBOT 11
-#define PAN1_R11_SH 0x0013a200
-#define PAN1_R11_SL 0x4099377a
+#define PAN11_SH 0x0013a200
+#define PAN11_SL 0x4099377a
 
 //ROBOT 12
-#define PAN1_R12_SH 0x0013a200
-#define PAN1_R12_SL 0x40993707
+#define PAN12_SH 0x0013a200
+#define PAN12_SL 0x40993707
 
 //ROBOT 13
-#define PAN1_R13_SH 0x0013a200
-#define PAN1_R13_SL 0x40993709
+#define PAN13_SH 0x0013a200
+#define PAN13_SL 0x40993709
 
 //ROBOT 14
-#define PAN1_R14_SH 0x0013a200
-#define PAN1_R14_SL 0x40993713
+#define PAN14_SH 0x0013a200
+#define PAN14_SL 0x40993713
 
 //ROBOT 15
-#define PAN1_R15_SH 0x0013a200
-#define PAN1_R15_SL 0x40993717
+#define PAN15_SH 0x0013a200
+#define PAN15_SL 0x40993717
 
 //MANAGER
 #define MANAGER_NUM 1
@@ -130,9 +130,19 @@
 //
 /////////////////////////////////////////
 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_R1_SH,PAN1_R1_SL), XBeeAddress64(PAN1_R2_SH,PAN1_R2_SL),
-                                 XBeeAddress64(PAN1_R3_SH,PAN1_R3_SL)};
+                                 XBeeAddress64(BASE3_32H,BASE3_32L), XBeeAddress64(BASE4_32H,BASE4_32L),
+                                 XBeeAddress64(BASE5_32H,BASE5_32L), XBeeAddress64(BASE6_32H,BASE6_32L), 
+                                 XBeeAddress64(BASE7_32H,BASE7_32L), XBeeAddress64(BASE8_32H,BASE8_32L),
+                                 XBeeAddress64(BASE9_32H,BASE9_32L), XBeeAddress64(BASE10_32H,BASE10_32L), 
+                                 XBeeAddress64(BASE11_32H,BASE11_32L), XBeeAddress64(BASE12_32H,BASE12_32L)};
+XBeeAddress64 robot_Address[PAN_NUM] = {XBeeAddress64(PAN1_SH,PAN1_SL), XBeeAddress64(PAN2_SH,PAN2_SL),
+                                 XBeeAddress64(PAN3_SH,PAN3_SL), XBeeAddress64(PAN4_SH,PAN4_SL), 
+                                 XBeeAddress64(PAN5_SH,PAN5_SL),XBeeAddress64(PAN6_SH,PAN6_SL),
+                                 XBeeAddress64(PAN7_SH,PAN7_SL), XBeeAddress64(PAN8_SH,PAN8_SL),
+                                 XBeeAddress64(PAN9_SH,PAN9_SL), XBeeAddress64(PAN10_SH,PAN10_SL), 
+                                 XBeeAddress64(PAN11_SH,PAN11_SL),XBeeAddress64(PAN12_SH,PAN12_SL),
+                                 XBeeAddress64(PAN13_SH,PAN13_SL), XBeeAddress64(PAN14_SH,PAN14_SL),
+                                 XBeeAddress64(PAN15_SH,PAN15_SL)};
 XBeeAddress64 manager_Address = XBeeAddress64(MANAGER_32H, MANAGER_32L);
 
-//AigamoRobots
\ No newline at end of file
+//AigamoRobots