X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=71d3a986797b81a97ad6e490930c27c590de2d61;hb=3883934404fcd986feb4e70f50db5f236fd4e674;hp=0abc722cda4fe9e053af0480d0d4309a814671a5;hpb=612336970dcf03c07a826e90cc562bb506edd029;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index 0abc722c..71d3a986 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[] = { @@ -176,28 +175,24 @@ static int config_get(uint32_t key, GVariant **data, (*model->timebases)[state->timebase][1]); break; case SR_CONF_NUM_VDIV: - if (!cg) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0) - return SR_ERR_ARG; - *data = g_variant_new_int32(model->num_ydivs); - } 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) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - 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]); - } 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]); @@ -205,23 +200,48 @@ 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) { + if (!cg) return SR_ERR_CHANNEL_GROUP; - } else if (cg_type == CG_ANALOG) { - 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]); - } 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; + if (strcmp("USER2", (*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; } @@ -233,7 +253,7 @@ 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, j; - char command[MAX_COMMAND_SIZE], float_str[30]; + char command[MAX_COMMAND_SIZE], float_str[30], *tmp_str; struct dev_context *devc; const struct scope_config *model; struct scope_state *state; @@ -252,9 +272,11 @@ 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; @@ -266,7 +288,10 @@ static int config_set(uint32_t key, GVariant *data, g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE], (*model->trigger_sources)[idx]); - 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; + ret = SR_OK; break; case SR_CONF_VDIV: if (!cg) @@ -295,7 +320,10 @@ static int config_set(uint32_t key, GVariant *data, 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; + ret = SR_OK; update_sample_rate = TRUE; break; case SR_CONF_HORIZ_TRIGGERPOS: @@ -311,7 +339,10 @@ static int config_set(uint32_t key, GVariant *data, 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; + ret = SR_OK; break; case SR_CONF_TRIGGER_SLOPE: if ((idx = std_str_idx(data, *model->trigger_slopes, model->num_trigger_slopes)) < 0) @@ -320,7 +351,25 @@ static int config_set(uint32_t key, GVariant *data, g_snprintf(command, sizeof(command), (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE], (*model->trigger_slopes)[idx]); - 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; + 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; + g_free(state->trigger_pattern); + state->trigger_pattern = g_strdup(tmp_str); + ret = SR_OK; break; case SR_CONF_COUPLING: if (!cg) @@ -338,14 +387,59 @@ static int config_set(uint32_t key, GVariant *data, return SR_ERR; 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; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + j + 1, (*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); + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD], + j + 1, 2, float_str); // USER2 for custom logic_threshold setting + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD], + j + 1, "USER2"); + if (sr_scpi_send(sdi->conn, command) != 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); @@ -374,11 +468,13 @@ static int config_list(uint32_t key, GVariant **data, case SR_CONF_DEVICE_OPTIONS: 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); } @@ -386,6 +482,8 @@ static int config_list(uint32_t key, GVariant **data, case SR_CONF_COUPLING: if (!cg) return SR_ERR_CHANNEL_GROUP; + if (!model) + return SR_ERR_ARG; *data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options); break; case SR_CONF_TRIGGER_SOURCE: @@ -406,8 +504,17 @@ static int config_list(uint32_t key, GVariant **data, case SR_CONF_VDIV: 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; } @@ -513,6 +620,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; @@ -532,8 +640,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; @@ -551,30 +661,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; } } + ret = SR_OK; for (i = 0; i < model->digital_pods; i++) { - if (state->digital_pods[i] == pod_enabled[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 + 1, pod_enabled[i]); - if (sr_scpi_send(scpi, command) != SR_OK) - return SR_ERR; - state->digital_pods[i] = 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; @@ -595,6 +712,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; @@ -675,6 +795,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;