/*
* This file is part of the libsigrok project.
*
- * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2017-2021 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
{SR_MQ_VOLTAGE, SR_MQFLAG_AC, 2, "300V"},
/* -99 is a dummy exponent for auto ranging. */
{SR_MQ_CURRENT, SR_MQFLAG_DC, -99, "Auto"},
- {SR_MQ_CURRENT, SR_MQFLAG_DC, -1, "300mV"},
- {SR_MQ_CURRENT, SR_MQFLAG_DC, 0, "3V"},
+ {SR_MQ_CURRENT, SR_MQFLAG_DC, -1, "300mA"},
+ {SR_MQ_CURRENT, SR_MQFLAG_DC, 0, "3A"},
/* -99 is a dummy exponent for auto ranging. */
{SR_MQ_CURRENT, SR_MQFLAG_AC, -99, "Auto"},
- {SR_MQ_CURRENT, SR_MQFLAG_AC, -1, "300mV"},
- {SR_MQ_CURRENT, SR_MQFLAG_AC, 0, "3V"},
+ {SR_MQ_CURRENT, SR_MQFLAG_AC, -1, "300mA"},
+ {SR_MQ_CURRENT, SR_MQFLAG_AC, 0, "3A"},
/* -99 is a dummy exponent for auto ranging. */
{SR_MQ_RESISTANCE, 0, -99, "Auto"},
- {SR_MQ_RESISTANCE, 0, 1, "30"},
- {SR_MQ_RESISTANCE, 0, 2, "300"},
- {SR_MQ_RESISTANCE, 0, 3, "3k"},
- {SR_MQ_RESISTANCE, 0, 4, "30k"},
- {SR_MQ_RESISTANCE, 0, 5, "300k"},
- {SR_MQ_RESISTANCE, 0, 6, "3M"},
- {SR_MQ_RESISTANCE, 0, 7, "30M"},
+ {SR_MQ_RESISTANCE, 0, 1, "30R"},
+ {SR_MQ_RESISTANCE, 0, 2, "300R"},
+ {SR_MQ_RESISTANCE, 0, 3, "3kR"},
+ {SR_MQ_RESISTANCE, 0, 4, "30kR"},
+ {SR_MQ_RESISTANCE, 0, 5, "300kR"},
+ {SR_MQ_RESISTANCE, 0, 6, "3MR"},
+ {SR_MQ_RESISTANCE, 0, 7, "30MR"},
/* -99 is a dummy exponent for auto ranging. */
{SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, -99, "Auto"},
{SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, 1, "30R"},
"3.5", "4.5", "5.5",
};
-/** Mapping between devc->spec_digits and digits string. */
+/** Mapping between devc->digits and digits string. */
static const char *digits_map[] = {
"", "", "", "", "3.5", "4.5", "5.5",
};
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ /*
+ * The device cannot get identified by means of SCPI queries.
+ * Neither shall non-SCPI requests get emitted before reliable
+ * identification of the device. Assume that we only get here
+ * when user specs led us to believe it's safe to communicate
+ * to the expected kind of device.
+ */
+
sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->vendor = g_strdup("Hewlett-Packard");
sdi->model = g_strdup("3478A");
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
+ const char *conn;
+
+ /* Only scan for a device when conn= was specified. */
+ conn = NULL;
+ (void)sr_serial_extract_options(options, &conn, NULL);
+ if (!conn)
+ return NULL;
+
return sr_scpi_scan(di->context, options, probe_device);
}
(void)cg;
+ if (!sdi)
+ return SR_ERR_ARG;
devc = sdi->priv;
switch (key) {
if (ret != SR_OK)
return ret;
arr[0] = g_variant_new_uint32(devc->measurement_mq);
- arr[1] = g_variant_new_uint64(devc->measurement_mq_flags);
+ arr[1] = g_variant_new_uint64(devc->measurement_mq_flag);
*data = g_variant_new_tuple(arr, 2);
break;
case SR_CONF_RANGE:
range_str = "Auto";
for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
if (rangeopts[i].mq == devc->measurement_mq &&
- rangeopts[i].mqflag == devc->measurement_mq_flags &&
+ rangeopts[i].mqflag == devc->measurement_mq_flag &&
rangeopts[i].range_exp == devc->range_exp) {
range_str = rangeopts[i].range_str;
break;
ret = hp_3478a_get_status_bytes(sdi);
if (ret != SR_OK)
return ret;
- *data = g_variant_new_string(digits_map[devc->spec_digits]);
+ *data = g_variant_new_string(digits_map[devc->digits]);
break;
default:
return SR_ERR_NA;
(void)cg;
+ if (!sdi)
+ return SR_ERR_ARG;
devc = sdi->priv;
switch (key) {
range_str = g_variant_get_string(data, NULL);
for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
if (rangeopts[i].mq == devc->measurement_mq &&
- rangeopts[i].mqflag == devc->measurement_mq_flags &&
+ rangeopts[i].mqflag == devc->measurement_mq_flag &&
g_strcmp0(rangeopts[i].range_str, range_str) == 0) {
return hp_3478a_set_range(sdi, rangeopts[i].range_exp);
}
GVariant *gvar, *arr[2];
GVariantBuilder gvb;
+ /* Only handle standard keys when no device instance is given. */
+ if (!sdi)
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+
devc = sdi->priv;
switch (key) {
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
if (rangeopts[i].mq == devc->measurement_mq &&
- rangeopts[i].mqflag == devc->measurement_mq_flags) {
+ rangeopts[i].mqflag == devc->measurement_mq_flag) {
g_variant_builder_add(&gvb, "s", rangeopts[i].range_str);
}
}