M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

ad53xx/zotino: do not clear power down on overtemp

This commit is contained in:
Robert Jördens 2018-06-01 13:17:13 +00:00
parent 2c344686d9
commit 5de2d06568
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artiq/coredevice/ad53xx.py
View File

@ -158,7 +158,6 @@ class AD53xx:
This method must be called before any other method at start-up or if This method must be called before any other method at start-up or if
the SPI bus has been accessed by another device. the SPI bus has been accessed by another device.
This method advances the timeline by several SPI transfers plus 10 µs.
:param blind: If ``True``, do not attempt to read back control register :param blind: If ``True``, do not attempt to read back control register
or check for overtemperature. or check for overtemperature.
@ -168,16 +167,18 @@ class AD53xx:
self.bus.set_config_mu(SPI_AD53XX_CONFIG, 24, self.div_write, self.bus.set_config_mu(SPI_AD53XX_CONFIG, 24, self.div_write,
self.chip_select) self.chip_select)
self.write_offset_dacs_mu(self.offset_dacs) self.write_offset_dacs_mu(self.offset_dacs)
self.bus.write( # enable overtemperature shutdown if not blind:
ctrl = self.read_reg(channel=0, op=AD53XX_READ_CONTROL)
if ctrl & 0b10000:
raise ValueError("DAC over temperature")
delay(10*us)
self.bus.write( # enable power and overtemperature shutdown
(AD53XX_CMD_SPECIAL | AD53XX_SPECIAL_CONTROL | 0b0010) << 8) (AD53XX_CMD_SPECIAL | AD53XX_SPECIAL_CONTROL | 0b0010) << 8)
if blind: if not blind:
return ctrl = self.read_reg(channel=0, op=AD53XX_READ_CONTROL)
ctrl = self.read_reg(channel=0, op=AD53XX_READ_CONTROL) if ctrl != 0b0010:
if ctrl & 0b10000: raise ValueError("DAC CONTROL readback mismatch")
raise ValueError("DAC over temperature") delay(10*us)
if ctrl != 0b0010:
raise ValueError("DAC CONTROL readback mismatch")
delay(10*us)
@kernel @kernel
def read_reg(self, channel=0, op=AD53XX_READ_X1A): def read_reg(self, channel=0, op=AD53XX_READ_X1A):