X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=688dcc3998750909bbbe228c79590407faef8251;hb=4c5f70063ad6ae311809ee7818ddc9070fbe05cf;hp=16bfb478b8b5fe76f12d52ead869ad09a6dbbbcb;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c index 16bfb478..688dcc39 100644 --- a/src/hardware/rigol-ds/protocol.c +++ b/src/hardware/rigol-ds/protocol.c @@ -177,7 +177,7 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst *sdi) if (!(devc = sdi->priv)) return SR_ERR; - /* + /* * If timebase < 50 msecs/DIV just sleep about one sweep time except * for really fast sweeps. */ @@ -220,11 +220,19 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi) if (devc->model->series->protocol != PROTOCOL_V3) return SR_OK; - if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", - ch->index + 1) != SR_OK) - return SR_ERR; + if (ch->type == SR_CHANNEL_LOGIC) { + if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK) + return SR_ERR; + } else { + if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", + ch->index + 1) != SR_OK) + return SR_ERR; + } /* Check that the number of samples will be accepted */ - if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK) + if (rigol_ds_config_set(sdi, ":WAV:POIN %d", + ch->type == SR_CHANNEL_LOGIC ? + devc->digital_frame_size : + devc->analog_frame_size) != SR_OK) return SR_ERR; if (sr_scpi_get_int(sdi->conn, "*ESR?", &tmp) != SR_OK) return SR_ERR; @@ -325,12 +333,17 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi) struct dev_context *devc; gchar *trig_mode; unsigned int num_channels, i, j; + int buffer_samples; if (!(devc = sdi->priv)) return SR_ERR; - sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64, - devc->num_frames + 1, devc->limit_frames); + if (devc->limit_frames == 0) + sr_dbg("Starting data capture for frameset %" PRIu64, + devc->num_frames + 1); + else + sr_dbg("Starting data capture for frameset %" PRIu64 " of %" + PRIu64, devc->num_frames + 1, devc->limit_frames); switch (devc->model->series->protocol) { case PROTOCOL_V1: @@ -357,6 +370,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi) break; case PROTOCOL_V3: case PROTOCOL_V4: + case PROTOCOL_V5: if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK) return SR_ERR; if (devc->data_source == DATA_SOURCE_LIVE) { @@ -369,7 +383,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi) if (devc->model->series->protocol == PROTOCOL_V3) { if (rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK) return SR_ERR; - } else if (devc->model->series->protocol == PROTOCOL_V4) { + } else if (devc->model->series->protocol >= PROTOCOL_V4) { num_channels = 0; /* Channels 3 and 4 are multiplexed with D0-7 and D8-15 */ @@ -386,12 +400,29 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi) } } - devc->analog_frame_size = devc->digital_frame_size = - num_channels == 1 ? - devc->model->series->buffer_samples : - num_channels == 2 ? - devc->model->series->buffer_samples / 2 : - devc->model->series->buffer_samples / 4; + buffer_samples = devc->model->series->buffer_samples; + if (buffer_samples == 0) + { + /* The DS4000 series does not have a fixed memory depth, it + * can be chosen from the menu and also varies with number + * of active channels. Retrieve the actual number with the + * ACQ:MDEP command. */ + sr_scpi_get_int(sdi->conn, "ACQ:MDEP?", &buffer_samples); + devc->analog_frame_size = devc->digital_frame_size = + buffer_samples; + } + else + { + /* The DS1000Z series has a fixed memory depth which we + * need to divide correctly according to the number of + * active channels. */ + devc->analog_frame_size = devc->digital_frame_size = + num_channels == 1 ? + buffer_samples : + num_channels == 2 ? + buffer_samples / 2 : + buffer_samples / 4; + } } if (rigol_ds_config_set(sdi, ":SING") != SR_OK) @@ -431,9 +462,14 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi) rigol_ds_set_wait_event(devc, WAIT_NONE); break; case PROTOCOL_V3: - if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", - ch->index + 1) != SR_OK) - return SR_ERR; + if (ch->type == SR_CHANNEL_LOGIC) { + if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK) + return SR_ERR; + } else { + if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", + ch->index + 1) != SR_OK) + return SR_ERR; + } if (devc->data_source != DATA_SOURCE_LIVE) { if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK) return SR_ERR; @@ -442,6 +478,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi) } break; case PROTOCOL_V4: + case PROTOCOL_V5: if (ch->type == SR_CHANNEL_ANALOG) { if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", ch->index + 1) != SR_OK) @@ -461,10 +498,20 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi) if (devc->model->series->protocol >= PROTOCOL_V3 && ch->type == SR_CHANNEL_ANALOG) { + /* Vertical increment. */ + if (sr_scpi_get_float(sdi->conn, ":WAV:YINC?", + &devc->vert_inc[ch->index]) != SR_OK) + return SR_ERR; + /* Vertical origin. */ + if (sr_scpi_get_float(sdi->conn, ":WAV:YOR?", + &devc->vert_origin[ch->index]) != SR_OK) + return SR_ERR; /* Vertical reference. */ if (sr_scpi_get_int(sdi->conn, ":WAV:YREF?", &devc->vert_reference[ch->index]) != SR_OK) return SR_ERR; + } else if (ch->type == SR_CHANNEL_ANALOG) { + devc->vert_inc[ch->index] = devc->vdiv[ch->index] / 25.6; } rigol_ds_set_wait_event(devc, WAIT_BLOCK); @@ -540,8 +587,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) struct dev_context *devc; struct sr_datafeed_packet packet; struct sr_datafeed_analog analog; + struct sr_analog_encoding encoding; + struct sr_analog_meaning meaning; + struct sr_analog_spec spec; struct sr_datafeed_logic logic; - double vdiv, offset; + double vdiv, offset, origin; int len, i, vref; struct sr_channel *ch; gsize expected_data_bytes; @@ -592,10 +642,10 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) if (devc->num_block_bytes == 0) { if (devc->model->series->protocol >= PROTOCOL_V4) { - if (sr_scpi_send(sdi->conn, ":WAV:START %d", + if (rigol_ds_config_set(sdi, ":WAV:START %d", devc->num_channel_bytes + 1) != SR_OK) return TRUE; - if (sr_scpi_send(sdi->conn, ":WAV:STOP %d", + if (rigol_ds_config_set(sdi, ":WAV:STOP %d", MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE, devc->analog_frame_size)) != SR_OK) return TRUE; @@ -615,10 +665,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) /* Still reading the header. */ return TRUE; if (len == -1) { - sr_err("Read error, aborting capture."); - packet.type = SR_DF_FRAME_END; - sr_session_send(cb_data, &packet); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sr_err("Error while reading block header, aborting capture."); + std_session_send_df_frame_end(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } /* At slow timebases in live capture the DS2072 @@ -648,10 +697,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) len = sr_scpi_read_data(scpi, (char *)devc->buffer, len); if (len == -1) { - sr_err("Read error, aborting capture."); - packet.type = SR_DF_FRAME_END; - sr_session_send(cb_data, &packet); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sr_err("Error while reading block data, aborting capture."); + std_session_send_df_frame_end(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } @@ -661,34 +709,38 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) if (ch->type == SR_CHANNEL_ANALOG) { vref = devc->vert_reference[ch->index]; - vdiv = devc->vdiv[ch->index] / 25.6; + vdiv = devc->vert_inc[ch->index]; + origin = devc->vert_origin[ch->index]; offset = devc->vert_offset[ch->index]; if (devc->model->series->protocol >= PROTOCOL_V3) for (i = 0; i < len; i++) - devc->data[i] = ((int)devc->buffer[i] - vref) * vdiv - offset; + devc->data[i] = ((int)devc->buffer[i] - vref - origin) * vdiv; else for (i = 0; i < len; i++) devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset; - analog.channels = g_slist_append(NULL, ch); + float vdivlog = log10f(vdiv); + int digits = -(int)vdivlog + (vdivlog < 0.0); + sr_analog_init(&analog, &encoding, &meaning, &spec, digits); + analog.meaning->channels = g_slist_append(NULL, ch); analog.num_samples = len; analog.data = devc->data; - analog.mq = SR_MQ_VOLTAGE; - analog.unit = SR_UNIT_VOLT; - analog.mqflags = 0; + analog.meaning->mq = SR_MQ_VOLTAGE; + analog.meaning->unit = SR_UNIT_VOLT; + analog.meaning->mqflags = 0; packet.type = SR_DF_ANALOG; packet.payload = &analog; - sr_session_send(cb_data, &packet); - g_slist_free(analog.channels); + sr_session_send(sdi, &packet); + g_slist_free(analog.meaning->channels); } else { logic.length = len; // TODO: For the MSO1000Z series, we need a way to express that // this data is in fact just for a single channel, with the valid // data for that channel in the LSB of each byte. - logic.unitsize = devc->model->series->protocol == PROTOCOL_V4 ? 1 : 2; + logic.unitsize = devc->model->series->protocol >= PROTOCOL_V4 ? 1 : 2; logic.data = devc->buffer; packet.type = SR_DF_LOGIC; packet.payload = &logic; - sr_session_send(cb_data, &packet); + sr_session_send(sdi, &packet); } if (devc->num_block_read == devc->num_block_bytes) { @@ -704,11 +756,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) if (devc->data_source != DATA_SOURCE_LIVE) rigol_ds_set_wait_event(devc, WAIT_BLOCK); } - if (!sr_scpi_read_complete(scpi)) { + /* End acquisition when data for all channels is acquired. */ + if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) { sr_err("Read should have been completed"); - packet.type = SR_DF_FRAME_END; - sr_session_send(cb_data, &packet); - sdi->driver->dev_acquisition_stop(sdi, cb_data); + std_session_send_df_frame_end(sdi); + sr_dev_acquisition_stop(sdi); return TRUE; } devc->num_block_read = 0; @@ -741,12 +793,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) rigol_ds_channel_start(sdi); } else { /* Done with this frame. */ - packet.type = SR_DF_FRAME_END; - sr_session_send(cb_data, &packet); + std_session_send_df_frame_end(sdi); if (++devc->num_frames == devc->limit_frames) { /* Last frame, stop capture. */ - sdi->driver->dev_acquisition_stop(sdi, cb_data); + sr_dev_acquisition_stop(sdi); } else { /* Get the next frame, starting with the first channel. */ devc->channel_entry = devc->enabled_channels; @@ -754,8 +805,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) rigol_ds_capture_start(sdi); /* Start of next frame. */ - packet.type = SR_DF_FRAME_BEGIN; - sr_session_send(cb_data, &packet); + std_session_send_df_frame_begin(sdi); } } @@ -765,6 +815,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data) SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) { struct dev_context *devc; + struct sr_channel *ch; char *cmd; unsigned int i; int res; @@ -778,6 +829,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) g_free(cmd); if (res != SR_OK) return SR_ERR; + ch = g_slist_nth_data(sdi->channels, i); + ch->enabled = devc->analog_channels[i]; } sr_dbg("Current analog channel state:"); for (i = 0; i < devc->model->analog_channels; i++) @@ -786,20 +839,25 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) /* Digital channel state. */ if (devc->model->has_digital) { if (sr_scpi_get_bool(sdi->conn, - devc->model->series->protocol >= PROTOCOL_V4 ? + devc->model->series->protocol >= PROTOCOL_V3 ? ":LA:STAT?" : ":LA:DISP?", &devc->la_enabled) != SR_OK) return SR_ERR; sr_dbg("Logic analyzer %s, current digital channel state:", devc->la_enabled ? "enabled" : "disabled"); for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) { - cmd = g_strdup_printf( - devc->model->series->protocol >= PROTOCOL_V4 ? - ":LA:DIG%d:DISP?" : ":DIG%d:TURN?", i); + if (devc->model->series->protocol >= PROTOCOL_V5) + cmd = g_strdup_printf(":LA:DISP? D%d", i); + else if (devc->model->series->protocol >= PROTOCOL_V3) + cmd = g_strdup_printf(":LA:DIG%d:DISP?", i); + else + cmd = g_strdup_printf(":DIG%d:TURN?", i); res = sr_scpi_get_bool(sdi->conn, cmd, &devc->digital_channels[i]); g_free(cmd); if (res != SR_OK) return SR_ERR; + ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels); + ch->enabled = devc->digital_channels[i]; sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off"); } } @@ -809,29 +867,21 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) return SR_ERR; sr_dbg("Current timebase %g", devc->timebase); - /* Vertical gain. */ + /* Probe attenuation. */ for (i = 0; i < devc->model->analog_channels; i++) { - cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1); - res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]); + cmd = g_strdup_printf(":CHAN%d:PROB?", i + 1); + res = sr_scpi_get_float(sdi->conn, cmd, &devc->attenuation[i]); g_free(cmd); if (res != SR_OK) return SR_ERR; } - sr_dbg("Current vertical gain:"); + sr_dbg("Current probe attenuation:"); for (i = 0; i < devc->model->analog_channels; i++) - sr_dbg("CH%d %g", i + 1, devc->vdiv[i]); + sr_dbg("CH%d %g", i + 1, devc->attenuation[i]); - /* Vertical offset. */ - for (i = 0; i < devc->model->analog_channels; i++) { - cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1); - res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]); - g_free(cmd); - if (res != SR_OK) - return SR_ERR; - } - sr_dbg("Current vertical offset:"); - for (i = 0; i < devc->model->analog_channels; i++) - sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]); + /* Vertical gain and offset. */ + if (rigol_ds_get_dev_cfg_vertical(sdi) != SR_OK) + return SR_ERR; /* Coupling. */ for (i = 0; i < devc->model->analog_channels; i++) { @@ -851,7 +901,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) sr_dbg("Current trigger source %s", devc->trigger_source); /* Horizontal trigger position. */ - if (sr_scpi_get_float(sdi->conn, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK) + if (sr_scpi_get_float(sdi->conn, devc->model->cmds[CMD_GET_HORIZ_TRIGGERPOS].str, + &devc->horiz_triggerpos) != SR_OK) return SR_ERR; sr_dbg("Current horizontal trigger position %g", devc->horiz_triggerpos); @@ -860,5 +911,46 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi) return SR_ERR; sr_dbg("Current trigger slope %s", devc->trigger_slope); + /* Trigger level. */ + if (sr_scpi_get_float(sdi->conn, ":TRIG:EDGE:LEV?", &devc->trigger_level) != SR_OK) + return SR_ERR; + sr_dbg("Current trigger level %g", devc->trigger_level); + + return SR_OK; +} + +SR_PRIV int rigol_ds_get_dev_cfg_vertical(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + char *cmd; + unsigned int i; + int res; + + devc = sdi->priv; + + /* Vertical gain. */ + for (i = 0; i < devc->model->analog_channels; i++) { + cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1); + res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]); + g_free(cmd); + if (res != SR_OK) + return SR_ERR; + } + sr_dbg("Current vertical gain:"); + for (i = 0; i < devc->model->analog_channels; i++) + sr_dbg("CH%d %g", i + 1, devc->vdiv[i]); + + /* Vertical offset. */ + for (i = 0; i < devc->model->analog_channels; i++) { + cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1); + res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]); + g_free(cmd); + if (res != SR_OK) + return SR_ERR; + } + sr_dbg("Current vertical offset:"); + for (i = 0; i < devc->model->analog_channels; i++) + sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]); + return SR_OK; }