on the fly

frappy_psi/capacitance_readings/TSSOP16.py

@@ -1,17 +1,19 @@
 import serial
+import time
+import traceback
 
 from frappy.core import Readable, Parameter, FloatRange, HasIO, StringIO, Property, IntRange, IDLE, BUSY, WARN, ERROR, Drivable, BoolType, Attached
 
 class TSSOP16_IO(StringIO):
     end_of_line = '\r'
-    wait_before = 3.0
+    wait_before = 0.0 #3.0
     identification = [ ('*IDN?', r'0x48,ACM1219,.*') ]
     
 class TSSOP16(HasIO, Readable):
     '''only configured for channel 1'''
     
     ioClass = TSSOP16_IO
-    value = Parameter('capacitance', FloatRange(unit='pF'), readonly=True)
+    value = Parameter('value', FloatRange(unit='pF'), readonly=True)
     pollinterval = Parameter(default=0.1)
     
     def read_value(self):
@@ -19,8 +21,10 @@ class TSSOP16(HasIO, Readable):
             l = self.communicate('readCVT')
             vals = l.split(',')
             vals = [ float(v) for v in vals ]
+            #print(vals)
             return vals[0]
         except:
+            traceback.print_exc()
             self.io.closeConnection()
             self.io.connectStart()
             time.sleep(3.0)

frappy_psi/network_analysers/ZVL/ZVLDriver.py

@@ -31,7 +31,8 @@ class ZVLNetAnalyzer():
         self.base_data = self.get_data()[1]
         
     def reset(self):
-        self.instrument.write('*RST')
+        #self.instrument.write('*RST')
+        #self.instrument.write('SYST:PRES') # reloads current setup.
         self.instrument.write('*CLS')
         self.instrument.write('INST:NSEL 2')
         self.instrument.write('DISPlay:WINDow1:STATe ON')
@@ -112,7 +113,10 @@ class ZVLNetAnalyzer():
                 
                 data = self.format_data(data)
                 freqs = self.format_data(freqs, complex=False)
-                total_data += data
+                try:
+                    total_data += data
+                except:
+                    total_data = data
             total_data /= averaging_passes
         
         self.base_data = data

frappy_psi/network_analysers/ZVL/ZVLNode.py

@@ -36,7 +36,8 @@ class ZVLNode(fc.Readable):
         self.NA = ZVLNetAnalyzer(self.analyser_ip)
         self.NA.reset()
         self.acq()
-        
+
+    @fc.Command(description="Update data") 
     def acq(self):
         self.status = ('BUSY', 'acquiring')
         self.NA.set_freq_span(self.central_freq, self.freq_span)
@@ -56,4 +57,8 @@ class ZVLNode(fc.Readable):
     def write_analyser_ip(self, ip):
         self.analyser_ip = ip
         self.connect()
-        return self.read_analyser_ip()
+        return self.read_analyser_ip()
+
+    def read_value(self):
+        #self.acq()
+        return self.value

frappy_psi/tnmr/tnmr_interface.py

@@ -178,6 +178,7 @@ class TNMR:
             print('ZG completed')
         else:
             print('An acquisition is already running')
+            return
 
         if(CHECK_MODE == 'data'):
             elapsed = 0