clean up tProc v2 internal/external code a bit

Author: meeg

qick_lib/qick/drivers/tproc.py

@@ -507,15 +507,8 @@ def time_update(self):
         self.logger.info('TIME_UPDATE')
         self.tproc_ctrl      = 2
     def start(self):
-        """
-        If tProc is configured for internal start, start the tProc.
-        If configured for external start, do nothing.
-        """
-        if self.tproc_cfg & (1 << 10):
-            pass
-        else:
-            self.logger.info('PROCESSOR_START')
-            self.tproc_ctrl      = 4
+        self.logger.info('PROCESSOR_START')
+        self.tproc_ctrl      = 4
     def stop(self):
         self.logger.info('PROCESSOR_STOP')
         self.tproc_ctrl      = 8
@@ -568,6 +561,11 @@ def start_src(self, src):
             self.tproc_cfg |=  (1 << 10)
         else:
             raise RuntimeError("start_src must be internal or external, got %s"%(src))
+    def get_start_src(self):
+        if self.tproc_cfg & (1 << 10):
+            return 'external'
+        else:
+            return 'internal'
 
     def __str__(self):
         lines = []

qick_lib/qick/qick.py

@@ -1446,10 +1446,13 @@ def start_tproc(self):
         """
         Start the tProc.
         """
-        if self.TPROC_VERSION == 2:
+        if self.TPROC_VERSION == 1:
+            self.tproc.start()
+        elif self.TPROC_VERSION == 2:
             # reset all registers (importantly, this zeroes the counters to distinguish "program waiting for external start" from "program complete")
             self.tproc.reset()
-        self.tproc.start()
+            if self.tproc.get_start_src() == 'internal':
+                self.tproc.start()
 
     def stop_tproc(self, lazy=False):
         """