WIP

diff --git a/python-lib/calibrate.py b/python-lib/calibrate.py
index 7e49ff554b5cd2568cd7dc9820a2c223fce3e70c..2158b53c4c509b5c5a787c2d6e1fe5e0fe265f86 100644 (file)
--- a/python-lib/calibrate.py
+++ b/python-lib/calibrate.py
@@ -12,7 +12,7 @@ adc.channelGain(4, 1)
 adc.channelGain(5, 1)
 adc.mux(4)
 
-mux.otaA.mode = mux.otaA.CAL_CMP
+mux.otaA.mode = mux.otaA.CAL_BUF
 mux.otaB.mode = mux.otaB.CAL_CMP
 mux.write()
 
@@ -29,5 +29,15 @@ def mux_a_offset(x):
         print offset2signed(adc.read(), 16)
         sleep(0.1)
 
+def mux_b_offset(x):
+    mux.otaB.offset = x
+    mux.write()
+    for i in range(10):
+        print offset2signed(adc.read(), 16)
+        sleep(0.1)
+
+print 'Calibrating mux otaA'
+bisect(mux_a_offset, [-128, 127])
 
+print 'Calibrating mux otaB'
 bisect(mux_a_offset, [-128, 127])

diff --git a/python-lib/usbio.py b/python-lib/usbio.py
index 98517ee27df31b6c54227e45b4af84ddbf8b1985..96f9b86dffa18e4feb775bbbf9235eb3ec24bf31 100644 (file)
--- a/python-lib/usbio.py
+++ b/python-lib/usbio.py
@@ -867,9 +867,10 @@ class DAC8568(object):
 
     def send(self):
         self.bus.SetCS('dac')
-        self.bus.Start()
-        self.bus.Write(str(self))
-        self.bus.Stop()
+        #self.bus.Start()
+        #self.bus.Write(str(self))
+        #self.bus.Stop()
+        self.bus.Exchange(str(self))
 
     #
     # internal functions to help construct a command
@@ -1082,9 +1083,9 @@ class ADS8201(object):
         # TODO: also optionally read 4 TAG bits
         w = intbv(0x0000)[16:]
         self.bus.SetCS('adc')
-        self.bus.Start()
+        #self.bus.Start()
         rval = self.bus.Exchange(int2str(w, 16))
-        self.bus.Stop()
+        #self.bus.Stop()
         i = 8 * (len(rval)-1)
         r = 0
         for c in rval: