X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=fcaa1e69bafcb9a6da335a7eb7cca425cf5eec38;hb=a9ed2eb06953eb34fb019ae9a80e213c75790fab;hp=f6018e469a98b43e3e8df1bd68cfcd6d66143f69;hpb=7a396ff5c5882fb9236c2d36ae9cacef8161f616;p=libsigrok.git
diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index f6018e46..fcaa1e69 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -17,121 +17,319 @@
* along with this program. If not, see .
*/
-#include
+#include
#include "protocol.h"
-static GSList *scan(struct sr_dev_driver *di, GSList *options)
+static struct sr_dev_driver scpi_dmm_driver_info;
+
+static const uint32_t scanopts[] = {
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
+};
+
+static const uint32_t drvopts[] = {
+ SR_CONF_MULTIMETER,
+};
+
+static const uint32_t devopts_generic[] = {
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const struct scpi_command cmdset_agilent[] = {
+ { DMM_CMD_SETUP_REMOTE, "\n", },
+ { DMM_CMD_SETUP_FUNC, "CONF:%s", },
+ { DMM_CMD_QUERY_FUNC, "CONF?", },
+ { DMM_CMD_START_ACQ, "MEAS", },
+ { DMM_CMD_STOP_ACQ, "ABORT", },
+ { DMM_CMD_QUERY_VALUE, "READ?", },
+ { DMM_CMD_QUERY_PREC, "CONF?", },
+ ALL_ZERO,
+};
+
+static const struct mqopt_item mqopts_agilent_34405a[] = {
+ { SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT ", NO_DFLT_PREC, },
+ { SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, },
+ { SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR ", NO_DFLT_PREC, },
+ { SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, },
+ { SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, },
+ { SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, },
+ { SR_MQ_CAPACITANCE, 0, "CAP", "CAP ", NO_DFLT_PREC, },
+ { SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, },
+ { SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP ", NO_DFLT_PREC, },
+ { SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, },
+};
+
+SR_PRIV const struct scpi_dmm_model models[] = {
+ {
+ "Agilent", "34405A",
+ 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+ scpi_dmm_get_meas_agilent,
+ ARRAY_AND_SIZE(devopts_generic),
+ },
+};
+
+static const struct scpi_dmm_model *is_compatible(const char *vendor, const char *model)
{
- struct drv_context *drvc;
- GSList *devices;
+ size_t i;
+ const struct scpi_dmm_model *entry;
+
+ for (i = 0; i < ARRAY_SIZE(models); i++) {
+ entry = &models[i];
+ if (!entry->vendor || !entry->model)
+ continue;
+ if (strcmp(vendor, entry->vendor) != 0)
+ continue;
+ if (strcmp(model, entry->model) != 0)
+ continue;
+ return entry;
+ }
- (void)options;
+ return NULL;
+}
- devices = NULL;
- drvc = di->context;
- drvc->instances = NULL;
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
+{
+ struct sr_scpi_hw_info *hw_info;
+ int ret;
+ const char *vendor;
+ const struct scpi_dmm_model *model;
+ struct sr_dev_inst *sdi;
+ struct dev_context *devc;
+ size_t i;
+ gchar *channel_name;
+
+ scpi_dmm_cmd_delay(scpi);
+ ret = sr_scpi_get_hw_id(scpi, &hw_info);
+ if (ret != SR_OK) {
+ sr_info("Could not get IDN response.");
+ return NULL;
+ }
+ vendor = sr_vendor_alias(hw_info->manufacturer);
+ model = is_compatible(vendor, hw_info->model);
+ if (!model) {
+ sr_scpi_hw_info_free(hw_info);
+ return NULL;
+ }
- /* TODO: scan for devices, either based on a SR_CONF_CONN option
- * or on a USB scan. */
+ sdi = g_malloc0(sizeof(*sdi));
+ sdi->vendor = g_strdup(hw_info->manufacturer);
+ sdi->model = g_strdup(hw_info->model);
+ sdi->version = g_strdup(hw_info->firmware_version);
+ sdi->serial_num = g_strdup(hw_info->serial_number);
+ sdi->conn = scpi;
+ sdi->driver = &scpi_dmm_driver_info;
+ sdi->inst_type = SR_INST_SCPI;
+ sr_scpi_hw_info_free(hw_info);
+
+ devc = g_malloc0(sizeof(*devc));
+ sdi->priv = devc;
+ devc->num_channels = model->num_channels;
+ devc->cmdset = model->cmdset;
+ devc->model = model;
+
+ for (i = 0; i < devc->num_channels; i++) {
+ channel_name = g_strdup_printf("P%zu", i + 1);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, channel_name);
+ }
- return devices;
+ return sdi;
+}
+
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
+{
+ return sr_scpi_scan(di->context, options, probe_device);
}
static int dev_open(struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct sr_scpi_dev_inst *scpi;
+ int ret;
- /* TODO: get handle from sdi->conn and open it. */
+ scpi = sdi->conn;
+ ret = sr_scpi_open(scpi);
+ if (ret < 0) {
+ sr_err("Failed to open SCPI device: %s.", sr_strerror(ret));
+ return SR_ERR;
+ }
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
- (void)sdi;
+ struct sr_scpi_dev_inst *scpi;
- /* TODO: get handle from sdi->conn and close it. */
+ scpi = sdi->conn;
+ if (!scpi)
+ return SR_ERR_BUG;
- return SR_OK;
+ sr_dbg("DIAG: sdi->status %d.", sdi->status - SR_ST_NOT_FOUND);
+ if (sdi->status <= SR_ST_INACTIVE)
+ return SR_OK;
+
+ return sr_scpi_close(scpi);
}
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;
+ enum sr_mq mq;
+ enum sr_mqflag mqflag;
+ GVariant *arr[2];
int ret;
- (void)sdi;
- (void)data;
(void)cg;
- ret = SR_OK;
+ devc = sdi->priv;
+
switch (key) {
- /* TODO */
+ case SR_CONF_LIMIT_SAMPLES:
+ case SR_CONF_LIMIT_MSEC:
+ return sr_sw_limits_config_get(&devc->limits, key, data);
+ case SR_CONF_MEASURED_QUANTITY:
+ ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL, NULL);
+ if (ret != SR_OK)
+ return ret;
+ arr[0] = g_variant_new_uint32(mq);
+ arr[1] = g_variant_new_uint64(mqflag);
+ *data = g_variant_new_tuple(arr, ARRAY_SIZE(arr));
+ return SR_OK;
default:
return 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)
{
- int ret;
+ struct dev_context *devc;
+ enum sr_mq mq;
+ enum sr_mqflag mqflag;
+ GVariant *tuple_child;
- (void)sdi;
- (void)data;
(void)cg;
- ret = SR_OK;
+ devc = sdi->priv;
+
switch (key) {
- /* TODO */
+ case SR_CONF_LIMIT_SAMPLES:
+ case SR_CONF_LIMIT_MSEC:
+ return sr_sw_limits_config_set(&devc->limits, key, data);
+ case SR_CONF_MEASURED_QUANTITY:
+ tuple_child = g_variant_get_child_value(data, 0);
+ mq = g_variant_get_uint32(tuple_child);
+ tuple_child = g_variant_get_child_value(data, 1);
+ mqflag = g_variant_get_uint64(tuple_child);
+ g_variant_unref(tuple_child);
+ return scpi_dmm_set_mq(sdi, mq, mqflag);
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
-
- return ret;
}
static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- int ret;
+ struct dev_context *devc;
+ GVariant *gvar, *arr[2];
+ GVariantBuilder gvb;
+ size_t i;
- (void)sdi;
- (void)data;
(void)cg;
- ret = SR_OK;
+ devc = sdi ? sdi->priv : NULL;
+
switch (key) {
- /* TODO */
+ case SR_CONF_SCAN_OPTIONS:
+ case SR_CONF_DEVICE_OPTIONS:
+ if (!devc)
+ return STD_CONFIG_LIST(key, data, sdi, cg,
+ scanopts, drvopts, devopts_generic);
+ return std_opts_config_list(key, data, sdi, cg,
+ ARRAY_AND_SIZE(scanopts), ARRAY_AND_SIZE(drvopts),
+ devc->model->devopts, devc->model->devopts_size);
+ case SR_CONF_MEASURED_QUANTITY:
+ /* TODO Use std_gvar_measured_quantities() when available. */
+ if (!devc)
+ return SR_ERR_ARG;
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ for (i = 0; i < devc->model->mqopt_size; i++) {
+ arr[0] = g_variant_new_uint32(devc->model->mqopts[i].mq);
+ arr[1] = g_variant_new_uint64(devc->model->mqopts[i].mqflag);
+ gvar = g_variant_new_tuple(arr, ARRAY_SIZE(arr));
+ g_variant_builder_add_value(&gvb, gvar);
+ }
+ *data = g_variant_builder_end(&gvb);
+ return SR_OK;
default:
+ (void)devc;
return SR_ERR_NA;
}
-
- return ret;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
- /* TODO: configure hardware, reset acquisition state, set up
- * callbacks and send header packet. */
+ struct sr_scpi_dev_inst *scpi;
+ struct dev_context *devc;
+ int ret;
+ const struct mqopt_item *item;
+ const char *command;
+
+ scpi = sdi->conn;
+ devc = sdi->priv;
+
+ ret = scpi_dmm_get_mq(sdi, &devc->start_acq_mq.curr_mq,
+ &devc->start_acq_mq.curr_mqflag, NULL, &item);
+ if (ret != SR_OK)
+ return ret;
+
+ command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_START_ACQ);
+ if (command && *command) {
+ scpi_dmm_cmd_delay(scpi);
+ ret = sr_scpi_send(scpi, command);
+ if (ret != SR_OK)
+ return ret;
+ }
- (void)sdi;
+ sr_sw_limits_acquisition_start(&devc->limits);
+ ret = std_session_send_df_header(sdi);
+ if (ret != SR_OK)
+ return ret;
+
+ ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
+ scpi_dmm_receive_data, (void *)sdi);
+ if (ret != SR_OK)
+ return ret;
return SR_OK;
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- /* TODO: stop acquisition. */
+ struct sr_scpi_dev_inst *scpi;
+ struct dev_context *devc;
+ const char *command;
+
+ scpi = sdi->conn;
+ devc = sdi->priv;
- (void)sdi;
+ command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_STOP_ACQ);
+ if (command && *command) {
+ scpi_dmm_cmd_delay(scpi);
+ (void)sr_scpi_send(scpi, command);
+ }
+ sr_scpi_source_remove(sdi->session, scpi);
+
+ std_session_send_df_end(sdi);
return SR_OK;
}
-SR_PRIV struct sr_dev_driver scpi_dmm_driver_info = {
+static struct sr_dev_driver scpi_dmm_driver_info = {
.name = "scpi-dmm",
.longname = "SCPI DMM",
.api_version = 1,
@@ -149,5 +347,4 @@ SR_PRIV struct sr_dev_driver scpi_dmm_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
-
SR_REGISTER_DEV_DRIVER(scpi_dmm_driver_info);