* This file is part of the libsigrok project.
*
* Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2017,2019 Frank Stettner <frank-stettner@gmx.net>
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <string.h>
#include <strings.h>
+#include "scpi.h"
#include "protocol.h"
-SR_PRIV struct sr_dev_driver scpi_pps_driver_info;
-extern unsigned int num_pps_profiles;
-extern const struct scpi_pps pps_profiles[];
+static struct sr_dev_driver scpi_pps_driver_info;
+static struct sr_dev_driver hp_ib_pps_driver_info;
static const uint32_t scanopts[] = {
SR_CONF_CONN,
{ SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
{ SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
{ SR_MQ_POWER, SCPI_CMD_GET_MEAS_POWER, "P" },
+ { SR_MQ_FREQUENCY, SCPI_CMD_GET_MEAS_FREQUENCY, "F" },
};
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
+ int (*get_hw_id)(struct sr_scpi_dev_inst *scpi,
+ struct sr_scpi_hw_info **scpi_response))
{
struct dev_context *devc;
struct sr_dev_inst *sdi;
const char *vendor;
char ch_name[16];
- if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+ if (get_hw_id(scpi, &hw_info) != SR_OK) {
sr_info("Couldn't get IDN response.");
return NULL;
}
device = NULL;
for (i = 0; i < num_pps_profiles; i++) {
- vendor = get_vendor(hw_info->manufacturer);
- if (strcasecmp(vendor, pps_profiles[i].vendor))
+ vendor = sr_vendor_alias(hw_info->manufacturer);
+ if (g_ascii_strcasecmp(vendor, pps_profiles[i].vendor))
continue;
model_re = g_regex_new(pps_profiles[i].model, 0, 0, NULL);
if (g_regex_match(model_re, hw_info->model, 0, &model_mi))
}
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup(vendor);
sdi->model = g_strdup(hw_info->model);
sdi->version = g_strdup(hw_info->firmware_version);
devc = g_malloc0(sizeof(struct dev_context));
devc->device = device;
+ sr_sw_limits_init(&devc->limits);
sdi->priv = devc;
if (device->num_channels) {
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(sdi, 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);
for (i = 0; i < num_channel_groups; i++) {
cgs = &channel_groups[i];
- cg = g_malloc0(sizeof(struct sr_channel_group));
- cg->name = g_strdup(cgs->name);
+ cg = sr_channel_group_new(sdi, cgs->name, NULL);
for (j = 0, mask = 1; j < 64; j++, mask <<= 1) {
if (cgs->channel_index_mask & mask) {
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);
}
pcg = g_malloc0(sizeof(struct pps_channel_group));
pcg->features = cgs->features;
cg->priv = pcg;
- sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
sr_scpi_hw_info_free(hw_info);
hw_info = NULL;
- scpi_cmd(sdi, SCPI_CMD_LOCAL);
- sr_scpi_close(scpi);
+ /* 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;
}
-static GSList *scan(struct sr_dev_driver *di, GSList *options)
+static gchar *hpib_get_revision(struct sr_scpi_dev_inst *scpi)
+{
+ int ret;
+ gboolean matches;
+ char *response;
+ GRegex *version_regex;
+
+ ret = sr_scpi_get_string(scpi, "ROM?", &response);
+ if (ret != SR_OK && !response)
+ return NULL;
+
+ /* Example version string: "B01 B01" */
+ version_regex = g_regex_new("[A-Z][0-9]{2} [A-Z][0-9]{2}", 0, 0, NULL);
+ matches = g_regex_match(version_regex, response, 0, NULL);
+ g_regex_unref(version_regex);
+
+ if (!matches) {
+ /* Not a valid version string. Ignore it. */
+ g_free(response);
+ response = NULL;
+ } else {
+ /* Replace space with dot. */
+ response[3] = '.';
+ }
+
+ return response;
+}
+
+/*
+ * This function assumes the response is in the form "HP<model_number>"
+ *
+ * HP made many GPIB (then called HP-IB) instruments before the SCPI command
+ * set was introduced into the standard. We haven't seen any non-HP instruments
+ * which respond to the "ID?" query, so assume all are HP for now.
+ */
+static int hpib_get_hw_id(struct sr_scpi_dev_inst *scpi,
+ struct sr_scpi_hw_info **scpi_response)
+{
+ int ret;
+ char *response;
+ struct sr_scpi_hw_info *hw_info;
+
+ ret = sr_scpi_get_string(scpi, "ID?", &response);
+ if ((ret != SR_OK) || !response)
+ return SR_ERR;
+
+ hw_info = g_malloc0(sizeof(struct sr_scpi_hw_info));
+
+ *scpi_response = hw_info;
+ hw_info->model = response;
+ hw_info->firmware_version = hpib_get_revision(scpi);
+ hw_info->manufacturer = g_strdup("HP");
+
+ return SR_OK;
+}
+
+static struct sr_dev_inst *probe_scpi_pps_device(struct sr_scpi_dev_inst *scpi)
{
- return sr_scpi_scan(di->priv, options, probe_device);
+ return probe_device(scpi, sr_scpi_get_hw_id);
}
-static GSList *dev_list(const struct sr_dev_driver *di)
+static struct sr_dev_inst *probe_hpib_pps_device(struct sr_scpi_dev_inst *scpi)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return probe_device(scpi, hpib_get_hw_id);
}
-static int dev_clear(const struct sr_dev_driver *di)
+static GSList *scan_scpi_pps(struct sr_dev_driver *di, GSList *options)
{
- return std_dev_clear(di, NULL);
+ return sr_scpi_scan(di->context, options, probe_scpi_pps_device);
+}
+
+static GSList *scan_hpib_pps(struct sr_dev_driver *di, GSList *options)
+{
+ const char *conn;
+
+ /*
+ * Only scan for HP-IB devices when conn= was specified, to not
+ * break SCPI devices' operation.
+ */
+ conn = NULL;
+ (void)sr_serial_extract_options(options, &conn, NULL);
+ if (!conn)
+ return NULL;
+
+ return sr_scpi_scan(di->context, options, probe_hpib_pps_device);
}
static int dev_open(struct sr_dev_inst *sdi)
struct sr_scpi_dev_inst *scpi;
GVariant *beeper;
- if (sdi->status != SR_ST_INACTIVE)
- return SR_ERR;
-
scpi = sdi->conn;
if (sr_scpi_open(scpi) < 0)
return SR_ERR;
- sdi->status = SR_ST_ACTIVE;
-
- scpi_cmd(sdi, SCPI_CMD_REMOTE);
devc = sdi->priv;
+
+ /* 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, &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, SCPI_CMD_BEEPER_DISABLE);
+ sr_scpi_cmd(sdi, devc->device->commands,
+ 0, NULL, SCPI_CMD_BEEPER_DISABLE);
}
g_variant_unref(beeper);
}
struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
scpi = sdi->conn;
- if (scpi) {
- if (devc->beeper_was_set)
- scpi_cmd(sdi, SCPI_CMD_BEEPER_ENABLE);
- scpi_cmd(sdi, SCPI_CMD_LOCAL);
- sr_scpi_close(scpi);
- sdi->status = SR_ST_INACTIVE;
- }
- return SR_OK;
+ if (!scpi)
+ return SR_ERR_BUG;
+
+ if (devc->beeper_was_set)
+ 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);
}
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
{
- struct dev_context *devc;
-
- devc = priv;
g_free(devc->channels);
g_free(devc->channel_groups);
- g_free(devc);
}
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
{
- return std_dev_clear(di, clear_helper);
+ 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;
+ int reg;
+ gboolean is_hmp_sqii;
if (!sdi)
return SR_ERR_ARG;
gvtype = NULL;
cmd = -1;
switch (key) {
- case SR_CONF_OUTPUT_ENABLED:
+ case SR_CONF_ENABLED:
gvtype = G_VARIANT_TYPE_BOOLEAN;
cmd = SCPI_CMD_GET_OUTPUT_ENABLED;
break;
- case SR_CONF_OUTPUT_VOLTAGE:
+ case SR_CONF_VOLTAGE:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ case SR_CONF_VOLTAGE_TARGET:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_VOLTAGE_TARGET;
break;
- case SR_CONF_OUTPUT_CURRENT:
+ case SR_CONF_OUTPUT_FREQUENCY:
+ gvtype = G_VARIANT_TYPE_DOUBLE;
+ cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
+ break;
+ case SR_CONF_OUTPUT_FREQUENCY_TARGET:
+ gvtype = G_VARIANT_TYPE_DOUBLE;
+ cmd = SCPI_CMD_GET_FREQUENCY_TARGET;
+ break;
+ case SR_CONF_CURRENT:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_CURRENT;
break;
- case SR_CONF_OUTPUT_CURRENT_LIMIT:
+ case SR_CONF_CURRENT_LIMIT:
gvtype = G_VARIANT_TYPE_DOUBLE;
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:
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:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD;
break;
+ case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+ gvtype = G_VARIANT_TYPE_DOUBLE;
+ cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_DELAY;
+ 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_OUTPUT_REGULATION:
+ 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;
+
+ 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) {
+ 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);
+ 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);
+ 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 (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));
+ }
}
- if (gvtype) {
- if (cg)
- select_channel(sdi, cg->channels->data);
- ret = scpi_cmd_resp(sdi, data, gvtype, cmd);
- } else
- ret = SR_ERR_NA;
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 (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ channel_group_cmd = 0;
+ channel_group_name = NULL;
+ if (cg) {
+ channel_group_cmd = SCPI_CMD_SELECT_CHANNEL;
+ channel_group_name = g_strdup(cg->name);
+ }
- if (cg)
- /* Channel group specified. */
- select_channel(sdi, cg->channels->data);
+ devc = sdi->priv;
- ret = SR_OK;
switch (key) {
- case SR_CONF_OUTPUT_ENABLED:
+ case SR_CONF_ENABLED:
if (g_variant_get_boolean(data))
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE);
+ ret = sr_scpi_cmd(sdi, devc->device->commands,
+ channel_group_cmd, channel_group_name,
+ SCPI_CMD_SET_OUTPUT_ENABLE);
else
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE);
+ ret = sr_scpi_cmd(sdi, devc->device->commands,
+ channel_group_cmd, channel_group_name,
+ SCPI_CMD_SET_OUTPUT_DISABLE);
break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ case SR_CONF_VOLTAGE_TARGET:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, d);
+ 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_CURRENT_LIMIT:
+ case SR_CONF_OUTPUT_FREQUENCY_TARGET:
d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, d);
+ 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 = 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, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE);
+ 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, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE);
+ 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, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, d);
+ 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, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE);
+ 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, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE);
+ 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, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d);
+ 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_CURRENT_PROTECTION_DELAY:
+ d = g_variant_get_double(data);
+ ret = sr_scpi_cmd(sdi, devc->device->commands,
+ channel_group_cmd, channel_group_name,
+ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DELAY, d);
break;
case SR_CONF_OVER_TEMPERATURE_PROTECTION:
if (g_variant_get_boolean(data))
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE);
+ 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, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE);
+ 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;
+ ret = sr_sw_limits_config_set(&devc->limits, key, data);
}
+ 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;
+ struct pps_channel *pch;
const struct channel_spec *ch_spec;
- GVariant *gvar;
- GVariantBuilder gvb;
- int ret, i;
+ int i;
const char *s[16];
- /* Always available, even without sdi. */
- if (key == SR_CONF_SCAN_OPTIONS) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- return SR_OK;
- } else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
- return SR_OK;
- }
+ devc = (sdi) ? sdi->priv : NULL;
- if (!sdi)
- return SR_ERR_ARG;
- devc = sdi->priv;
-
- ret = SR_OK;
if (!cg) {
- /* No channel group: global options. */
switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devc->device->devopts, devc->device->num_devopts,
- sizeof(uint32_t));
+ return std_opts_config_list(key, data, sdi, cg,
+ ARRAY_AND_SIZE(scanopts),
+ ARRAY_AND_SIZE(drvopts),
+ (devc && devc->device) ? devc->device->devopts : NULL,
+ (devc && devc->device) ? devc->device->num_devopts : 0);
break;
- case SR_CONF_OUTPUT_CHANNEL_CONFIG:
+ case SR_CONF_CHANNEL_CONFIG:
+ if (!devc || !devc->device)
+ return SR_ERR_ARG;
/* Not used. */
i = 0;
if (devc->device->features & PPS_INDEPENDENT)
return SR_ERR_NA;
}
} else {
- /* Channel group specified. */
/*
* Per-channel-group options depending on a channel are actually
* done with the first channel. Channel groups in PPS can have
* 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[pch->hw_output_idx]);
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devc->device->devopts_cg, devc->device->num_devopts_cg,
- sizeof(uint32_t));
+ *data = std_gvar_array_u32(devc->device->devopts_cg, devc->device->num_devopts_cg);
break;
- case SR_CONF_OUTPUT_VOLTAGE_TARGET:
- ch_spec = &(devc->device->channels[ch->index]);
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- /* Min, max, write resolution. */
- for (i = 0; i < 3; i++) {
- gvar = g_variant_new_double(ch_spec->voltage[i]);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ case SR_CONF_VOLTAGE_TARGET:
+ *data = std_gvar_min_max_step_array(ch_spec->voltage);
break;
- case SR_CONF_OUTPUT_CURRENT_LIMIT:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- /* Min, max, step. */
- for (i = 0; i < 3; i++) {
- ch_spec = &(devc->device->channels[ch->index]);
- gvar = g_variant_new_double(ch_spec->current[i]);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ case SR_CONF_OUTPUT_FREQUENCY_TARGET:
+ *data = std_gvar_min_max_step_array(ch_spec->frequency);
+ break;
+ 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;
+ case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+ *data = std_gvar_min_max_step_array(ch_spec->ocp_delay);
break;
default:
return SR_ERR_NA;
}
}
- return ret;
+ return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+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;
-
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ int ret;
devc = sdi->priv;
scpi = sdi->conn;
- devc->cb_data = cb_data;
+
+ /* 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, LOG_PREFIX);
-
- /* Prime the pipe with the first channel's fetch. */
- ch = next_enabled_channel(sdi, NULL);
- pch = ch->priv;
- if ((ret = select_channel(sdi, ch)) != SR_OK)
- return ret;
- if (pch->mq == SR_MQ_VOLTAGE)
- cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
- 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, cmd, pch->hwname);
+ std_session_send_df_header(sdi);
+ sr_sw_limits_acquisition_start(&devc->limits);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- struct sr_datafeed_packet packet;
struct sr_scpi_dev_inst *scpi;
- float f;
-
- (void)cb_data;
-
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
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_float(scpi, NULL, &f);
sr_scpi_source_remove(sdi->session, scpi);
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi);
return SR_OK;
}
-SR_PRIV struct sr_dev_driver scpi_pps_driver_info = {
+static struct sr_dev_driver scpi_pps_driver_info = {
.name = "scpi-pps",
.longname = "SCPI PPS",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
- .scan = scan,
- .dev_list = dev_list,
+ .init = std_init,
+ .cleanup = std_cleanup,
+ .scan = scan_scpi_pps,
+ .dev_list = std_dev_list,
+ .dev_clear = dev_clear,
+ .config_get = config_get,
+ .config_set = config_set,
+ .config_list = config_list,
+ .dev_open = dev_open,
+ .dev_close = dev_close,
+ .dev_acquisition_start = dev_acquisition_start,
+ .dev_acquisition_stop = dev_acquisition_stop,
+ .context = NULL,
+};
+
+static struct sr_dev_driver hp_ib_pps_driver_info = {
+ .name = "hpib-pps",
+ .longname = "HP-IB PPS",
+ .api_version = 1,
+ .init = std_init,
+ .cleanup = std_cleanup,
+ .scan = scan_hpib_pps,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
+SR_REGISTER_DEV_DRIVER(scpi_pps_driver_info);
+SR_REGISTER_DEV_DRIVER(hp_ib_pps_driver_info);
projects / libsigrok.git / blobdiff