Add get_prgm_counter

Author: Myles Metzler

chamberconnectlibrary/controllerinterface.py

@@ -9,6 +9,7 @@
 from threading import RLock
 import traceback
 import time
+import inspect
 
 class ControllerInterfaceError(Exception):
     '''Exception that is thrown when a there is a problem communicating with a controller'''
@@ -330,7 +331,8 @@ def get_operation(self, pgm=None):
                 'time_remaining':self.get_prgm_time(pgm, exclusive=False),
                 'step_time_remaining':self.get_prgm_cstime(exclusive=False),
                 'name':self.get_prgm_name(pnum, exclusive=False),
-                'steps':self.get_prgm_steps(pnum, exclusive=False)
+                'steps':self.get_prgm_steps(pnum, exclusive=False),
+                'cycles':self.get_prgm_counter(exclusive=False)
             }
         else:
             ret['program'] = None
@@ -888,6 +890,16 @@ def prgm_next_step(self):
         '''
         pass
 
+    @abstractmethod
+    def get_prgm_counter(self):
+        '''
+        Get the status of the jump step/counter
+
+        Returns:
+            [{'name':str, 'start':int, 'end':int, 'cycles':int, 'remaining':int}]
+        '''
+        pass
+
     @abstractmethod
     def get_prgm_cur(self):
         '''

chamberconnectlibrary/espec.py

@@ -526,6 +526,19 @@ def prgm_resume(self):
     def prgm_next_step(self):
         self.client.write_prgm_advance()
 
+    @exclusive
+    def get_prgm_counter(self):
+        prgm_set = self.client.read_prgm_set()
+        prgm_data = self.client.read_prgm_data(prgm_set['number'])
+        prgm_mon = self.client.read_prgm_mon()
+        ret = [
+            {'name':'A', 'remaining': prgm_mon['counter_a']},
+            {'name':'B', 'remaining': prgm_mon['counter_b']},
+        ]
+        ret[0].update(prgm_data['counter_a'])
+        ret[1].update(prgm_data['counter_b'])
+        return ret
+
     @exclusive
     def get_prgm_cur(self):
         return self.cached(self.client.read_prgm_set)['number']

chamberconnectlibrary/watlowf4.py

@@ -589,6 +589,24 @@ def prgm_pause(self):
     def prgm_resume(self):
         self.client.write_holding(1209, 1)
 
+    @exclusive
+    def get_prgm_counter(self):
+        status = self.client.read_holding(4126, 3) #count, profile, step
+        if status[1] > 0:
+            return []
+        else:
+            self.client.write_holding(4000, status[1:])
+            prof = self.client.read_holding(4050, 3)
+            return [
+                {
+                    'name':str(status[0]),
+                    'start':prof[1],
+                    'end':status[2],
+                    'cycles':int,
+                    'remaining':prof[2]-status[0]
+                }
+            ]
+
     @exclusive
     def prgm_next_step(self):
         program = self.get_prgm_cur(exclusive=False)

chamberconnectlibrary/watlowf4t.py

@@ -616,6 +616,10 @@ def prgm_next_step(self):
         time.sleep(1)
         self.prgm_start(program, nextstep, exclusive=False)
 
+    @exclusive
+    def get_prgm_counter(self):
+        return []
+
     @exclusive
     def get_prgm_cur(self):
         return self.client.read_holding(16588, 1)[0]