Update ADC testing to use new API

diff --git a/python-lib/mpsse-test.py b/python-lib/mpsse-test.py
index fd78f9b7a74669c523b3718a16d51af13e5772c4..bc31c8c7075bdc3c6999f788437a5a04e8f34475 100755 (executable)
--- a/python-lib/mpsse-test.py
+++ b/python-lib/mpsse-test.py
@@ -194,42 +194,46 @@ dac.vinb(0.9)
 dac.vina(1.1)
 
 #go to idle mode
-adc.setRegister(adc.TRIGGER_SCR, 0)
+adc.triggerMode(adc.MODE_IDLE)
 
-#no average, SPI convst
 #16x accurate average
-adc.setRegister(adc.ADC_SCR, 0b11100001)
+adc.average(16, True)
+
+# trigger conversion from SPI
+adc.convst_spi(1)
 
 # dac.vina --> adc.ch4
-adc.setRegister(adc.CHAN_SEL, 4)
+adc.mux(4)
 
 #ch4 setup
-adc.setRegister(adc.CH45_CCR, 0b00000000)
+adc.channelMode(4, adc.SE)
+adc.channelGain(4, 1)
 
 # go to mode 2 (full manual)
-adc.setRegister(adc.TRIGGER_SCR, 2)
+adc.triggerMode(adc.MODE_MANUAL_MANUAL)
 
 print adc.read()
 
 n = []
 r = []
-for i in range(2**16):
-    x = i
+for i in range(2**10):
+    x = 2**6 * i
     dac.set(0, x)
     adc.read() #sham to trigger conversion
     sleep(200e-6) #ensure 160us conversion time delay
     n.append(x)
     v = adc.read()
     r.append(v)
-    print i
-
-figure()
-plot(n, r)
-xlabel('DAC code')
-ylabel('ADC count')
-title('DAC_ch0 --> ADC_ch4 direct connection')
-savefig('dac-adc-loopback.pdf')
-show()
+    print x, v
+
+if 0:
+    figure()
+    plot(n, r)
+    xlabel('DAC code')
+    ylabel('ADC count')
+    title('DAC_ch0 --> ADC_ch4 direct connection')
+    savefig('dac-adc-loopback.pdf')
+    show()