From 6a6695924fb4dc4814f303774e1bad0db5bdc0e9 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 12 Feb 2018 17:40:33 +0000 Subject: [PATCH] urukul: proto 8 --- artiq/coredevice/urukul.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/artiq/coredevice/urukul.py b/artiq/coredevice/urukul.py index 3fb2527f3..8532ab8b6 100644 --- a/artiq/coredevice/urukul.py +++ b/artiq/coredevice/urukul.py @@ -70,11 +70,11 @@ def urukul_sta_ifc_mode(sta): @kernel def urukul_sta_proto_rev(sta): - return (sta >> STA_PROTO_REV) & 0xff + return (sta >> STA_PROTO_REV) & 0x7f # supported hardware and CPLD code version -STA_PROTO_REV_MATCH = 0x07 +STA_PROTO_REV_MATCH = 0x08 # chip select (decoded) CS_CFG = 1 @@ -112,7 +112,6 @@ class CPLD: @kernel def sta_read(self): - self.cfg_write(self.cfg_reg) # to latch STA self.bus.set_config_mu(_SPI_CONFIG, _SPIT_CFG_WR, _SPIT_CFG_RD) self.bus.set_xfer(CS_CFG, 0, 24) self.bus.write(self.cfg_reg << 8)