# SVN changeset patch
# User imanay
# Date 2013-05-02 20:51:58.890000
# Revision 147

ABS Monitoring changes

Index: trunk/absroot/source/abspy/abscontrol/client3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/client3.py b/trunk/absroot/source/abspy/abscontrol/client3.py
--- a/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 146)
+++ b/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 147)
@@ -69,9 +69,16 @@
         data = self.__ConnectionWithCentralControl(cmd = "ANST", data = data)
         self.__writeFile("report.txt", data)
 
-    def getControlModulePhase(self, data):
+    def getControlModulePhase(self, opt, u = "50", pw = "10"):
 
-        data = self.__ConnectionWithCentralControl(cmd = "ANPH", data = data)
+        if opt == '0':
+            data = self.__ConnectionWithCentralControl(cmd = "LWPH", data = u + '/' + pw + '/')
+        elif opt ==  '1':
+            data = self.__ConnectionWithCentralControl(cmd = "BGPH", data = u + '/' + pw + '/')
+        elif opt == '2':
+            data = self.__ConnectionWithCentralControl(cmd = "cBPH", data = u + '/' + pw + '/')
+        else:
+            data = self.__ConnectionWithCentralControl(cmd = "cLPH", data = u + '/' + pw + '/')
 #        self.__writeFile("report.txt", data)
     
     def getConnectionStatus(self):
Index: trunk/absroot/source/abspy/abscontrol/server3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/server3.py b/trunk/absroot/source/abspy/abscontrol/server3.py
--- a/trunk/absroot/source/abspy/abscontrol/server3.py	(revision 146)
+++ b/trunk/absroot/source/abspy/abscontrol/server3.py	(revision 147)
@@ -43,11 +43,16 @@
             #Using tx buffer
             datarpta = self.tx_buffer
 
-        if cmd == "ANPH":
-            self.__getControlModulePhase(cmd = cmd)
+        if cmd == "BGPH":
+            self.__getControlModuleBigPhase(cmd = cmd)
             #Using tx buffer
             datarpta = self.tx_buffer
-            
+
+        if cmd == "LWPH":
+            self.__getControlModuleLowPhase(cmd = cmd)
+            #Using tx buffer
+            datarpta = self.tx_buffer
+                        
         if cmd == "NTST":
             #Using tx buffer
             datarpta =  self.__getConnectionStatus(cmd = cmd)
@@ -206,7 +211,24 @@
         print all_blocks
         self.tx_buffer = all_blocks
         
-    def __getControlModulePhase(self, cmd):
+    def __getControlModuleBigPhase(self, cmd):
+
+        all_blocks = ""
+#        enaModules = self.checkAntenna()
+#        enaModules = [11,12,13,14]
+        
+        for id in range(1,65):
+            if id not in self.enaModules:
+                continue
+            
+            one_block = self.__ConnectionWithControlModules(self.rx_buffer,cmd,id)
+        
+            all_blocks = all_blocks + one_block
+        #Using tx buffer
+        print all_blocks
+        self.tx_buffer = all_blocks
+
+    def __getControlModuleLowPhase(self, cmd):
 
         all_blocks = ""
 #        enaModules = self.checkAntenna()