More numpy print updates to board_support/zest

Author: sdmurthy

board_support/zest/ad7794.py

@@ -90,6 +90,7 @@ def configuration_register(self, chan):
         return val | 0x0000ff
 
     def conv_volt(self, readout, chan):
+        readout = int(readout)
         vref = 0.0
         if chan == 6 or self.REFSEL == 2:
             vref = 1.17

board_support/zest/zest_setup.py

@@ -158,7 +158,7 @@ def hardware_reset(self, injector=False):
             if not self.pntest4():
                 return False
         self.adc_twos_comp(twoscomp=True)
-        print('test pattern %s' % self.set_test_mode('00000000'))
+        print('test pattern %s' % [[int(item) for item in sublist] for sublist in self.set_test_mode('00000000') or []])
         if not self.amc7823_print(check_channels=[1, 2, 3, 4, 5, 6, 7]):
             return False
         return True
@@ -575,7 +575,7 @@ def find_best_idelay(self, ix, idelay_dict):
         return ix if False else self.top2idelay(lane, ix % 2)[0]
 
     def adc_idelay1(self, dbg1=0):
-        print('test pattern %s' % self.set_test_mode('00001100'))
+        print('test pattern %s' % [[int(item) for item in sublist] for sublist in self.set_test_mode('00001100') or []])
         print('Type 1 (firmware) idelay scan')
         if True:  # not needed after powerup, but will clear old values if re-scanning
             self.set_idelays(16*[0])
@@ -605,7 +605,7 @@ def adc_idelay1(self, dbg1=0):
         return all([2 == (x >> 5) for x in idelay_mirror])  # all channels scan success!
 
     def adc_idelay0(self):
-        print('test pattern %s' % self.set_test_mode('00001100'))
+        print('test pattern %s' % [[int(item) for item in sublist] for sublist in self.set_test_mode('00001100') or []])
         print('Type 0 (software) idelay scan')
         print("idelay  scan   " + "  ".join(self.chan_list))
         idelay_dict = {}
@@ -651,7 +651,7 @@ def adc_bufr_reset1(self, adc_values, name, adc, ic_reset, iserdes_reset):
         return success, adc_values
 
     def adc_bufr_reset(self):
-        print('test pattern %s' % self.set_test_mode('00001100'))
+        print('test pattern %s' % [[int(item) for item in sublist] for sublist in self.set_test_mode('00001100') or []])
         adc_values = self.adc_reg(verbose=True)
         print('0x%x %s %s' % (adc_values[0], adc_values[0] != 0x4339, adc_values[0] != 0xa19c))
         s1, adc_values = self.adc_bufr_reset1(
@@ -661,7 +661,9 @@ def adc_bufr_reset(self):
         return s1 and s2
 
     def adc_bitslip(self):
-        print('bitslip: test pattern %s' % self.set_test_mode('00001100'))
+        print('bitslip: test pattern %s' % [
+              [int(item) for item in sublist]
+              for sublist in self.set_test_mode('00001100') or []])
         index = 0
         bitslip = self.bitslip_calc()
         print(format(bitslip, '016b'))

projects/common/get_raw_adcs.py

@@ -68,7 +68,7 @@ def get_raw_adcs_run(dev, filewritepath='raw_adcs_', ext_trig=False, freq=7/33.0
             print("difference %6.2f" % diff1)
         if save_data is True:
             # ISO 8601  2016-06-02T16:06:14Z
-            datetimestr = datetime.datetime.utcnow().isoformat()+"Z "+str(timestamp)
+            datetimestr = datetime.datetime.now(datetime.UTC).isoformat().replace('+00:00', 'Z') + " " + str(timestamp)
             header = "\n".join([datetimestr, chan_txt])
 
             data_dir = start_time.strftime(filewritepath + '%Y%m%d_%H%M%S')