{
if (WITH_CMD_DELAY)
g_usleep(WITH_CMD_DELAY * 1000);
- sr_scpi_get_opc(scpi);
+
+ if (!scpi->no_opc_command)
+ sr_scpi_get_opc(scpi);
}
SR_PRIV const struct mqopt_item *scpi_dmm_lookup_mq_number(
ret = sr_scpi_get_string(sdi->conn, command, &response);
if (ret != SR_OK)
return ret;
- if (!response || !*response)
+ if (!response || !*response) {
+ g_free(response);
return SR_ERR_NA;
+ }
have = response;
if (*have == '"')
have++;
if (mqitem)
*mqitem = item;
ret = SR_OK;
+ } else {
+ sr_warn("Unknown measurement quantity: %s", have);
}
if (rsp) {
ret = sr_scpi_send(sdi->conn, command, mode);
if (ret != SR_OK)
return ret;
+ if (item->drv_flags & FLAG_CONF_DELAY)
+ g_usleep(devc->model->conf_delay_us);
return SR_OK;
}
+SR_PRIV const char *scpi_dmm_get_range_text(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ int ret;
+ const struct mqopt_item *mqitem;
+ gboolean is_auto;
+ char *response, *pos;
+ double range;
+ int digits;
+
+ devc = sdi->priv;
+
+ ret = scpi_dmm_get_mq(sdi, NULL, NULL, NULL, &mqitem);
+ if (ret != SR_OK)
+ return NULL;
+ if (!mqitem || !mqitem->scpi_func_setup)
+ return NULL;
+ if (mqitem->drv_flags & FLAG_NO_RANGE)
+ return NULL;
+
+ scpi_dmm_cmd_delay(sdi->conn);
+ ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL,
+ DMM_CMD_QUERY_RANGE_AUTO, mqitem->scpi_func_setup);
+ if (ret != SR_OK)
+ return NULL;
+ ret = sr_scpi_get_bool(sdi->conn, NULL, &is_auto);
+ if (ret != SR_OK)
+ return NULL;
+ if (is_auto)
+ return "auto";
+
+ /*
+ * Get the response into a text buffer. The range value may be
+ * followed by a precision value separated by comma. Common text
+ * to number conversion support code may assume that the input
+ * text spans to the end of the text, need not accept trailing
+ * text which is not part of a number.
+ */
+ scpi_dmm_cmd_delay(sdi->conn);
+ ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL,
+ DMM_CMD_QUERY_RANGE, mqitem->scpi_func_setup);
+ if (ret != SR_OK)
+ return NULL;
+ response = NULL;
+ ret = sr_scpi_get_string(sdi->conn, NULL, &response);
+ if (ret != SR_OK) {
+ g_free(response);
+ return NULL;
+ }
+ pos = strchr(response, ',');
+ if (pos)
+ *pos = '\0';
+ ret = sr_atod_ascii_digits(response, &range, &digits);
+ g_free(response);
+ if (ret != SR_OK)
+ return NULL;
+ snprintf(devc->range_text, sizeof(devc->range_text), "%lf", range);
+ return devc->range_text;
+}
+
+SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi,
+ const char *range)
+{
+ struct dev_context *devc;
+ int ret;
+ const struct mqopt_item *item;
+ gboolean is_auto;
+
+ devc = sdi->priv;
+
+ if (!range || !*range)
+ return SR_ERR_ARG;
+
+ ret = scpi_dmm_get_mq(sdi, NULL, NULL, NULL, &item);
+ if (ret != SR_OK)
+ return ret;
+ if (!item || !item->scpi_func_setup)
+ return SR_ERR_ARG;
+ if (item->drv_flags & FLAG_NO_RANGE)
+ return SR_ERR_NA;
+
+ is_auto = g_ascii_strcasecmp(range, "auto") == 0;
+ scpi_dmm_cmd_delay(sdi->conn);
+ ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL, DMM_CMD_SETUP_RANGE,
+ item->scpi_func_setup, is_auto ? "AUTO" : range);
+ if (ret != SR_OK)
+ return ret;
+ if (item->drv_flags & FLAG_CONF_DELAY)
+ g_usleep(devc->model->conf_delay_us);
+
+ return SR_OK;
+}
+
+SR_PRIV GVariant *scpi_dmm_get_range_text_list(const struct sr_dev_inst *sdi)
+{
+ GVariantBuilder gvb;
+ GVariant *list;
+
+ (void)sdi;
+
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ /* TODO
+ * Add more items _when_ the connected device supports a fixed
+ * or known set of ranges. The Agilent protocol is flexible and
+ * tolerant, set requests accept any value, and the device will
+ * use an upper limit which is at least the specified value.
+ * The values are communicated as mere numbers without units.
+ */
+ list = g_variant_builder_end(&gvb);
+
+ return list;
+}
+
SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
{
struct sr_scpi_dev_inst *scpi;
int sig_digits, val_exp;
int digits;
enum sr_unit unit;
+ double limit;
scpi = sdi->conn;
devc = sdi->priv;
if (ret != SR_OK)
return ret;
g_strstrip(response);
- use_double = devc->model->digits > 6;
+ use_double = devc->model->digits >= 6;
ret = sr_atod_ascii(response, &info->d_value);
if (ret != SR_OK) {
g_free(response);
}
if (!response)
return SR_ERR;
- if (info->d_value > +9e37) {
+ limit = 9e37;
+ if (info->d_value > +limit) {
info->d_value = +INFINITY;
- } else if (info->d_value < -9e37) {
+ } else if (info->d_value < -limit) {
info->d_value = -INFINITY;
} else {
p = response;
analog->data = &info->f_value;
analog->encoding->unitsize = sizeof(info->f_value);
}
- analog->encoding->is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
- analog->encoding->is_bigendian = TRUE;
-#else
- analog->encoding->is_bigendian = FALSE;
-#endif
analog->encoding->digits = digits;
analog->meaning->mq = mq;
analog->meaning->mqflags = mqflag;
const char *command;
char *response;
gboolean use_double;
+ double limit;
int sig_digits, val_exp;
int digits;
enum sr_unit unit;
}
if (!response)
return SR_ERR;
- if (info->d_value > +9e37) {
+ limit = 9e37;
+ if (devc->model->infinity_limit != 0.0)
+ limit = devc->model->infinity_limit;
+ if (info->d_value >= +limit) {
info->d_value = +INFINITY;
- } else if (info->d_value < -9e37) {
+ } else if (info->d_value <= -limit) {
info->d_value = -INFINITY;
} else {
p = response;
return ret;
/*
- * Make sure we report "INFINITY" when meter displays "0L"
+ * Make sure we report "INFINITY" when meter displays "0L".
*/
switch (mmode) {
case 7:
case 16:
- /* in resitance modes 0L reads as 1.20000E8 or 1.99999E8 */
- if (!strncmp(devc->model->model,"GDM8255A",8)) {
- if (info->d_value >= 1.99999e8)
- info->d_value = +INFINITY;
- } else {
- if (info->d_value >= 1.2e8)
- info->d_value = +INFINITY;
- }
+ /* In resitance modes 0L reads as 1.20000E8 or 1.99999E8. */
+ limit = 1.2e8;
+ if (strcmp(devc->model->model, "GDM8255A") == 0)
+ limit = 1.99999e8;
+ if (info->d_value >= limit)
+ info->d_value = +INFINITY;
break;
case 13:
- /* In continuity mode 0L reads as 1.20000E3 */
+ /* In continuity mode 0L reads as 1.20000E3. */
if (info->d_value >= 1.2e3)
info->d_value = +INFINITY;
break;
case 17:
- /* in diode mode 0L reads as 1.00000E0 */
+ /* In diode mode 0L reads as 1.00000E0. */
if (info->d_value == 1.0e0)
info->d_value = +INFINITY;
break;
}
/*
- * Calculate 'digits' based on the precision reading result
- * done during start of acquisition.
- *
- * GW-Instek manual gives following info regarding resolution:
- *
- * Type Digit
- * -------------------- ------------
- * Slow 5 1/2
- * Medium 4 1/2
- * Fast 3 1/2
+ * Calculate 'digits' based on the result of the optional
+ * precision reading which was done at acquisition start.
+ * The GW-Instek manual gives the following information
+ * regarding the resolution:
*
+ * Type Digit
+ * -------- ------
+ * Slow 5 1/2
+ * Medium 4 1/2
+ * Fast 3 1/2
*/
-
digits = devc->model->digits;
if (devc->precision && *devc->precision) {
- if (!strncmp(devc->precision, "Slow", 4))
+ if (g_str_has_prefix(devc->precision, "Slow"))
digits = 6;
- else if (!strncmp(devc->precision, "Mid", 3))
+ else if (g_str_has_prefix(devc->precision, "Mid"))
digits = 5;
- else if (!strncmp(devc->precision, "Fast", 4))
+ else if (g_str_has_prefix(devc->precision, "Fast"))
digits = 4;
else
- sr_info("%s: Unknown precision: '%s'",
- __func__, devc->precision);
+ sr_info("Unknown precision: '%s'", devc->precision);
}
/*
analog->data = &info->f_value;
analog->encoding->unitsize = sizeof(info->f_value);
}
- analog->encoding->is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
- analog->encoding->is_bigendian = TRUE;
-#else
- analog->encoding->is_bigendian = FALSE;
-#endif
analog->encoding->digits = digits;
analog->meaning->mq = mq;
analog->meaning->mqflags = mqflag;
projects / libsigrok.git / blobdiff