X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=ed9fbd9db20661a0c7b472e2741c39a89f17f560;hb=5433907ed99c40e948b8350f55845dd88a5cbbe6;hp=9158933dedf5e9bc44c95780ddabe34a3f251409;hpb=08eba2d30167ec3f6ec12ac8c4f5d256f8b20f33;p=libsigrok.git diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c index 9158933d..ed9fbd9d 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,2019 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) { @@ -127,7 +129,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); @@ -150,6 +152,13 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi, for (l = sdi->channels; l; l = l->next) { ch = l->data; pch = ch->priv; + /* Add mqflags from channel_group_spec only to voltage + * and current channels. + */ + if (pch->mq == SR_MQ_VOLTAGE || pch->mq == SR_MQ_CURRENT) + pch->mqflags = cgs->mqflags; + else + pch->mqflags = 0; if (pch->hw_output_idx == j) cg->channels = g_slist_append(cg->channels, ch); } @@ -164,7 +173,10 @@ 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); + /* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */ + if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB && + scpi->transport == SCPI_TRANSPORT_LIBGPIB)) + sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL); return sdi; } @@ -256,13 +268,19 @@ static int dev_open(struct sr_dev_inst *sdi) return SR_ERR; devc = sdi->priv; - scpi_cmd(sdi, devc->device->commands, SCPI_CMD_REMOTE); + + /* Don't send SCPI_CMD_REMOTE for HP 66xxB using SCPI over GPIB. */ + if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB && + scpi->transport == SCPI_TRANSPORT_LIBGPIB)) + 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 +300,13 @@ 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); + + /* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */ + if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB && + scpi->transport == SCPI_TRANSPORT_LIBGPIB)) + sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL); return sr_scpi_close(scpi); } @@ -305,8 +328,12 @@ 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 reg; + gboolean is_hmp_sqii; if (!sdi) return SR_ERR_ARG; @@ -365,11 +392,20 @@ static int config_get(uint32_t key, GVariant **data, cmd = SCPI_CMD_GET_CURRENT_LIMIT; break; case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED: + if (devc->device->dialect == SCPI_DIALECT_HMP) { + /* OVP is always enabled. */ + *data = g_variant_new_boolean(TRUE); + return 0; + } gvtype = G_VARIANT_TYPE_BOOLEAN; cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED; break; case SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE: - gvtype = G_VARIANT_TYPE_BOOLEAN; + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB || + devc->device->dialect == SCPI_DIALECT_HP_COMP) + gvtype = G_VARIANT_TYPE_STRING; + else + gvtype = G_VARIANT_TYPE_BOOLEAN; cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE; break; case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD: @@ -381,7 +417,11 @@ static int config_get(uint32_t key, GVariant **data, cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED; break; case SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE: - gvtype = G_VARIANT_TYPE_BOOLEAN; + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB || + devc->device->dialect == SCPI_DIALECT_HP_COMP) + gvtype = G_VARIANT_TYPE_STRING; + else + gvtype = G_VARIANT_TYPE_BOOLEAN; cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE; break; case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD: @@ -389,42 +429,181 @@ static int config_get(uint32_t key, GVariant **data, cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD; break; case SR_CONF_OVER_TEMPERATURE_PROTECTION: + if (devc->device->dialect == SCPI_DIALECT_HMP) { + /* OTP is always enabled. */ + *data = g_variant_new_boolean(TRUE); + return 0; + } gvtype = G_VARIANT_TYPE_BOOLEAN; cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION; break; + case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE: + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB || + devc->device->dialect == SCPI_DIALECT_HP_COMP || + devc->device->dialect == SCPI_DIALECT_HMP) + gvtype = G_VARIANT_TYPE_STRING; + else + gvtype = G_VARIANT_TYPE_BOOLEAN; + cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE; + break; 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 = 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); + } + + is_hmp_sqii = FALSE; + is_hmp_sqii |= cmd == SCPI_CMD_GET_OUTPUT_REGULATION; + is_hmp_sqii |= cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE; + is_hmp_sqii &= devc->device->dialect == SCPI_DIALECT_HMP; + if (is_hmp_sqii) { + if (!cg) { + /* STAT:QUES:INST:ISUMx query requires channel spec. */ + sr_err("Need a channel group for regulation or OTP-active query."); + return SR_ERR_NA; + } + ret = sr_scpi_cmd_resp(sdi, devc->device->commands, + 0, NULL, data, gvtype, cmd, channel_group_name); + } else { + 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")) { + 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_COMP) { + /* Evaluate Status Register from a HP 66xx in COMP mode. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); g_variant_unref(*data); - *data = g_variant_new_string("CV"); - } else if (!strcmp(s, "CURR")) { + if (reg & (1 << 0)) + *data = g_variant_new_string("CV"); + else if (reg & (1 << 1)) + *data = g_variant_new_string("CC"); + else if (reg & (1 << 2)) + *data = g_variant_new_string("UR"); + else if (reg & (1 << 9)) + *data = g_variant_new_string("CC-"); + else + *data = g_variant_new_string(""); + } + 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, ®); g_variant_unref(*data); - *data = g_variant_new_string("CC"); + if (reg & (1 << 8)) + *data = g_variant_new_string("CV"); + else if (reg & (1 << 10)) + *data = g_variant_new_string("CC"); + else if (reg & (1 << 11)) + *data = g_variant_new_string("CC-"); + else + *data = g_variant_new_string("UR"); + } + if (devc->device->dialect == SCPI_DIALECT_HMP) { + /* Evaluate Condition Status Register from a HMP series device. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + if (reg & (1 << 0)) + *data = g_variant_new_string("CC"); + else if (reg & (1 << 1)) + *data = g_variant_new_string("CV"); + 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") && g_strcmp0(s, "")) { + + sr_err("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s); ret = SR_ERR_DATA; } } + if (cmd == SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE) { + if (devc->device->dialect == SCPI_DIALECT_HP_COMP) { + /* Evaluate Status Register from a HP 66xx in COMP mode. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 3)); + } + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) { + /* Evaluate Questionable Status Register bit 0 from a HP 66xxB. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 0)); + } + } + + if (cmd == SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE) { + if (devc->device->dialect == SCPI_DIALECT_HP_COMP) { + /* Evaluate Status Register from a HP 66xx in COMP mode. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 6)); + } + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) { + /* Evaluate Questionable Status Register bit 1 from a HP 66xxB. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 1)); + } + } + + if (cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE) { + if (devc->device->dialect == SCPI_DIALECT_HP_COMP) { + /* Evaluate Status Register from a HP 66xx in COMP mode. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 4)); + } + if (devc->device->dialect == SCPI_DIALECT_HP_66XXB || + devc->device->dialect == SCPI_DIALECT_HMP) { + /* Evaluate Questionable Status Register bit 4 from a HP 66xxB. */ + s = g_variant_get_string(*data, NULL); + sr_atoi(s, ®); + g_variant_unref(*data); + *data = g_variant_new_boolean(reg & (1 << 4)); + } + } + return ret; } @@ -433,78 +612,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 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 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 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 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 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 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 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 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 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 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 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 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 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, @@ -512,6 +713,7 @@ static int config_list(uint32_t key, GVariant **data, { struct dev_context *devc; struct sr_channel *ch; + struct pps_channel *pch; const struct channel_spec *ch_spec; int i; const char *s[16]; @@ -559,9 +761,10 @@ static int config_list(uint32_t key, GVariant **data, * specification for use in series or parallel mode. */ ch = cg->channels->data; + pch = ch->priv; if (!devc || !devc->device) return SR_ERR_ARG; - ch_spec = &(devc->device->channels[ch->index]); + ch_spec = &(devc->device->channels[pch->hw_output_idx]); switch (key) { case SR_CONF_DEVICE_OPTIONS: @@ -576,6 +779,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,34 +797,23 @@ 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); + + /* Device specific initialization before acquisition starts. */ + if (devc->device->init_acquisition) + devc->device->init_acquisition(sdi); + 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); + sr_sw_limits_acquisition_start(&devc->limits); return SR_OK; } @@ -623,16 +821,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. - */ - sr_scpi_get_double(scpi, NULL, &d); sr_scpi_source_remove(sdi->session, scpi); std_session_send_df_end(sdi);