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

dds: increase DAC calibration time

This commit is contained in:
Sebastien Bourdeauducq 2015-09-03 09:52:04 -06:00
parent 136d44d9db
commit 8253739992
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soc/runtime/dds.c
View File

@ -15,8 +15,8 @@
#elif defined DDS_AD9914
/* Assume 16-bit bus */
/* DAC calibration takes max. 135us as per datasheet. Take a good margin. */
#define DURATION_DAC_CAL (30000 << RTIO_FINE_TS_WIDTH)
/* DAC calibration takes max. 1ms as per datasheet */
#define DURATION_DAC_CAL (147000 << RTIO_FINE_TS_WIDTH)
/* not counting final FUD */
#define DURATION_INIT (10*DURATION_WRITE + DURATION_DAC_CAL)
#define DURATION_PROGRAM (5*DURATION_WRITE) /* not counting FUD */

2
soc/runtime/ksupport.c
View File

@ -79,7 +79,7 @@ long long int now_init(void)
if(now < 0) {
rtio_init();
now = rtio_get_counter() + (125000 << RTIO_FINE_TS_WIDTH);
now = rtio_get_counter() + (272000 << RTIO_FINE_TS_WIDTH);
}
return now;