test41: Fix hex2signed function, selects right box output channel.

974e0152 · Matthieu Cattin · 652fe9d6 · 974e0152
Commit 974e0152 authored Apr 24, 2014 by Matthieu Cattin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

test41.py test/fmcadc100m14b4cha/python/test41.py +6 -2

No files found.
--- a/test/fmcadc100m14b4cha/python/test41.py
+++ b/test/fmcadc100m14b4cha/python/test41.py
@@ -88,9 +88,9 @@ def fmc_adc_init(spec, fmc):
 # Converts two's complement hex to signed
 def hex2signed(value):
    if(value & 0x8000):
-        return -((~value & 0xFFFC) + 1)
+        return -((~value & 0xFFFF) + 1)
    else:
-        return (value & 0xFFFC)
+        return (value & 0xFFFF)

 # Converts digital value to volts
 def digital2volt(value, full_scale, nb_bit):
@@ -325,6 +325,10 @@ def main (default_directory='.'):
        fmc.set_input_term(CHANNEL, IN_TERM)
        time.sleep(SSR_SET_SLEEP)

+        # connect AWG to current channel
+        box.select_output_ch(CHANNEL)
+        time.sleep(BOX_SET_SLEEP)
+
        ##################################################
        # Apply gain and offset correction
        ##################################################