srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

re-impl ADC using general access methods

This commit is contained in:
occheung 2023-09-18 19:56:21 -07:00 committed by Sébastien Bourdeauducq
parent 9e1447d104
commit f2694f25eb
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artiq/coredevice/shuttler.py
View File

@ -183,6 +183,20 @@ class ADC:
@kernel @kernel
def read_id(self) -> TInt32: def read_id(self) -> TInt32:
return self.read16(_AD4115_REG_ID)
@kernel
def reset(self):
# Hold DIN high for 64 cycles
# However, asserting CS right after the 64 cycles seems to interrupt
# the start-up sequence.
self.bus.set_config_mu(ADC_SPI_CONFIG, 32, SPIT_ADC_WR, CS_ADC)
self.bus.write(0xffffffff)
self.bus.write(0xffffffff)
self.bus.set_config_mu(
ADC_SPI_CONFIG | spi.SPI_END, 32, SPIT_ADC_WR, CS_ADC)
self.bus.write(0xffffffff)
@kernel @kernel
def read8(self, addr: TInt32) -> TInt32: def read8(self, addr: TInt32) -> TInt32:
self.bus.set_config_mu( self.bus.set_config_mu(
@ -225,6 +239,13 @@ class ADC:
ADC_SPI_CONFIG | spi.SPI_END, 32, SPIT_ADC_WR, CS_ADC) ADC_SPI_CONFIG | spi.SPI_END, 32, SPIT_ADC_WR, CS_ADC)
self.bus.write(addr << 24 | (data & 0xffffff)) self.bus.write(addr << 24 | (data & 0xffffff))
@kernel
def read_ch(self, channel: TInt32) -> TFloat:
# Always configure Profile 0 for single conversion
self.write16(_AD4115_REG_CH0, 0x8000 | ((channel * 2 + 1) << 4))
self.write16(_AD4115_REG_SETUPCON0, 0x1300)
self.write16(_AD4115_REG_ADCMODE, 0x8010)
delay(100*us) delay(100*us)
adc_code = self.read24(_AD4115_REG_DATA) adc_code = self.read24(_AD4115_REG_DATA)
return ((adc_code / (1 << 23)) - 1) * 2.5 / 0.1 return ((adc_code / (1 << 23)) - 1) * 2.5 / 0.1