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

dds: all working

This commit is contained in:
Sebastien Bourdeauducq 2015-06-20 18:42:39 -06:00
parent c8fba45db5
commit 87ea1433d3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/dds.py
View File

@ -117,4 +117,4 @@ class DDS(AutoDB):
syscall("dds_set", time_to_cycles(now()), self.channel, syscall("dds_set", time_to_cycles(now()), self.channel,
self.frequency_to_ftw(frequency), round(phase_offset*2**14), self.frequency_to_ftw(frequency), round(phase_offset*2**14),
self.phase_mode) phase_mode)

15
soc/runtime/dds.c
View File

@ -3,9 +3,10 @@
#include "exceptions.h" #include "exceptions.h"
#include "rtio.h" #include "rtio.h"
#include "log.h"
#include "dds.h" #include "dds.h"
#define DURATION_WRITE 5 #define DURATION_WRITE (5 << RTIO_FINE_TS_WIDTH)
#define DURATION_INIT (7*DURATION_WRITE) /* not counting FUD */ #define DURATION_INIT (7*DURATION_WRITE) /* not counting FUD */
#define DURATION_PROGRAM (8*DURATION_WRITE) /* not counting FUD */ #define DURATION_PROGRAM (8*DURATION_WRITE) /* not counting FUD */
@ -50,9 +51,17 @@ void dds_init(long long int timestamp, int channel)
DDS_WRITE(DDS_FUD, 0); DDS_WRITE(DDS_FUD, 0);
} }
static void dds_set_one(long long int now, long long int ref_time, int channel, /* Compensation to keep phase continuity when switching from absolute or tracking
* to continuous phase mode. */
static unsigned int continuous_phase_comp[DDS_CHANNEL_COUNT];
static void dds_set_one(long long int now, long long int ref_time, unsigned int channel,
unsigned int ftw, unsigned int pow, int phase_mode) unsigned int ftw, unsigned int pow, int phase_mode)
{ {
if(channel >= DDS_CHANNEL_COUNT) {
log("Attempted to set invalid DDS channel");
return;
}
DDS_WRITE(DDS_GPIO, channel); DDS_WRITE(DDS_GPIO, channel);
DDS_WRITE(DDS_FTW0, ftw & 0xff); DDS_WRITE(DDS_FTW0, ftw & 0xff);
@ -66,6 +75,7 @@ static void dds_set_one(long long int now, long long int ref_time, int channel,
if(phase_mode == PHASE_MODE_CONTINUOUS) { if(phase_mode == PHASE_MODE_CONTINUOUS) {
/* Do not clear phase accumulator on FUD */ /* Do not clear phase accumulator on FUD */
DDS_WRITE(0x02, 0x00); DDS_WRITE(0x02, 0x00);
pow += continuous_phase_comp[channel];
} else { } else {
long long int fud_time; long long int fud_time;
@ -75,6 +85,7 @@ static void dds_set_one(long long int now, long long int ref_time, int channel,
pow -= (ref_time - fud_time)*DDS_RTIO_CLK_RATIO*ftw >> 18; pow -= (ref_time - fud_time)*DDS_RTIO_CLK_RATIO*ftw >> 18;
if(phase_mode == PHASE_MODE_TRACKING) if(phase_mode == PHASE_MODE_TRACKING)
pow += ref_time*DDS_RTIO_CLK_RATIO*ftw >> 18; pow += ref_time*DDS_RTIO_CLK_RATIO*ftw >> 18;
continuous_phase_comp[channel] = pow;
} }
DDS_WRITE(DDS_POW0, pow & 0xff); DDS_WRITE(DDS_POW0, pow & 0xff);