fixup

diff --git a/python-lib/calibrate.py b/python-lib/calibrate.py
index 5497d49ddc60af6bc82267db84dd5f5b85bf9d44..a0ba2a1e25e643ae43d87eb1636aa72451891253 100644 (file)
--- a/python-lib/calibrate.py
+++ b/python-lib/calibrate.py
@@ -490,7 +490,6 @@ def calibrate(name, elements=None, verbose=True):
                 x0[j,i] = chain.h[i].ota[j].offset
         offsets, stats = secant_opt(func, x0, limits,
                 elements=elements, verbose=verbose)
-
     #
     # Main pad buffer + mux
     #
@@ -524,11 +523,10 @@ def calibrate(name, elements=None, verbose=True):
         for i,mode in enumerate(old_mode):
             mux.ota[i].mode = mode
         mux.write()
-
     #
     # Secondary arbitrary function, 16 channels
     #
-    if name == 'arb':
+    elif name == 'arb':
         N_CHANNELS = 16
         def func(values, converging):
             return arb_offsets(
@@ -544,7 +542,6 @@ def calibrate(name, elements=None, verbose=True):
                 x0[j,i] = arb.h[i].ota[j].offset
         offsets, stats = secant_opt(func, x0, limits,
                 elements=elements, verbose=verbose)
-
     #
     # Secondary pad buffer + mux
     #

diff --git a/python-lib/usbio.py b/python-lib/usbio.py
index 9559c00787b3a47de097ee4cf8d2da82b7bd1e01..f0fef97fec3f7ecd8b5e632ff8a3da907f613346 100644 (file)
--- a/python-lib/usbio.py
+++ b/python-lib/usbio.py
@@ -316,10 +316,13 @@ class I2C(object):
         self.port[reset_pin] = intbv(value, max=2**1)
         self.ftdi.write_data(self.context, chr(self.port), 1)
 
-    def NCO_CLK(self, value):
-        """Set pin connected to NCO_CLK line on devboard."""
+    def NCO_CLK(self, value=None):
+        """Set pin connected to NCO_CLK line on devboard.
+        Toggle if value is not given."""
         clk_pin = 7
-        self.port[clk_pin] = intbv(value, max=2**1)
+        if value is None:
+            value = not truth(self.port[clk_pin])
+        self.port[clk_pin] = truth(value)
         self.ftdi.write_data(self.context, chr(self.port), 1)
 
     def dump_config(self):