X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=c0b32e13e45faee84c355995a907c295bff90e99;hb=49a468ed8bbd4d8f70cedc8fea205fba45e2e552;hp=f97b07109eae6ffb66e105d764979620934b6bff;hpb=53012da658ae94b245240c8a3e115723eede4c7d;p=libsigrok.git diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c index f97b0710..c0b32e13 100644 --- a/src/hardware/scpi-pps/api.c +++ b/src/hardware/scpi-pps/api.c @@ -2,6 +2,7 @@ * This file is part of the libsigrok project. * * Copyright (C) 2014 Bert Vermeulen + * Copyright (C) 2017 Frank Stettner * * 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 @@ -127,7 +128,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi, for (ch_num = 0; ch_num < num_channels; ch_num++) { /* Create one channel per measurable output unit. */ for (i = 0; i < ARRAY_SIZE(pci); i++) { - if (!scpi_cmd_get(devc->device->commands, pci[i].command)) + if (!sr_scpi_cmd_get(devc->device->commands, pci[i].command)) continue; g_snprintf(ch_name, 16, "%s%s", pci[i].prefix, channels[ch_num].name); @@ -164,7 +165,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi, sr_scpi_hw_info_free(hw_info); hw_info = NULL; - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_LOCAL); + sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL); return sdi; } @@ -256,13 +257,14 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; devc = sdi->priv; - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_REMOTE); + sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE); devc->beeper_was_set = FALSE; - if (scpi_cmd_resp(sdi, devc->device->commands, &beeper, - G_VARIANT_TYPE_BOOLEAN, SCPI_CMD_BEEPER) == SR_OK) { + if (sr_scpi_cmd_resp(sdi, devc->device->commands, 0, NULL, + &beeper, G_VARIANT_TYPE_BOOLEAN, SCPI_CMD_BEEPER) == SR_OK) { if (g_variant_get_boolean(beeper)) { devc->beeper_was_set = TRUE; - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_BEEPER_DISABLE); + sr_scpi_cmd(sdi, devc->device->commands, + 0, NULL, SCPI_CMD_BEEPER_DISABLE); } g_variant_unref(beeper); } @@ -282,8 +284,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_ERR_BUG; if (devc->beeper_was_set) - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_BEEPER_ENABLE); - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_LOCAL); + sr_scpi_cmd(sdi, devc->device->commands, + 0, NULL, SCPI_CMD_BEEPER_ENABLE); + sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL); return sr_scpi_close(scpi); } @@ -299,12 +302,14 @@ static int dev_clear(const struct sr_dev_driver *di) return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; const GVariantType *gvtype; unsigned int i; + int channel_group_cmd; + char *channel_group_name; int cmd, ret; const char *s; @@ -399,9 +404,16 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s if (!gvtype) return SR_ERR_NA; - if (cg) - select_channel(sdi, cg->channels->data); - ret = scpi_cmd_resp(sdi, devc->device->commands, data, gvtype, cmd); + channel_group_cmd = 0; + channel_group_name = NULL; + if (cg) { + channel_group_cmd = SCPI_CMD_SELECT_CHANNEL; + channel_group_name = g_strdup(cg->name); + } + + ret = sr_scpi_cmd_resp(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, data, gvtype, cmd); + g_free(channel_group_name); if (cmd == SCPI_CMD_GET_OUTPUT_REGULATION) { /* @@ -428,88 +440,109 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return ret; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; double d; + int channel_group_cmd; + char *channel_group_name; int ret; if (!sdi) return SR_ERR_ARG; - if (cg) - select_channel(sdi, cg->channels->data); + channel_group_cmd = 0; + channel_group_name = NULL; + if (cg) { + channel_group_cmd = SCPI_CMD_SELECT_CHANNEL; + channel_group_name = g_strdup(cg->name); + } devc = sdi->priv; switch (key) { case SR_CONF_ENABLED: if (g_variant_get_boolean(data)) - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OUTPUT_ENABLE); else - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OUTPUT_DISABLE); break; case SR_CONF_VOLTAGE_TARGET: d = g_variant_get_double(data); - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_VOLTAGE_TARGET, d); break; case SR_CONF_OUTPUT_FREQUENCY_TARGET: d = g_variant_get_double(data); - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_FREQUENCY_TARGET, d); break; case SR_CONF_CURRENT_LIMIT: d = g_variant_get_double(data); - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_CURRENT_LIMIT, d); break; case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED: if (g_variant_get_boolean(data)) - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE); else - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE); break; case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD: d = g_variant_get_double(data); - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, d); break; case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: if (g_variant_get_boolean(data)) - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE); else - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE); break; case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD: d = g_variant_get_double(data); - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d); break; case SR_CONF_OVER_TEMPERATURE_PROTECTION: if (g_variant_get_boolean(data)) - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE); else - ret = scpi_cmd(sdi, devc->device->commands, + ret = sr_scpi_cmd(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE); break; default: ret = SR_ERR_NA; } + g_free(channel_group_name); + return ret; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_channel *ch; @@ -526,10 +559,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return std_opts_config_list(key, data, sdi, cg, ARRAY_AND_SIZE(scanopts), ARRAY_AND_SIZE(drvopts), - (devc) ? devc->device->devopts : NULL, - (devc) ? devc->device->num_devopts : 0); + (devc && devc->device) ? devc->device->devopts : NULL, + (devc && devc->device) ? devc->device->num_devopts : 0); break; case SR_CONF_CHANNEL_CONFIG: + if (!devc || !devc->device) + return SR_ERR_ARG; /* Not used. */ i = 0; if (devc->device->features & PPS_INDEPENDENT) @@ -558,6 +593,8 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * * specification for use in series or parallel mode. */ ch = cg->channels->data; + if (!devc || !devc->device) + return SR_ERR_ARG; ch_spec = &(devc->device->channels[ch->index]); switch (key) { @@ -573,6 +610,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * case SR_CONF_CURRENT_LIMIT: *data = std_gvar_min_max_step_array(ch_spec->current); break; + case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD: + *data = std_gvar_min_max_step_array(ch_spec->ovp); + break; + case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD: + *data = std_gvar_min_max_step_array(ch_spec->ocp); + break; default: return SR_ERR_NA; } @@ -585,35 +628,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_scpi_dev_inst *scpi; - struct sr_channel *ch; - struct pps_channel *pch; - int cmd, ret; + int ret; devc = sdi->priv; scpi = sdi->conn; + /* Prime the pipe with the first channel. */ + devc->cur_acquisition_channel = sr_next_enabled_channel(sdi, NULL); + if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10, scpi_pps_receive_data, (void *)sdi)) != SR_OK) return ret; std_session_send_df_header(sdi); - /* Prime the pipe with the first channel's fetch. */ - ch = sr_next_enabled_channel(sdi, NULL); - pch = ch->priv; - if ((ret = select_channel(sdi, ch)) < 0) - return ret; - if (pch->mq == SR_MQ_VOLTAGE) - cmd = SCPI_CMD_GET_MEAS_VOLTAGE; - else if (pch->mq == SR_MQ_FREQUENCY) - cmd = SCPI_CMD_GET_MEAS_FREQUENCY; - else if (pch->mq == SR_MQ_CURRENT) - cmd = SCPI_CMD_GET_MEAS_CURRENT; - else if (pch->mq == SR_MQ_POWER) - cmd = SCPI_CMD_GET_MEAS_POWER; - else - return SR_ERR; - scpi_cmd(sdi, devc->device->commands, cmd, pch->hwname); - return SR_OK; } @@ -628,6 +655,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) * A requested value is certainly on the way. Retrieve it now, * to avoid leaving the device in a state where it's not expecting * commands. + * + * TODO: Doesn't work for (at least) the HP 66XXB models. */ sr_scpi_get_double(scpi, NULL, &d); sr_scpi_source_remove(sdi->session, scpi);