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

dds: improve error reporting

This commit is contained in:
Sebastien Bourdeauducq 2016-03-19 12:15:19 +08:00
parent d0af58d122
commit 641831e0e1
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/coredevice/exceptions.py
View File

@ -120,9 +120,10 @@ class RTIOOverflow(Exception):
""" """
artiq_builtin = True artiq_builtin = True
class DDSBatchError(Exception): class DDSError(Exception):
"""Raised when attempting to start a DDS batch while already in a batch, """Raised when attempting to start a DDS batch while already in a batch,
or when too many commands are batched. when too many commands are batched, and when DDS channel settings are
incorrect.
""" """
artiq_builtin = True artiq_builtin = True

19
artiq/runtime/dds.c
View File

@ -90,15 +90,12 @@ static void dds_set_one(long long int now, long long int ref_time,
{ {
unsigned int channel_enc; unsigned int channel_enc;
if((channel < 0) || (channel >= CONFIG_DDS_CHANNELS_PER_BUS)) { if((channel < 0) || (channel >= CONFIG_DDS_CHANNELS_PER_BUS))
core_log("Attempted to set invalid DDS channel\n"); artiq_raise_from_c("DDSError", "Attempted to set invalid DDS channel", 0, 0, 0);
return;
}
if((bus_channel < CONFIG_RTIO_FIRST_DDS_CHANNEL) if((bus_channel < CONFIG_RTIO_FIRST_DDS_CHANNEL)
|| (bus_channel >= (CONFIG_RTIO_FIRST_DDS_CHANNEL+CONFIG_RTIO_DDS_COUNT))) { || (bus_channel >= (CONFIG_RTIO_FIRST_DDS_CHANNEL+CONFIG_RTIO_DDS_COUNT)))
core_log("Attempted to use invalid DDS bus\n"); artiq_raise_from_c("DDSError", "Attempted to use invalid DDS bus", 0, 0, 0);
return;
}
#ifdef CONFIG_DDS_ONEHOT_SEL #ifdef CONFIG_DDS_ONEHOT_SEL
channel_enc = 1 << channel; channel_enc = 1 << channel;
#else #else
@ -179,7 +176,7 @@ static struct dds_set_params batch[DDS_MAX_BATCH];
void dds_batch_enter(long long int timestamp) void dds_batch_enter(long long int timestamp)
{ {
if(batch_mode) if(batch_mode)
artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0); artiq_raise_from_c("DDSError", "DDS batch entered twice", 0, 0, 0);
batch_mode = 1; batch_mode = 1;
batch_count = 0; batch_count = 0;
batch_ref_time = timestamp; batch_ref_time = timestamp;
@ -191,7 +188,7 @@ void dds_batch_exit(void)
int i; int i;
if(!batch_mode) if(!batch_mode)
artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0); artiq_raise_from_c("DDSError", "DDS batch exited twice", 0, 0, 0);
batch_mode = 0; batch_mode = 0;
/* + FUD time */ /* + FUD time */
now = batch_ref_time - batch_count*(DURATION_PROGRAM + DURATION_WRITE); now = batch_ref_time - batch_count*(DURATION_PROGRAM + DURATION_WRITE);
@ -209,7 +206,7 @@ void dds_set(long long int timestamp, int bus_channel, int channel,
{ {
if(batch_mode) { if(batch_mode) {
if(batch_count >= DDS_MAX_BATCH) if(batch_count >= DDS_MAX_BATCH)
artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0); artiq_raise_from_c("DDSError", "Too many commands in DDS batch", 0, 0, 0);
/* timestamp parameter ignored (determined by batch) */ /* timestamp parameter ignored (determined by batch) */
batch[batch_count].bus_channel = bus_channel; batch[batch_count].bus_channel = bus_channel;
batch[batch_count].channel = channel; batch[batch_count].channel = channel;