Merge branch 'master' into cocotb-update

Author: sdmurthy

board_support/zest/llspi_ad9653.py

@@ -92,7 +92,7 @@ def spi_readn(self, obj_list, addr):
     if leep_addr is None:
         leep_addr = "leep://" + str(ip_addr)
 
-    leep = leep.open(leep_addr, timeout=2.0, instance=[])
+    leep = leep.open(leep_addr, timeout=5.0, instance=[])
     leepll = leep_llspi(leep)  # temporary(?) stand-in for c_zest
     U2_adc_spi = c_llspi_ad9653(2)
 

board_support/zest/zest_setup.py

@@ -1042,7 +1042,7 @@ def amc7823_print(self, check_channels=[]):
                         help='Run MMCM scan')
     parser.add_argument('--strict', action='store_true', dest='strict', default=False,
                         help='Strict checks on test results')
-    parser.add_argument('-t', '--timeout', type=float, default=0.1,
+    parser.add_argument('-t', '--timeout', type=float, default=5.0,
                         help='LEEP network timeout')
     parser.add_argument('-f', '--ref_freq', dest='ref_freq', default=50., type=float,
                         help='Reference oscillator (in MHz)')

projects/common/get_raw_adcs.py

@@ -270,7 +270,7 @@ def usage():
                         help='Number of acquisitions')
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', default=False,
                         help='Verbose mode')
-    parser.add_argument('-t', '--timeout', type=float, default=0.1,
+    parser.add_argument('-t', '--timeout', type=float, default=5.0,
                         help='LEEP network timeout')
 
     args = parser.parse_args()

projects/test_marble_family/badger_stat.py

@@ -47,7 +47,7 @@ def update(dev):
     print("Packet badger stats from", leep_addr)
 
     try:
-        dev = leep.open(leep_addr)
+        dev = leep.open(leep_addr, timeout=5.0)
     except OSError as err:
         print("Leep initialization error:", err)
         sys.exit(1)

projects/test_marble_family/config_si570.py

@@ -292,7 +292,7 @@ def config_si570(addr, new_freq, verbose=False, debug=False):
     leep_addr = "leep://" + str(args.addr) + str(":") + str(args.port)
     print(leep_addr)
 
-    addr = leep.open(leep_addr, instance=[])
+    addr = leep.open(leep_addr, timeout=5.0, instance=[])
 
     # dev = lbus_access.lbus_access(args.addr, port=args.port, timeout=3.0, allow_burst=False)
 

projects/test_marble_family/ctrace_dump_gps.py

@@ -144,7 +144,7 @@ def usage():
         print("must supply IP address")
         exit(1)
     leep_addr = "leep://" + ip_addr + ":" + str(port)
-    fpga = leep.open(leep_addr)
+    fpga = leep.open(leep_addr, timeout=5.0)
     # signals, tw, tstep should be runtime config
     # this static configuration matches GPS_CTRACE option in lb_marble_slave.v
     signals = ["pps", "uart"]

projects/test_marble_family/i2c/oneshot.py

@@ -71,7 +71,7 @@ def decode(prog):
 
 def decodeI2CProgram(args):
     """Readout current I2C program and decode"""
-    dev = leep.open(args.dest)
+    dev = leep.open(args.dest, timeout=5.0)
     # Read program memory
     name_sizes = ((I2C_PROG[0], 0x400, I2C_PROG[1]),)  # (name, size, offset)
     prog = dev.reg_read_size(name_sizes)[0]
@@ -189,7 +189,7 @@ def doI2CXact(args):
     if args.dest == "test":
         print("Test done.")
         return 0
-    dev = leep.open(args.dest)
+    dev = leep.open(args.dest, timeout=5.0)
     stop(dev)
     program(dev, prog)
     run(dev)

projects/test_marble_family/i2c_live.py

@@ -7,7 +7,7 @@
 
 
 class i2c_live:
-    def __init__(self, host, timeout=1.02, port=803,
+    def __init__(self, host, timeout=5.0, port=803,
                  retry=120, sim=False, i2c_base=0x040000,
                  force_burst=False, allow_burst=True):
         self.dev = lbus_access.lbus_access(

projects/test_marble_family/nmea_view.py

@@ -160,7 +160,7 @@ def live_buffer(leep_dev, old_cnt, verbose=False):
     if not args.test:
         leep_addr = "leep://" + args.addr + ":" + str(args.port)
         try:
-            leep_dev = leep.open(leep_addr)
+            leep_dev = leep.open(leep_addr, timeout=5.0)
         except OSError as err:
             print("Leep initialization error:", err)
             sys.exit(1)

projects/test_marble_family/zest_auto_sn.py

@@ -87,7 +87,7 @@ def get_qrcode(results):
         exit(0)
     leep_addr = "leep://" + args.addr + ":" + str(args.port)
     # print(leep_addr)
-    dev = leep.open(leep_addr)
+    dev = leep.open(leep_addr, timeout=5.0)
     if args.write:
         old_sn = run_eeprom(dev, ss)
         print("Previous SN : %s" % old_sn)