scpi-dmm: add support to get/set range on Agilent protocol using meters

[libsigrok.git] / src / hardware / scpi-dmm / api.c

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 7e4b4e5b4f73d4c74e98bda762bf7d25799aa47f..32156243af63cb7c199d0ef96ba52e5e3f5b02c8 100644 (file)
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -39,14 +39,27 @@ static const uint32_t devopts_generic[] = {
        SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
+static const uint32_t devopts_generic_range[] = {
+       SR_CONF_CONTINUOUS,
+       SR_CONF_CONN | SR_CONF_GET,
+       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,
+       SR_CONF_RANGE | 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_START_ACQ, "INIT", },
        { DMM_CMD_STOP_ACQ, "ABORT", },
        { DMM_CMD_QUERY_VALUE, "READ?", },
        { DMM_CMD_QUERY_PREC, "CONF?", },
+       { DMM_CMD_QUERY_RANGE_AUTO, "%s:RANGE:AUTO?", },
+       { DMM_CMD_QUERY_RANGE, "%s:RANGE?", },
+       { DMM_CMD_SETUP_RANGE_AUTO, "%s:RANGE:AUTO ON", },
+       { DMM_CMD_SETUP_RANGE, "%s:RANGE %s", },
        ALL_ZERO,
 };
 
@@ -190,43 +203,49 @@ 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),
-               0, 0,
+               ARRAY_AND_SIZE(devopts_generic_range),
+               0, 0, FALSE,
+               scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL,
        },
        {
                "Agilent", "34410A",
                1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34405a),
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
-               0, 0,
+               0, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "GW", "GDM8251A",
                1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
                scpi_dmm_get_meas_gwinstek,
                ARRAY_AND_SIZE(devopts_generic),
-               1000 * 2500, 0,
+               1000 * 2500, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "GW", "GDM8255A",
                1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
                scpi_dmm_get_meas_gwinstek,
                ARRAY_AND_SIZE(devopts_generic),
-               1000 * 2500, 0,
+               1000 * 2500, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "GWInstek", "GDM9060",
                1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
-               0, 0,
+               0, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "GWInstek", "GDM9061",
                1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
-               0, 0,
+               0, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "HP", "34401A",
@@ -234,21 +253,24 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
                /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
-               1000 * 1500, 0,
+               1000 * 1500, 0, FALSE,
+               NULL, NULL, NULL,
        },
        {
                "Keysight", "34465A",
-               1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+               1, 6, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
                scpi_dmm_get_meas_agilent,
-               ARRAY_AND_SIZE(devopts_generic),
-               0, 0,
+               ARRAY_AND_SIZE(devopts_generic_range),
+               0, 0, FALSE,
+               scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL,
        },
        {
                "OWON", "XDM2041",
                1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
                scpi_dmm_get_meas_gwinstek,
                ARRAY_AND_SIZE(devopts_generic),
-               0, 1e9,
+               0, 1e9, TRUE,
+               NULL, NULL, NULL,
        },
 };
 
@@ -302,10 +324,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
        gchar *channel_name;
        const char *command;
 
-       if (!probe_opc_support(scpi))
-               scpi->no_opc_command = TRUE;
-
-       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.");
@@ -318,6 +336,9 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                return NULL;
        }
 
+       if (model->check_opc && !probe_opc_support(scpi))
+               scpi->no_opc_command = TRUE;
+
        sdi = g_malloc0(sizeof(*sdi));
        sdi->vendor = g_strdup(hw_info->manufacturer);
        sdi->model = g_strdup(hw_info->model);
@@ -414,6 +435,7 @@ static int config_get(uint32_t key, GVariant **data,
        enum sr_mqflag mqflag;
        GVariant *arr[2];
        int ret;
+       const char *range;
 
        (void)cg;
 
@@ -436,6 +458,14 @@ static int config_get(uint32_t key, GVariant **data,
                arr[1] = g_variant_new_uint64(mqflag);
                *data = g_variant_new_tuple(arr, ARRAY_SIZE(arr));
                return SR_OK;
+       case SR_CONF_RANGE:
+               if (!devc || !devc->model->get_range_text)
+                       return SR_ERR_NA;
+               range = devc->model->get_range_text(sdi);
+               if (!range || !*range)
+                       return SR_ERR_NA;
+               *data = g_variant_new_string(range);
+               return SR_OK;
        default:
                return SR_ERR_NA;
        }
@@ -448,6 +478,7 @@ static int config_set(uint32_t key, GVariant *data,
        enum sr_mq mq;
        enum sr_mqflag mqflag;
        GVariant *tuple_child;
+       const char *range;
 
        (void)cg;
 
@@ -465,6 +496,11 @@ static int config_set(uint32_t key, GVariant *data,
                mqflag = g_variant_get_uint64(tuple_child);
                g_variant_unref(tuple_child);
                return scpi_dmm_set_mq(sdi, mq, mqflag);
+       case SR_CONF_RANGE:
+               if (!devc || !devc->model->set_range_from_text)
+                       return SR_ERR_NA;
+               range = g_variant_get_string(data, NULL);
+               return devc->model->set_range_from_text(sdi, range);
        default:
                return SR_ERR_NA;
        }
@@ -504,6 +540,11 @@ static int config_list(uint32_t key, GVariant **data,
                }
                *data = g_variant_builder_end(&gvb);
                return SR_OK;
+       case SR_CONF_RANGE:
+               if (!devc || !devc->model->get_range_text_list)
+                       return SR_ERR_NA;
+               *data = devc->model->get_range_text_list(sdi);
+               return SR_OK;
        default:
                (void)devc;
                return SR_ERR_NA;