X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=f3e587f04c3a8c48d450e455988c04dc62659f77;hb=66ddc22a1d20244df7c7b39ab392104976fa93f8;hp=7783dec172f679bc0e94b8f56947761354eace39;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index 7783dec1..f3e587f0 100644 --- a/src/hardware/hameg-hmo/api.c +++ b/src/hardware/hameg-hmo/api.c @@ -2,6 +2,7 @@ * This file is part of the libsigrok project. * * Copyright (C) 2013 poljar (Damir Jelić) + * Copyright (C) 2018 Guido Trentalancia * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,8 +23,6 @@ #include "scpi.h" #include "protocol.h" -#define SERIALCOMM "115200/8n1/flow=1" - static struct sr_dev_driver hameg_hmo_driver_info; static const char *manufacturers[] = { @@ -38,6 +37,7 @@ static const uint32_t scanopts[] = { static const uint32_t drvopts[] = { SR_CONF_OSCILLOSCOPE, + SR_CONF_LOGIC_ANALYZER, }; enum { @@ -47,7 +47,7 @@ enum { CG_DIGITAL, }; -static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi) +static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) { struct sr_dev_inst *sdi; struct dev_context *devc; @@ -96,7 +96,7 @@ fail: static GSList *scan(struct sr_dev_driver *di, GSList *options) { - return sr_scpi_scan(di->context, options, hmo_probe_serial_device); + return sr_scpi_scan(di->context, options, probe_device); } static void clear_helper(struct dev_context *devc) @@ -130,7 +130,6 @@ static int dev_close(struct sr_dev_inst *sdi) static int check_channel_group(struct dev_context *devc, const struct sr_channel_group *cg) { - unsigned int i; const struct scope_config *model; model = devc->model_config; @@ -138,13 +137,11 @@ static int check_channel_group(struct dev_context *devc, if (!cg) return CG_NONE; - for (i = 0; i < model->analog_channels; i++) - if (cg == devc->analog_groups[i]) - return CG_ANALOG; + if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) >= 0) + return CG_ANALOG; - for (i = 0; i < model->digital_pods; i++) - if (cg == devc->digital_groups[i]) - return CG_DIGITAL; + if (std_cg_idx(cg, devc->digital_groups, model->digital_pods) >= 0) + return CG_DIGITAL; sr_err("Invalid channel group specified."); @@ -154,8 +151,7 @@ static int check_channel_group(struct dev_context *devc, static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int cg_type; - unsigned int i; + int cg_type, idx, i; struct dev_context *devc; const struct scope_config *model; struct scope_state *state; @@ -180,34 +176,24 @@ static int config_get(uint32_t key, GVariant **data, (*model->timebases)[state->timebase][1]); break; case SR_CONF_NUM_VDIV: - if (cg_type == CG_NONE) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - for (i = 0; i < model->analog_channels; i++) { - if (cg != devc->analog_groups[i]) - continue; - *data = g_variant_new_int32(model->num_ydivs); - break; - } - } else { + if (cg_type != CG_ANALOG) return SR_ERR_NA; - } + if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0) + return SR_ERR_ARG; + *data = g_variant_new_int32(model->num_ydivs); break; case SR_CONF_VDIV: - if (cg_type == CG_NONE) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - for (i = 0; i < model->analog_channels; i++) { - if (cg != devc->analog_groups[i]) - continue; - *data = g_variant_new("(tt)", - (*model->vdivs)[state->analog_channels[i].vdiv][0], - (*model->vdivs)[state->analog_channels[i].vdiv][1]); - break; - } - } else { + if (cg_type != CG_ANALOG) return SR_ERR_NA; - } + if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0) + return SR_ERR_ARG; + *data = g_variant_new("(tt)", + (*model->vdivs)[state->analog_channels[idx].vdiv][0], + (*model->vdivs)[state->analog_channels[idx].vdiv][1]); break; case SR_CONF_TRIGGER_SOURCE: *data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]); @@ -215,26 +201,58 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_TRIGGER_SLOPE: *data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]); break; + case SR_CONF_TRIGGER_PATTERN: + *data = g_variant_new_string(state->trigger_pattern); + break; case SR_CONF_HORIZ_TRIGGERPOS: *data = g_variant_new_double(state->horiz_triggerpos); break; case SR_CONF_COUPLING: - if (cg_type == CG_NONE) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - for (i = 0; i < model->analog_channels; i++) { - if (cg != devc->analog_groups[i]) - continue; - *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]); - break; - } - } else { + if (cg_type != CG_ANALOG) return SR_ERR_NA; - } + if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0) + return SR_ERR_ARG; + *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]); break; case SR_CONF_SAMPLERATE: *data = g_variant_new_uint64(state->sample_rate); break; + case SR_CONF_LOGIC_THRESHOLD: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + if (cg_type != CG_DIGITAL) + return SR_ERR_NA; + if (!model) + return SR_ERR_ARG; + if ((idx = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0) + return SR_ERR_ARG; + *data = g_variant_new_string((*model->logic_threshold)[state->digital_pods[idx].threshold]); + break; + case SR_CONF_LOGIC_THRESHOLD_CUSTOM: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + if (cg_type != CG_DIGITAL) + return SR_ERR_NA; + if (!model) + return SR_ERR_ARG; + if ((idx = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0) + return SR_ERR_ARG; + /* Check if the oscilloscope is currently in custom threshold mode. */ + for (i = 0; i < model->num_logic_threshold; i++) { + if (!strcmp("USER2", (*model->logic_threshold)[i])) + if (strcmp("USER2", (*model->logic_threshold)[state->digital_pods[idx].threshold])) + return SR_ERR_NA; + if (!strcmp("USER", (*model->logic_threshold)[i])) + if (strcmp("USER", (*model->logic_threshold)[state->digital_pods[idx].threshold])) + return SR_ERR_NA; + if (!strcmp("MAN", (*model->logic_threshold)[i])) + if (strcmp("MAN", (*model->logic_threshold)[state->digital_pods[idx].threshold])) + return SR_ERR_NA; + } + *data = g_variant_new_double(state->digital_pods[idx].user_threshold); + break; default: return SR_ERR_NA; } @@ -245,14 +263,13 @@ static int config_get(uint32_t key, GVariant **data, static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret, cg_type, idx; - unsigned int i, j; - char command[MAX_COMMAND_SIZE], float_str[30]; + int ret, cg_type, idx, i, j; + char command[MAX_COMMAND_SIZE], command2[MAX_COMMAND_SIZE]; + char float_str[30], *tmp_str; struct dev_context *devc; const struct scope_config *model; struct scope_state *state; - const char *tmp; - double tmp_d; + double tmp_d, tmp_d2; gboolean update_sample_rate; if (!sdi) @@ -267,129 +284,209 @@ static int config_set(uint32_t key, GVariant *data, state = devc->model_state; update_sample_rate = FALSE; - ret = SR_ERR_NA; - switch (key) { + case SR_CONF_LIMIT_SAMPLES: + devc->samples_limit = g_variant_get_uint64(data); + ret = SR_OK; + break; case SR_CONF_LIMIT_FRAMES: devc->frame_limit = g_variant_get_uint64(data); ret = SR_OK; break; case SR_CONF_TRIGGER_SOURCE: - tmp = g_variant_get_string(data, NULL); - for (i = 0; (*model->trigger_sources)[i]; i++) { - if (g_strcmp0(tmp, (*model->trigger_sources)[i]) != 0) - continue; - state->trigger_source = i; - g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE], - (*model->trigger_sources)[i]); - - ret = sr_scpi_send(sdi->conn, command); - break; - } + if ((idx = std_str_idx(data, *model->trigger_sources, model->num_trigger_sources)) < 0) + return SR_ERR_ARG; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE], + (*model->trigger_sources)[idx]); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->trigger_source = idx; + ret = SR_OK; break; case SR_CONF_VDIV: - if (cg_type == CG_NONE) + if (!cg) return SR_ERR_CHANNEL_GROUP; if ((idx = std_u64_tuple_idx(data, *model->vdivs, model->num_vdivs)) < 0) return SR_ERR_ARG; - for (j = 1; j <= model->analog_channels; j++) { - if (cg != devc->analog_groups[j - 1]) - continue; - state->analog_channels[j - 1].vdiv = idx; - g_ascii_formatd(float_str, sizeof(float_str), "%E", - (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]); - g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV], - j, float_str); - if (sr_scpi_send(sdi->conn, command) != SR_OK || - sr_scpi_get_opc(sdi->conn) != SR_OK) - return SR_ERR; - break; - } + if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0) + return SR_ERR_ARG; + g_ascii_formatd(float_str, sizeof(float_str), "%E", + (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]); + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_SCALE], + j + 1, float_str); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->analog_channels[j].vdiv = idx; ret = SR_OK; break; case SR_CONF_TIMEBASE: if ((idx = std_u64_tuple_idx(data, *model->timebases, model->num_timebases)) < 0) return SR_ERR_ARG; - state->timebase = idx; g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) (*model->timebases)[idx][0] / (*model->timebases)[idx][1]); g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE], float_str); - ret = sr_scpi_send(sdi->conn, command); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->timebase = idx; + ret = SR_OK; update_sample_rate = TRUE; break; case SR_CONF_HORIZ_TRIGGERPOS: tmp_d = g_variant_get_double(data); - if (tmp_d < 0.0 || tmp_d > 1.0) return SR_ERR; - - state->horiz_triggerpos = tmp_d; - tmp_d = -(tmp_d - 0.5) * + tmp_d2 = -(tmp_d - 0.5) * ((double) (*model->timebases)[state->timebase][0] / (*model->timebases)[state->timebase][1]) * model->num_xdivs; - - g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d); + g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d2); g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS], float_str); - - ret = sr_scpi_send(sdi->conn, command); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->horiz_triggerpos = tmp_d; + ret = SR_OK; break; case SR_CONF_TRIGGER_SLOPE: - tmp = g_variant_get_string(data, NULL); - for (i = 0; (*model->trigger_slopes)[i]; i++) { - if (g_strcmp0(tmp, (*model->trigger_slopes)[i]) != 0) - continue; - state->trigger_slope = i; - g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE], - (*model->trigger_slopes)[i]); - - ret = sr_scpi_send(sdi->conn, command); - break; - } + if ((idx = std_str_idx(data, *model->trigger_slopes, model->num_trigger_slopes)) < 0) + return SR_ERR_ARG; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE], + (*model->trigger_slopes)[idx]); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->trigger_slope = idx; + ret = SR_OK; + break; + case SR_CONF_TRIGGER_PATTERN: + tmp_str = (char *)g_variant_get_string(data, 0); + idx = strlen(tmp_str); + if (idx == 0 || idx > model->analog_channels + model->digital_channels) + return SR_ERR_ARG; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_PATTERN], + tmp_str); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + strncpy(state->trigger_pattern, + tmp_str, + MAX_ANALOG_CHANNEL_COUNT + MAX_DIGITAL_CHANNEL_COUNT); + ret = SR_OK; break; case SR_CONF_COUPLING: - if (cg_type == CG_NONE) + if (!cg) return SR_ERR_CHANNEL_GROUP; - - tmp = g_variant_get_string(data, NULL); - - for (i = 0; (*model->coupling_options)[i]; i++) { - if (strcmp(tmp, (*model->coupling_options)[i]) != 0) - continue; - for (j = 1; j <= model->analog_channels; j++) { - if (cg != devc->analog_groups[j - 1]) - continue; - state->analog_channels[j-1].coupling = i; - + if ((idx = std_str_idx(data, *model->coupling_options, model->num_coupling_options)) < 0) + return SR_ERR_ARG; + if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0) + return SR_ERR_ARG; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_COUPLING], + j + 1, (*model->coupling_options)[idx]); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->analog_channels[j].coupling = idx; + ret = SR_OK; + break; + case SR_CONF_LOGIC_THRESHOLD: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + if (cg_type != CG_DIGITAL) + return SR_ERR_NA; + if (!model) + return SR_ERR_ARG; + if ((idx = std_str_idx(data, *model->logic_threshold, model->num_logic_threshold)) < 0) + return SR_ERR_ARG; + if ((j = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0) + return SR_ERR_ARG; + /* Check if the threshold command is based on the POD or digital channel index. */ + if (model->logic_threshold_for_pod) + i = j + 1; + else + i = j * 8; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + i, (*model->logic_threshold)[idx]); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->digital_pods[j].threshold = idx; + ret = SR_OK; + break; + case SR_CONF_LOGIC_THRESHOLD_CUSTOM: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + if (cg_type != CG_DIGITAL) + return SR_ERR_NA; + if (!model) + return SR_ERR_ARG; + if ((j = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0) + return SR_ERR_ARG; + tmp_d = g_variant_get_double(data); + if (tmp_d < -2.0 || tmp_d > 8.0) + return SR_ERR; + g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d); + /* Check if the threshold command is based on the POD or digital channel index. */ + if (model->logic_threshold_for_pod) + idx = j + 1; + else + idx = j * 8; + /* Try to support different dialects exhaustively. */ + for (i = 0; i < model->num_logic_threshold; i++) { + if (!strcmp("USER2", (*model->logic_threshold)[i])) { g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_COUPLING], - j, tmp); - - if (sr_scpi_send(sdi->conn, command) != SR_OK || - sr_scpi_get_opc(sdi->conn) != SR_OK) - return SR_ERR; + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD], + idx, 2, float_str); /* USER2 */ + g_snprintf(command2, sizeof(command2), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + idx, "USER2"); + break; + } + if (!strcmp("USER", (*model->logic_threshold)[i])) { + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD], + idx, float_str); + g_snprintf(command2, sizeof(command2), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + idx, "USER"); + break; + } + if (!strcmp("MAN", (*model->logic_threshold)[i])) { + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD], + idx, float_str); + g_snprintf(command2, sizeof(command2), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + idx, "MAN"); break; } - - ret = SR_OK; - break; } + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + if (sr_scpi_send(sdi->conn, command2) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + state->digital_pods[j].user_threshold = tmp_d; + ret = SR_OK; break; default: ret = SR_ERR_NA; break; } - if (ret == SR_OK) - ret = sr_scpi_get_opc(sdi->conn); - if (ret == SR_OK && update_sample_rate) ret = hmo_update_sample_rate(sdi); @@ -416,34 +513,35 @@ static int config_list(uint32_t key, GVariant **data, *data = std_gvar_array_u32(ARRAY_AND_SIZE(scanopts)); break; case SR_CONF_DEVICE_OPTIONS: - if (cg_type == CG_NONE) { + if (!cg) { if (model) - *data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts); + *data = std_gvar_array_u32(*model->devopts, model->num_devopts); else *data = std_gvar_array_u32(ARRAY_AND_SIZE(drvopts)); } else if (cg_type == CG_ANALOG) { - *data = std_gvar_array_u32((const uint32_t *)model->devopts_cg_analog, model->num_devopts_cg_analog); + *data = std_gvar_array_u32(*model->devopts_cg_analog, model->num_devopts_cg_analog); + } else if (cg_type == CG_DIGITAL) { + *data = std_gvar_array_u32(*model->devopts_cg_digital, model->num_devopts_cg_digital); } else { *data = std_gvar_array_u32(NULL, 0); } break; case SR_CONF_COUPLING: - if (cg_type == CG_NONE) + if (!cg) return SR_ERR_CHANNEL_GROUP; - *data = g_variant_new_strv(*model->coupling_options, - g_strv_length((char **)*model->coupling_options)); + if (!model) + return SR_ERR_ARG; + *data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options); break; case SR_CONF_TRIGGER_SOURCE: if (!model) return SR_ERR_ARG; - *data = g_variant_new_strv(*model->trigger_sources, - g_strv_length((char **)*model->trigger_sources)); + *data = g_variant_new_strv(*model->trigger_sources, model->num_trigger_sources); break; case SR_CONF_TRIGGER_SLOPE: if (!model) return SR_ERR_ARG; - *data = g_variant_new_strv(*model->trigger_slopes, - g_strv_length((char **)*model->trigger_slopes)); + *data = g_variant_new_strv(*model->trigger_slopes, model->num_trigger_slopes); break; case SR_CONF_TIMEBASE: if (!model) @@ -451,10 +549,19 @@ static int config_list(uint32_t key, GVariant **data, *data = std_gvar_tuple_array(*model->timebases, model->num_timebases); break; case SR_CONF_VDIV: - if (cg_type == CG_NONE) + if (!cg) return SR_ERR_CHANNEL_GROUP; + if (!model) + return SR_ERR_ARG; *data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs); break; + case SR_CONF_LOGIC_THRESHOLD: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + if (!model) + return SR_ERR_ARG; + *data = g_variant_new_strv(*model->logic_threshold, model->num_logic_threshold); + break; default: return SR_ERR_NA; } @@ -560,6 +667,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi) struct sr_channel *ch; struct dev_context *devc; struct sr_scpi_dev_inst *scpi; + int ret; devc = sdi->priv; scpi = sdi->conn; @@ -579,8 +687,10 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi) (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE], ch->index + 1, ch->enabled); - if (sr_scpi_send(scpi, command) != SR_OK) + if (sr_scpi_send(scpi, command) != SR_OK) { + g_free(pod_enabled); return SR_ERR; + } state->analog_channels[ch->index].state = ch->enabled; setup_changed = TRUE; break; @@ -598,30 +708,37 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi) (*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE], ch->index, ch->enabled); - if (sr_scpi_send(scpi, command) != SR_OK) + if (sr_scpi_send(scpi, command) != SR_OK) { + g_free(pod_enabled); return SR_ERR; + } state->digital_channels[ch->index] = ch->enabled; setup_changed = TRUE; break; default: + g_free(pod_enabled); return SR_ERR; } } - for (i = 1; i <= model->digital_pods; i++) { - if (state->digital_pods[i - 1] == pod_enabled[i - 1]) + ret = SR_OK; + for (i = 0; i < model->digital_pods; i++) { + if (state->digital_pods[i].state == pod_enabled[i]) continue; g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE], - i, pod_enabled[i - 1]); - if (sr_scpi_send(scpi, command) != SR_OK) - return SR_ERR; - state->digital_pods[i - 1] = pod_enabled[i - 1]; + i + 1, pod_enabled[i]); + if (sr_scpi_send(scpi, command) != SR_OK) { + ret = SR_ERR; + break; + } + state->digital_pods[i].state = pod_enabled[i]; setup_changed = TRUE; } - g_free(pod_enabled); + if (ret != SR_OK) + return ret; if (setup_changed && hmo_update_sample_rate(sdi) != SR_OK) return SR_ERR; @@ -642,6 +759,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) scpi = sdi->conn; devc = sdi->priv; + devc->num_samples = 0; + devc->num_frames = 0; + /* Preset empty results. */ for (group = 0; group < ARRAY_SIZE(digital_added); group++) digital_added[group] = FALSE; @@ -722,6 +842,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) devc = sdi->priv; + devc->num_samples = 0; devc->num_frames = 0; g_slist_free(devc->enabled_channels); devc->enabled_channels = NULL;