X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=22c79740ed1fada6f042e2b644ebe6b16dd40e86;hb=43ff1110fb317fba796f942bbc73c37a95973b8b;hp=880468b41e307ecb79c2eccde5a14bdc461592cb;hpb=fa2ce8c762fb62cd632eb2a8b4f24128ca742678;p=libsigrok.git diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c index 880468b4..22c79740 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 @@ -99,6 +100,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi, devc = g_malloc0(sizeof(struct dev_context)); devc->device = device; + sr_sw_limits_init(&devc->limits); sdi->priv = devc; if (device->num_channels) { @@ -164,7 +166,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi, sr_scpi_hw_info_free(hw_info); hw_info = NULL; - sr_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 +258,14 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; devc = sdi->priv; - sr_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 (sr_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; - sr_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 +285,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_ERR_BUG; if (devc->beeper_was_set) - sr_scpi_cmd(sdi, devc->device->commands, SCPI_CMD_BEEPER_ENABLE); - sr_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); } @@ -305,8 +309,11 @@ static int config_get(uint32_t key, GVariant **data, struct dev_context *devc; const GVariantType *gvtype; unsigned int i; + int channel_group_cmd; + char *channel_group_name; int cmd, ret; const char *s; + int oper_cond; if (!sdi) return SR_ERR_ARG; @@ -395,32 +402,63 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_REGULATION: gvtype = G_VARIANT_TYPE_STRING; cmd = SCPI_CMD_GET_OUTPUT_REGULATION; + break; + default: + return sr_sw_limits_config_get(&devc->limits, key, data); } if (!gvtype) return SR_ERR_NA; - if (cg) - select_channel(sdi, cg->channels->data); - ret = sr_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); + + /* + * Handle special cases + */ if (cmd == SCPI_CMD_GET_OUTPUT_REGULATION) { - /* - * The Rigol DP800 series return CV/CC/UR, Philips PM2800 - * return VOLT/CURR. We always return a GVariant string in - * the Rigol notation. - */ - s = g_variant_get_string(*data, NULL); - if (!strcmp(s, "VOLT")) { - g_variant_unref(*data); - *data = g_variant_new_string("CV"); - } else if (!strcmp(s, "CURR")) { + if (devc->device->dialect == SCPI_DIALECT_PHILIPS) { + /* + * The Philips PM2800 series returns VOLT/CURR. We always return + * a GVariant string in the Rigol notation (CV/CC/UR). + */ + s = g_variant_get_string(*data, NULL); + if (!g_strcmp0(s, "VOLT")) { + g_variant_unref(*data); + *data = g_variant_new_string("CV"); + } else if (!g_strcmp0(s, "CURR")) { + g_variant_unref(*data); + *data = g_variant_new_string("CC"); + } + } + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) { + /* Evaluate Operational Status Register from a HP 66xxB. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, &oper_cond); g_variant_unref(*data); - *data = g_variant_new_string("CC"); + if (oper_cond & (1 << 8)) + *data = g_variant_new_string("CV"); + else if (oper_cond & (1 << 10)) + *data = g_variant_new_string("CC"); + else if (oper_cond & (1 << 11)) + *data = g_variant_new_string("CC-"); + else + *data = g_variant_new_string("UR"); } s = g_variant_get_string(*data, NULL); - if (strcmp(s, "CV") && strcmp(s, "CC") && strcmp(s, "UR")) { - sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s); + if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") && + g_strcmp0(s, "CC-") && g_strcmp0(s, "UR")) { + + sr_err("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s); ret = SR_ERR_DATA; } } @@ -433,78 +471,100 @@ static int config_set(uint32_t key, GVariant *data, { 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)) - return sr_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 - return sr_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); - return sr_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); - return sr_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); - return sr_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)) - return sr_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 - return sr_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); - return sr_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)) - return sr_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 - return sr_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); - return sr_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)) - return sr_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 - return sr_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: - return SR_ERR_NA; + ret = sr_sw_limits_config_set(&devc->limits, key, data); } - return SR_OK; + g_free(channel_group_name); + + return ret; } static int config_list(uint32_t key, GVariant **data, @@ -576,6 +636,12 @@ static int config_list(uint32_t key, GVariant **data, 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; } @@ -588,23 +654,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 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; + sr_sw_limits_acquisition_start(&devc->limits); return SR_OK; } @@ -612,18 +674,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct sr_scpi_dev_inst *scpi; - double d; scpi = sdi->conn; - /* - * 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); std_session_send_df_end(sdi);